nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: git: Fix checksum patch in 'patch-tests'. 

* gnu/packages/version-control.scm (git)[arguments]: In 'patch-tests'
phase, use %store-directory instead of '/gnu' to prevent tests failure
in case a custom store path is used.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
This commit is contained in:
YOANN P 2018-04-03 18:05:41 +00:00 committed by Marius Bakke
parent 385b2dde61
commit 6e0efe8cd5
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/version-control.scm
View File

@ -223,6 +223,7 @@ as well as the classic centralized workflow.")
#t)) #t))
(add-before 'check 'patch-tests (add-before 'check 'patch-tests
(lambda _ (lambda _
(let ((store-directory (%store-directory)))
;; These files contain some funny bytes that Guile is unable ;; These files contain some funny bytes that Guile is unable
;; to decode for shebang patching. Just delete them. ;; to decode for shebang patching. Just delete them.
(for-each delete-file '("t/t4201-shortlog.sh" (for-each delete-file '("t/t4201-shortlog.sh"
@ -244,10 +245,10 @@ as well as the classic centralized workflow.")
(("\tcommit_template_commented") "\ttrue")) (("\tcommit_template_commented") "\ttrue"))
;; More checksum mismatches due to odd shebangs. ;; More checksum mismatches due to odd shebangs.
(substitute* "t/t9100-git-svn-basic.sh" (substitute* "t/t9100-git-svn-basic.sh"
(("\"#!/gnu.*/bin/sh") "\"#!/bin/sh")) (((string-append "\"#!" store-directory ".*/bin/sh")) "\"#!/bin/sh") )
(substitute* "t/t9300-fast-import.sh" (substitute* "t/t9300-fast-import.sh"
(("\t#!/gnu.*/bin/sh") "\t#!/bin/sh") (((string-append "\t#!" store-directory ".*/bin/sh")) "\t#!/bin/sh")
(("'#!/gnu.*/bin/sh") "'#!/bin/sh")) (((string-append "'#!" store-directory ".*/bin/sh")) "'#!/bin/sh"))
;; FIXME: Some hooks fail with "basename: command not found". ;; FIXME: Some hooks fail with "basename: command not found".
;; See 't/trash directory.t9164.../svn-hook.log'. ;; See 't/trash directory.t9164.../svn-hook.log'.
(delete-file "t/t9164-git-svn-dcommit-concurrent.sh") (delete-file "t/t9164-git-svn-dcommit-concurrent.sh")
@ -258,7 +259,7 @@ as well as the classic centralized workflow.")
'("t/t9128-git-svn-cmd-branch.sh" '("t/t9128-git-svn-cmd-branch.sh"
"t/t9167-git-svn-cmd-branch-subproject.sh" "t/t9167-git-svn-cmd-branch-subproject.sh"
"t/t9141-git-svn-multiple-branches.sh")) "t/t9141-git-svn-multiple-branches.sh"))
#t)) #t)))
(add-after 'install 'install-shell-completion (add-after 'install 'install-shell-completion
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))