diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2019-09-02 17:28:31 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2019-09-02 17:28:31 -0400 |
| commit | 3f42842792a85214fa7dcd5376e59a772b5aa7fd (patch) | |
| tree | 57182abc6df0c4572f2c4153e050a8db0824c2b4 | |
| parent | 5561a5c9bc832e99bead7be7f0b8cf3528b2e531 (diff) | |
| download | guix-packages-3f42842792a85214fa7dcd5376e59a772b5aa7fd.tar.gz | |
git-annex-latest: Rework for upstream fixes
The patch issue has been fixed as of 3d45d8f14b (gnu: git-annex: Don't
patch shebang used in hooks., 2019-07-21). I'll keep a custom package
here at least until I get around to adding ghc-magic to the upstream
package.
| -rw-r--r-- | km-packages/git-annex.scm | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/km-packages/git-annex.scm b/km-packages/git-annex.scm index 89031ae..e961994 100644 --- a/km-packages/git-annex.scm +++ b/km-packages/git-annex.scm @@ -101,12 +101,11 @@ full-featured binding.") ("ghc-magic" ,ghc-magic) ,@(package-inputs git-annex)))))) -;; The package in Guix has an outstanding issue with shebangs in -;; hooks. -(define-public git-annex-latest +;; Upstream doesn't use ghc-magic yet. +(define-public km-git-annex (package (inherit git-annex) - (name "git-annex-latest") + (name "km-git-annex") (version "7.20190730") (source (origin @@ -121,10 +120,8 @@ full-featured binding.") ,@(substitute-keyword-arguments (package-arguments git-annex) ((#:phases phases) `(modify-phases ,phases - (delete 'check) - (delete 'patch-shell)))))) - (inputs `(("ghc-concurrent-output" ,ghc-concurrent-output) - ("ghc-magic" ,ghc-magic) + (delete 'check)))))) + (inputs `(("ghc-magic" ,ghc-magic) ,@(package-inputs git-annex))))) (define-public git-annex-remote-ipfs |