diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-09-20 18:49:26 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-09-20 18:49:26 +0200 |
commit | 58366883f2f1516a4a02f5b4e2a70e86481827b5 (patch) | |
tree | fa67d714c4596164b341118132728a48135f4759 /gnu/packages/ci.scm | |
parent | f40aef6b3b56e1e5fb6e6ac29bd372000e13982f (diff) | |
parent | 9a1c4a981bdd7eeca76aaf73a57d6841918821c2 (diff) | |
download | guix-58366883f2f1516a4a02f5b4e2a70e86481827b5.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/ci.scm')
-rw-r--r-- | gnu/packages/ci.scm | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index c449754be8..78d6e9514f 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -187,8 +187,8 @@ their dependencies.") (license l:gpl3+)))) (define-public cuirass - (let ((commit "6f85bc04f31ae5853ceaa0bb3e1dedfe8412a189") - (revision "7")) + (let ((commit "87ad259dba7de38b6e3ab954cd7b2f655358d877") + (revision "8")) (package (name "cuirass") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -200,7 +200,7 @@ their dependencies.") (file-name (string-append name "-" version)) (sha256 (base32 - "1dglsa23z21m1s70420ar73qmg39fvdvwlz9xjz6lfp5s9mgzx15")))) + "127pvbxbh6b6ar43cdgia9qpzzpldq4wm3igsxb1ycxfsdqnjrnz")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) @@ -216,7 +216,12 @@ their dependencies.") (substitute* "Makefile.am" (("tests/repo.scm \\\\") "\\")) #t)) - (add-after 'disable-repo-tests 'bootstrap + (add-after 'disable-repo-tests 'patch-/bin/sh + (lambda _ + (substitute* "build-aux/git-version-gen" + (("#!/bin/sh") (string-append "#!" (which "sh")))) + #t)) + (add-after 'patch-/bin/sh 'bootstrap (lambda _ (zero? (system* "sh" "bootstrap")))) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) |