From 5f660442ec7643b19d071ef8049b138c53034b28 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Mon, 2 Sep 2019 17:28:50 -0400 Subject: 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. --- km-packages/git-annex.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'km-packages') 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)))))) -- cgit v1.2.3