ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 22:26:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

quirks: Add patch for <https://bugs.gnu.org/41214>.

Browse source 
Fixes <https://bugs.gnu.org/41214>.

* guix/quirks.scm (%bug-41214-patch): New variable.
(%patches): Add it.
This commit is contained in:
Ludovic Courtès 2020-05-15 10:04:39 +02:00
parent 9db8836916
commit 01611d141e
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
guix/quirks.scm
View file

@ -19,6 +19,7 @@
(define-module (guix quirks) (define-module (guix quirks)
#:use-module ((guix build utils) #:select (substitute*)) #:use-module ((guix build utils) #:select (substitute*))
#:use-module (srfi srfi-9) #:use-module (srfi srfi-9)
#:use-module (ice-9 match)
#:use-module (ice-9 rdelim) #:use-module (ice-9 rdelim)
#:export (%quirks #:export (%quirks
@ -117,8 +118,42 @@ (define (add-missing-ice-9-threads-import source)
(patch missing-ice-9-threads-import? add-missing-ice-9-threads-import))) (patch missing-ice-9-threads-import? add-missing-ice-9-threads-import)))
(define %bug-41214-patch
;; Patch for <https://bugs.gnu.org/41214>. Around v1.0.0, (guix build
;; compile) would use Guile 2.2 procedures to access the set of available
;; compilation options. These procedures no longer exist in 3.0.
(let ()
(define (accesses-guile-2.2-optimization-options? source commit)
(catch 'system-error
(lambda ()
(match (call-with-input-file
(string-append source "/guix/build/compile.scm")
read)
(('define-module ('guix 'build 'compile)
_ ...
#:use-module ('language 'tree-il 'optimize)
#:use-module ('language 'cps 'optimize)
#:export ('%default-optimizations
'%lightweight-optimizations
'compile-files))
#t)
(_ #f)))
(const #f)))
(define (build-with-guile-2.2 source)
(substitute* (string-append source "/" %self-build-file)
(("\\(default-guile\\)")
(object->string '(car (find-best-packages-by-name "guile" "2.2"))))
(("\\(find-best-packages-by-name \"guile-gcrypt\" #f\\)")
(object->string '(find-best-packages-by-name "guile2.2-gcrypt" #f))))
#t)
(patch accesses-guile-2.2-optimization-options?
build-with-guile-2.2)))
(define %patches (define %patches
;; Bits of past Guix revisions can become incompatible with newer Guix and ;; Bits of past Guix revisions can become incompatible with newer Guix and
;; Guile. This variable lists <patch> records for the Guix source tree that ;; Guile. This variable lists <patch> records for the Guix source tree that
;; apply to the Guix source. ;; apply to the Guix source.
(list %bug-41028-patch)) (list %bug-41028-patch
%bug-41214-patch))