ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: git-annex: Update to 10.20220822.

Browse source 
* gnu/packages/haskell-apps.scm (git-annex): Update to 10.20220822.
[arguments]: Remove trailing #t from phases.
This commit is contained in:
Efraim Flashner 2022-08-30 21:49:41 +03:00
parent 9583cbf29c
commit 4fb1fb904b
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gnu/packages/haskell-apps.scm
View file

@ -304,14 +304,14 @@ (define-public ghcid
(define-public git-annex (define-public git-annex
(package (package
(name "git-annex") (name "git-annex")
(version "10.20220624") (version "10.20220822")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://hackage.haskell.org/package/" (uri (string-append "https://hackage.haskell.org/package/"
"git-annex/git-annex-" version ".tar.gz")) "git-annex/git-annex-" version ".tar.gz"))
(sha256 (sha256
(base32 "0a17ph8w620fmbwhm4yhdz2pwp0z8g5d4qsw2bg8k1par2n8rnmz")))) (base32 "1qv3cb7p2zyc5mpcr4nfgzdmswfny5jbimd2ip7ygh71jlahrbfc"))))
(build-system haskell-build-system) (build-system haskell-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -326,8 +326,7 @@ (define-public git-annex
;; let's temporarily patch it so that we can run the tests. ;; let's temporarily patch it so that we can run the tests.
(copy-file "Utility/Shell.hs" "/tmp/Shell.hs") (copy-file "Utility/Shell.hs" "/tmp/Shell.hs")
(substitute* "Utility/Shell.hs" (substitute* "Utility/Shell.hs"
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))))
#t))
(add-before 'configure 'factor-setup (add-before 'configure 'factor-setup
(lambda _ (lambda _
;; Factor out necessary build logic from the provided ;; Factor out necessary build logic from the provided
@ -341,12 +340,10 @@ (define-public git-annex
(call-with-output-file "Setup.hs" (call-with-output-file "Setup.hs"
(lambda (out) (lambda (out)
(format out "import Distribution.Simple~%") (format out "import Distribution.Simple~%")
(format out "main = defaultMain~%"))) (format out "main = defaultMain~%")))))
#t))
(add-before 'configure 'pre-configure (add-before 'configure 'pre-configure
(lambda _ (lambda _
(invoke "runhaskell" "PreConf.hs") (invoke "runhaskell" "PreConf.hs")))
#t))
(add-after 'build 'build-manpages (add-after 'build 'build-manpages
(lambda _ (lambda _
;; The Setup.hs rewrite above removed custom code for building ;; The Setup.hs rewrite above removed custom code for building
@ -380,8 +377,7 @@ (define-public git-annex
"/man/man1/"))) "/man/man1/")))
(mkdir-p man) (mkdir-p man)
(for-each (lambda (file) (install-file file man)) (for-each (lambda (file) (install-file file man))
(find-files "man"))) (find-files "man")))))
#t))
(add-after 'install 'install-symlinks (add-after 'install 'install-symlinks
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -389,8 +385,7 @@ (define-public git-annex
(symlink (string-append bin "/git-annex") (symlink (string-append bin "/git-annex")
(string-append bin "/git-annex-shell")) (string-append bin "/git-annex-shell"))
(symlink (string-append bin "/git-annex") (symlink (string-append bin "/git-annex")
(string-append bin "/git-remote-tor-annex")) (string-append bin "/git-remote-tor-annex")))))
#t)))
(add-after 'install 'touch-static-output (add-after 'install 'touch-static-output
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; The Haskell build system adds a "static" output by ;; The Haskell build system adds a "static" output by