me
/
guix
Archived
1
0
Fork 0

gnu: cuirass: Depend on an older Guix snapshot.

Works around <https://issues.guix.gnu.org/55441#12>.

* gnu/packages/package-management.scm (guix-for-cuirass): New variable.
* gnu/packages/ci.scm (cuirass)[inputs]: Use it.
master
Ludovic Courtès 2022-05-26 00:11:45 +02:00
parent 4e13ee4b57
commit dcb7ce1eb6
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 32 additions and 1 deletions

View File

@ -164,7 +164,14 @@
;; FIXME: this is propagated by "guile-git", but it needs to be among
;; the inputs to add it to GUILE_LOAD_PATH.
guile-bytestructures
guix))
;; FIXME: The 'cuirass evaluate' command is multithreaded, but it
;; uses 'open-inferior', which calls 'primitive-fork', thus
;; potentially creating child processes that deadlock. To work
;; around that, use the last revision of Guix where
;; 'open-inferior' was using 'open-pipe*' rather than
;; 'primitive-fork'. See <https://issues.guix.gnu.org/55441>.
guix-for-cuirass))
(native-inputs
(list autoconf automake pkg-config texinfo ephemeralpg))
(native-search-paths

View File

@ -489,6 +489,30 @@ the Nix package manager.")
(license license:gpl3+)
(properties '((ftp-server . "alpha.gnu.org"))))))
(define-public guix-for-cuirass
;; Known-good revision before commit
;; bd86bbd300474204878e927f6cd3f0defa1662a5, which introduced
;; 'primitive-fork' in 'open-inferior'.
(let ((version "1.3.0")
(commit "a27e47f9d1e22dc32bb250cfeef88cfacb930e23")
(revision 23))
(package
(inherit guix)
(version (string-append version "-"
(number->string revision)
"." (string-take commit 7)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.savannah.gnu.org/git/guix.git")
(commit commit)))
(sha256
(base32
"12jmvagbw05hmmlrb82i0qazhlv7mcfnl4dmknwx3a9hd760g9y1"))
(file-name (string-append "guix-" version "-checkout"))))
(properties `((hidden? . #t)
,@(package-properties guix))))))
(define-public guix-daemon
;; This package is for internal consumption: it allows us to quickly build
;; the 'guix-daemon' program and use that in (guix self), used by 'guix