diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/ci.scm | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/ci.scm')
| -rw-r--r-- | gnu/packages/ci.scm | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 86d99c9031..4380f327be 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -58,8 +58,8 @@ #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR))) (define-public cuirass - (let ((commit "9f08035f942a1e78f92e2db886d7837b0ab98b2f") - (revision "11")) + (let ((commit "1341725f2cbb886e0960c6fad13444e3cfe36c13") + (revision "13")) (package (name "cuirass") (version (git-version "1.1.0" revision commit)) @@ -72,7 +72,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0jrp0hngbmlg5vmfr93j86lxgk2zm5d424dx0c29ldgfr8i7bwcz")))) + "0l928hd84ky9l4d1nfdkzc4jvghvxia4j6gflliydvfiyfiw87b3")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) @@ -166,13 +166,7 @@ ;; the inputs to add it to GUILE_LOAD_PATH. guile-bytestructures - ;; 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)) + guix)) (native-inputs (list autoconf automake pkg-config texinfo ephemeralpg)) (native-search-paths |