futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: Git: Update to 2.26.0.

Browse Source 
* gnu/packages/version-control.scm (git): Update to 2.26.0.
[arguments]: Adjust the 'install-credential-netrc' phase to upstream changes.
This commit is contained in:
Leo Famulari 2020-03-23 19:40:47 -04:00
parent acd595c237
commit aae5f89db0
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,14 +150,14 @@ as well as the classic centralized workflow.")
(name "git") (name "git")
;; XXX When updating Git, check if the special 'git-source' input to cgit ;; XXX When updating Git, check if the special 'git-source' input to cgit
;; needs to be updated as well. ;; needs to be updated as well.
(version "2.25.2") (version "2.26.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://kernel.org/software/scm/git/git-" (uri (string-append "mirror://kernel.org/software/scm/git/git-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"08vivrv3my8nlp40pwsf7mcc5k7dwyh34hadjszx7qj8w01p34wv")))) "1mlmwibfgcv42c28fxmbd3iim8fc06r17dljd8vdgq550z5hvkly"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("native-perl" ,perl) `(("native-perl" ,perl)
@ -170,7 +170,7 @@ as well as the classic centralized workflow.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"06nlw6vaqvavkr4nia9qvanqbhaig4hbg9r5f0i9lbvw1hmykfvq")))) "09ilv5gg7167mwc0qqw2fz3lmdm360crnxc0xzkqn53wnsh4cziq"))))
;; For subtree documentation. ;; For subtree documentation.
("asciidoc" ,asciidoc-py3) ("asciidoc" ,asciidoc-py3)
("docbook-xsl" ,docbook-xsl) ("docbook-xsl" ,docbook-xsl)
@ -338,8 +338,10 @@ as well as the classic centralized workflow.")
(add-after 'install 'install-credential-netrc (add-after 'install 'install-credential-netrc
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((netrc (assoc-ref outputs "credential-netrc"))) (let* ((netrc (assoc-ref outputs "credential-netrc")))
(install-file "contrib/credential/netrc/git-credential-netrc" (install-file "contrib/credential/netrc/git-credential-netrc.perl"
(string-append netrc "/bin")) (string-append netrc "/bin"))
(rename-file (string-append netrc "/bin/git-credential-netrc.perl")
(string-append netrc "/bin/git-credential-netrc"))
;; Previously, Git.pm was automatically found by netrc. ;; Previously, Git.pm was automatically found by netrc.
;; Perl 5.26 changed how it locates modules so that @INC no ;; Perl 5.26 changed how it locates modules so that @INC no
;; longer includes the current working directory (the Perl ;; longer includes the current working directory (the Perl