ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-16 11:55:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guile: Apply Shepherd fix to the default Guile.

Browse source 
* gnu/packages/guile.scm (guile-2.2/bug-fix): Remove variable.
(guile-2.2)[source](patches): Add "guile-finalization-crash.patch".
* gnu/packages/admin.scm (shepherd)[inputs, native-inputs]: Change from
GUILE-2.2/BUG-FIX to GUILE-2.2.
This commit is contained in:
Marius Bakke 2020-01-14 18:09:50 +01:00
parent e8b79cd9f4
commit f63495d31b
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gnu/packages/admin.scm
View file

@ -211,10 +211,10 @@ (define-public shepherd
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
;; This is the Guile we use as a cross-compiler... ;; This is the Guile we use as a cross-compiler...
("guile" ,guile-2.2/bug-fix))) ("guile" ,guile-2.2)))
(inputs (inputs
;; ... and this is the one that appears in shebangs when cross-compiling. ;; ... and this is the one that appears in shebangs when cross-compiling.
`(("guile" ,guile-2.2/bug-fix) ;for <https://bugs.gnu.org/37757> `(("guile" ,guile-2.2) ;for <https://bugs.gnu.org/37757>
;; The 'shepherd' command uses Readline when used interactively. It's ;; The 'shepherd' command uses Readline when used interactively. It's
;; an unusual use case though, so we don't propagate it. ;; an unusual use case though, so we don't propagate it.

13
gnu/packages/guile.scm
View file

@ -230,6 +230,7 @@ (define-public guile-2.2
"1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk")) "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk"))
(modules '((guix build utils))) (modules '((guix build utils)))
(patches (search-patches (patches (search-patches
"guile-finalization-crash.patch"
"guile-2.2-skip-oom-test.patch")) "guile-2.2-skip-oom-test.patch"))
;; Remove the pre-built object files. Instead, build everything ;; Remove the pre-built object files. Instead, build everything
@ -250,18 +251,6 @@ (define-public guile-2.2
(variable "GUILE_LOAD_COMPILED_PATH") (variable "GUILE_LOAD_COMPILED_PATH")
(files '("lib/guile/2.2/site-ccache"))))))) (files '("lib/guile/2.2/site-ccache")))))))
(define-public guile-2.2/bug-fix
;; This variant contains a bug fix for a relatively rare crash that could
;; affect shepherd as PID 1: <https://bugs.gnu.org/37757>.
(package
(inherit guile-2.2)
(version (string-append (package-version guile-2.2) "-1"))
(source (origin
(inherit (package-source guile-2.2))
(patches
(append (search-patches "guile-finalization-crash.patch")
(origin-patches (package-source guile-2.2))))))))
(define-public guile-2.2/fixed (define-public guile-2.2/fixed
;; A package of Guile 2.2 that's rarely changed. It is the one used ;; A package of Guile 2.2 that's rarely changed. It is the one used
;; in the `base' module, and thus changing it entails a full rebuild. ;; in the `base' module, and thus changing it entails a full rebuild.