[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/05: ui: Remove Guile 2.2.3 workaround.
From: |
guix-commits |
Subject: |
01/05: ui: Remove Guile 2.2.3 workaround. |
Date: |
Mon, 17 May 2021 18:27:34 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 4288806111dd6d65a40e5e6dc915aef71810fb34
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon May 17 22:47:18 2021 +0200
ui: Remove Guile 2.2.3 workaround.
This became dead code with commit
4f621a2b003e85d480999e4d0630e9dc3de85bc3.
* guix/ui.scm (load*): Remove Guile 2.2.3 workaround.
---
guix/ui.scm | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/guix/ui.scm b/guix/ui.scm
index e2cf2f1..a22024b 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -73,7 +73,6 @@
#:use-module (ice-9 format)
#:use-module (ice-9 regex)
#:autoload (ice-9 popen) (open-pipe* close-pipe)
- #:autoload (system base compile) (compile-file)
#:autoload (system repl repl) (start-repl)
#:autoload (system repl debug) (make-debug stack->vector)
#:autoload (web uri) (encode-and-join-uri-path)
@@ -211,17 +210,7 @@ information, or #f if it could not be found."
(catch #t
(lambda ()
;; XXX: Force a recompilation to avoid ABI issues.
- ;;
- ;; In 2.2.3, the bogus answer to <https://bugs.gnu.org/29226> was to
- ;; ignore all available .go, not just those from ~/.cache, which in turn
- ;; meant that we had to rebuild *everything*. Since this is too costly,
- ;; we have to turn off '%fresh-auto-compile' with that version, so to
- ;; avoid ABI breakage in the user's config file, we explicitly compile
- ;; it (the problem remains if the user's config is spread on several
- ;; modules.) See <https://bugs.gnu.org/29881>.
- (unless (string=? (version) "2.2.3")
- (set! %fresh-auto-compile #t))
-
+ (set! %fresh-auto-compile #t)
(set! %load-should-auto-compile #t)
(save-module-excursion
@@ -232,12 +221,6 @@ information, or #f if it could not be found."
(parameterize ((current-warning-port (%make-void-port "w")))
(call-with-prompt tag
(lambda ()
- (when (string=? (version) "2.2.3")
- (catch 'system-error
- (lambda ()
- (compile-file file #:env user-module))
- (const #f))) ;EACCES maybe, let's interpret it
-
;; Give 'load' an absolute file name so that it doesn't try to
;; search for FILE in %LOAD-PATH. Note: use 'load', not
;; 'primitive-load', so that FILE is compiled, which then allows