aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2019-09-02 17:28:50 -0400
committerKyle Meyer <kyle@kyleam.com>2019-09-02 17:28:50 -0400
commit5f660442ec7643b19d071ef8049b138c53034b28 (patch)
treed6566b2a9bf87721c2ee6610c17eaa41a83aabe5
parent988441124338993c9e781688a7b3e1234259b507 (diff)
downloadguix-packages-5f660442ec7643b19d071ef8049b138c53034b28.tar.gz
git-annex-dev: Work around upstream workaround
The fix in 3d45d8f14b (gnu: git-annex: Don't patch shebang used in hooks, 2019-07-21) involves stashing Shell.hs to a temporary file and then copying it back over.
-rw-r--r--km-packages/git-annex.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/km-packages/git-annex.scm b/km-packages/git-annex.scm
index cc298aa..416e7e9 100644
--- a/km-packages/git-annex.scm
+++ b/km-packages/git-annex.scm
@@ -96,7 +96,12 @@ full-featured binding.")
;; Otherwise get write error because is read-only.
(delete-file "Setup.hs")
#t))
- (delete 'check))))))
+ (delete 'check)
+ (add-before 'unpatch-shell-and-rebuild 'delete-shell
+ (lambda _
+ ;; Avoid permission error when copying file.
+ (delete-file "Utility/Shell.hs")
+ #t)))))))
(inputs `(("ghc-magic" ,ghc-magic)
,@(package-inputs git-annex))))))