diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2021-12-05 19:17:41 +0100 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2021-12-05 19:17:41 +0100 |
commit | 9bc0f45df5d6aed217020b1183dca54989844fb0 (patch) | |
tree | d927e89949ff7f65b5059bc94273c53fd43d0763 /gnu/packages/haskell-apps.scm | |
parent | 6db3c536e89deb8a204e756f427614925a7d2582 (diff) | |
parent | 10554e0a57feeea470127a1d0441957d1776b0bd (diff) | |
download | guix-patches-9bc0f45df5d6aed217020b1183dca54989844fb0.tar guix-patches-9bc0f45df5d6aed217020b1183dca54989844fb0.tar.gz |
Merge remote-tracking branch 'origin/master' into core-updates-frozen
Diffstat (limited to 'gnu/packages/haskell-apps.scm')
-rw-r--r-- | gnu/packages/haskell-apps.scm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 5dcf6c1cb2..8ef5bb5788 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -316,14 +316,14 @@ to @code{cabal repl}).") (define-public git-annex (package (name "git-annex") - (version "8.20211028") + (version "8.20211123") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "0bff1bchp60hbslb9yaagvd7hym26w0c3gkkssm7sildwqazwpng")))) + (base32 "0i9dhh601axv0b1i56yzn6jnfp160z530fp9pd557kpq4nbvg5kl")))) (build-system haskell-build-system) (arguments `(#:configure-flags @@ -372,15 +372,15 @@ to @code{cabal repl}).") (format out "main = buildMansOrWarn~%"))) (invoke "runhaskell" "Build/MakeMans.hs"))) (replace 'check - (lambda _ + (lambda* (#:key tests? #:allow-other-keys) ;; We need to set the path so that Git recognizes ;; `git annex' as a custom command. (setenv "PATH" (string-append (getenv "PATH") ":" (getcwd) "/dist/build/git-annex")) - (with-directory-excursion "dist/build/git-annex" - (symlink "git-annex" "git-annex-shell")) - (invoke "git-annex" "test") - #t)) + (when tests? + (with-directory-excursion "dist/build/git-annex" + (symlink "git-annex" "git-annex-shell")) + (invoke "git-annex" "test")))) (add-after 'check 'unpatch-shell-and-rebuild (lambda args ;; Undo `patch-shell-for-tests'. |