amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Marius Bakke 2020-04-15 19:26:55 +02:00
commit bd21acf6c3
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
57 changed files with 37510 additions and 29282 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -152,14 +152,14 @@ as well as the classic centralized workflow.")
(define-public git
(package
(name "git")
(version "2.26.0")
(version "2.26.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://kernel.org/software/scm/git/git-"
version ".tar.xz"))
(sha256
(base32
"1mlmwibfgcv42c28fxmbd3iim8fc06r17dljd8vdgq550z5hvkly"))))
"0s03ix9j1h0yychkh1l1cgpr1l9lwzn3rprl08rk8ii5ix02i0l8"))))
(build-system gnu-build-system)
(native-inputs
`(("native-perl" ,perl)
@ -176,7 +176,7 @@ as well as the classic centralized workflow.")
version ".tar.xz"))
(sha256
(base32
"09ilv5gg7167mwc0qqw2fz3lmdm360crnxc0xzkqn53wnsh4cziq"))))
"0j2031x3qchwjmiy2h849j4x1vd8y4rgqv2ak9dc87xbbpsbfg59"))))
;; For subtree documentation.
("asciidoc" ,asciidoc-py3)
("docbook-xsl" ,docbook-xsl)
@ -892,9 +892,9 @@ collaboration using typical untrusted file hosts or services.")
(method url-fetch)
;; cgit is tightly bound to git. Use GIT_VER from the Makefile,
;; which may not match the current (package-version git).
(uri "mirror://kernel.org/software/scm/git/git-2.25.1.tar.xz")
(uri "mirror://kernel.org/software/scm/git/git-2.25.3.tar.xz")
(sha256
(base32 "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"))))
(base32 "0yvr97cl0dvj3fwblq1mb0cp97v8hrn9l98p8b1jx8815mbsnz9h"))))
("openssl" ,openssl)
("groff" ,groff)
("python" ,python)