From 6117e04f1fb5544ea727bc1fd51d43005c25b7dc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 11 Jul 2022 17:28:58 -0400 Subject: gnu: git: Delete trailing #t. * gnu/packages/version-control.scm (git)[phases]: Delete trailing #t. --- gnu/packages/version-control.scm | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 4202d3fd3e..0554ee1354 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -341,8 +341,7 @@ Python 3.3 and later, rather than on Python 2.") (("uname_S := .*" all) (if (equal? ,(%current-target-system) "i586-pc-gnu") "uname_S := GNU\n" - all))) - #t))) + all)))))) ;; We do not have bash-for-tests when cross-compiling. `((add-after 'unpack 'modify-PATH (lambda* (#:key inputs #:allow-other-keys) @@ -352,28 +351,24 @@ Python 3.3 and later, rather than on Python 2.") ;; similar does the right thing. (setenv "PATH" (string-join (remove (cut string-prefix? bash-full <>) path) - ":")) - #t))))) + ":"))))))) ;; Add cross curl-config script to PATH when cross-compiling. ,@(if (%current-target-system) '((add-before 'configure 'add-cross-curl-config (lambda* (#:key inputs #:allow-other-keys) (setenv "PATH" (string-append (assoc-ref inputs "curl") "/bin:" - (getenv "PATH"))) - #t))) + (getenv "PATH")))))) '()) (add-after 'configure 'patch-makefiles (lambda _ (substitute* "Makefile" (("/usr/bin/perl") (which "perl")) - (("/usr/bin/python") (which "python3"))) - #t)) + (("/usr/bin/python") (which "python3"))))) (add-after 'configure 'add-PM.stamp (lambda _ ;; Add the "PM.stamp" to avoid "no rule to make target". - (call-with-output-file "perl/PM.stamp" (const #t)) - #t)) + (call-with-output-file "perl/PM.stamp" (const #t)))) (add-after 'build 'build-subtree (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "contrib/subtree" @@ -392,8 +387,7 @@ Python 3.3 and later, rather than on Python 2.") (invoke "make" "install") (invoke "make" "install-doc") (substitute* "git-subtree" - (("/bin/sh") (which "sh")))) - #t)) + (("/bin/sh") (which "sh")))))) (add-before 'check 'patch-tests (lambda _ (let ((store-directory (%store-directory))) @@ -431,8 +425,7 @@ Python 3.3 and later, rather than on Python 2.") (for-each delete-file '("t/t9128-git-svn-cmd-branch.sh" "t/t9167-git-svn-cmd-branch-subproject.sh" - "t/t9141-git-svn-multiple-branches.sh")) - #t))) + "t/t9141-git-svn-multiple-branches.sh"))))) (add-after 'install 'install-info-manual (lambda* (#:key parallel-build? #:allow-other-keys) (define job-count (if parallel-build? @@ -450,8 +443,7 @@ Python 3.3 and later, rather than on Python 2.") ;; TODO: Install the tcsh and zsh completions in the right place. (mkdir-p completions) (copy-file "contrib/completion/git-completion.bash" - (string-append completions "/git")) - #t))) + (string-append completions "/git"))))) (add-after 'install 'install-credential-netrc (lambda* (#:key outputs #:allow-other-keys) (let* ((netrc (assoc-ref outputs "credential-netrc"))) @@ -465,24 +457,21 @@ Python 3.3 and later, rather than on Python 2.") ;; community calls this "dotless @INC"). (wrap-program (string-append netrc "/bin/git-credential-netrc") `("PERL5LIB" ":" prefix - (,(string-append (assoc-ref outputs "out") "/share/perl5")))) - #t))) + (,(string-append (assoc-ref outputs "out") "/share/perl5"))))))) (add-after 'install 'install-credential-libsecret (lambda* (#:key outputs #:allow-other-keys) (let* ((libsecret (assoc-ref outputs "credential-libsecret"))) (with-directory-excursion "contrib/credential/libsecret" ((assoc-ref gnu:%standard-phases 'build)) (install-file "git-credential-libsecret" - (string-append libsecret "/bin")) - #t)))) + (string-append libsecret "/bin")))))) (add-after 'install 'install-subtree (lambda* (#:key outputs #:allow-other-keys) (let ((subtree (assoc-ref outputs "subtree"))) (install-file "contrib/subtree/git-subtree" (string-append subtree "/bin")) (install-file "contrib/subtree/git-subtree.1" - (string-append subtree "/share/man/man1")) - #t))) + (string-append subtree "/share/man/man1"))))) (add-after 'install 'restore-sample-hooks-shebang (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -491,8 +480,7 @@ Python 3.3 and later, rather than on Python 2.") (format #t "restoring shebang on `~a'~%" file) (substitute* file (("^#!.*/bin/sh") "#!/bin/sh"))) - (find-files dir ".*")) - #t))) + (find-files dir ".*"))))) (add-after 'install 'split (lambda* (#:key inputs outputs #:allow-other-keys) ;; Split the binaries to the various outputs. @@ -568,9 +556,7 @@ Python 3.3 and later, rather than on Python 2.") (wrap-program git-sm `("PATH" ":" prefix (,(string-append (assoc-ref inputs "perl") - "/bin")))) - - #t))) + "/bin"))))))) (add-after 'split 'install-man-pages (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3