amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ui: Remove Guile 2.2.3 workaround.

Browse source 
This became dead code with commit
4f621a2b00.

* guix/ui.scm (load*): Remove Guile 2.2.3 workaround.
This commit is contained in:
Ludovic Courtès 2021-05-17 22:47:18 +02:00
parent 1b7ea563cd
commit 4288806111
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 1 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

19
guix/ui.scm
View file

@ -73,7 +73,6 @@
#:use-module (ice-9 format) #:use-module (ice-9 format)
#:use-module (ice-9 regex) #:use-module (ice-9 regex)
#:autoload (ice-9 popen) (open-pipe* close-pipe) #:autoload (ice-9 popen) (open-pipe* close-pipe)
#:autoload (system base compile) (compile-file)
#:autoload (system repl repl) (start-repl) #:autoload (system repl repl) (start-repl)
#:autoload (system repl debug) (make-debug stack->vector) #:autoload (system repl debug) (make-debug stack->vector)
#:autoload (web uri) (encode-and-join-uri-path) #:autoload (web uri) (encode-and-join-uri-path)
@ -211,17 +210,7 @@ information, or #f if it could not be found."
(catch #t (catch #t
(lambda () (lambda ()
;; XXX: Force a recompilation to avoid ABI issues. ;; XXX: Force a recompilation to avoid ABI issues.
;; (set! %fresh-auto-compile #t)
;; 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! %load-should-auto-compile #t) (set! %load-should-auto-compile #t)
(save-module-excursion (save-module-excursion
@ -232,12 +221,6 @@ information, or #f if it could not be found."
(parameterize ((current-warning-port (%make-void-port "w"))) (parameterize ((current-warning-port (%make-void-port "w")))
(call-with-prompt tag (call-with-prompt tag
(lambda () (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 ;; Give 'load' an absolute file name so that it doesn't try to
;; search for FILE in %LOAD-PATH. Note: use 'load', not ;; search for FILE in %LOAD-PATH. Note: use 'load', not
;; 'primitive-load', so that FILE is compiled, which then allows ;; 'primitive-load', so that FILE is compiled, which then allows