diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
| commit | 6f9a80b331ae41d142a49fbeb94b90ee587b6155 (patch) | |
| tree | 2da042a6ccf5368c73d6e3d54c2ee02a62d284e4 /gnu/packages/ci.scm | |
| parent | 6500c9a5b364616e38a7e03aa4516fc2d7cee876 (diff) | |
| parent | dece03e2b98fc1c2428c2448ce5792f813eb79bf (diff) | |
| download | guix-6f9a80b331ae41d142a49fbeb94b90ee587b6155.tar.gz | |
Merge branch 'master' into core-updates
Note: this merge actually changes the 'curl' and 'python-attrs' derivations, as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and 12964df69a99de6190422c752fef65ef813f3b6b respectively. 4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it cannot currently be tested. Conflicts: gnu/local.mk gnu/packages/aidc.scm gnu/packages/boost.scm gnu/packages/curl.scm gnu/packages/nettle.scm gnu/packages/networking.scm gnu/packages/python-xyz.scm gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/ci.scm')
| -rw-r--r-- | gnu/packages/ci.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index e3918fb724..3a2e6df207 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -73,11 +73,11 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "21202760c0d15c99b69ef235ff129ab9cb478186") - (revision "25")) + (let ((commit "f9a5dbd54eaa7fa8ac173fd5e68209f937840d90") + (revision "1")) (package (name "cuirass") - (version (git-version "1.0.0" revision commit)) + (version (git-version "1.1.0" revision commit)) (source (origin (method git-fetch) @@ -87,7 +87,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1bzzycz7jmmrph730p8d3q2h76ab6i8j72wblm3w0szf8vimcqfk")))) + "0wrx2bf1gdnbkfgmmqr46s1fhvv3568yi7hxb24plf4xx5jq5yg8")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) |