diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-04-15 19:26:55 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-15 19:26:55 +0200 |
| commit | bd21acf6c390e4fe87eb6053f0b5185d6ecbcf9f (patch) | |
| tree | 09fe91a8351471e5e7a821cb28521dd9b9d7e357 /gnu/packages/version-control.scm | |
| parent | a4f1a7e2db22cd028fb514846c2791928b8734d3 (diff) | |
| parent | b44e19acd1a0d449427cea0333f02ac98605be1c (diff) | |
| download | guix-bd21acf6c390e4fe87eb6053f0b5185d6ecbcf9f.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/version-control.scm')
| -rw-r--r-- | gnu/packages/version-control.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 694f37cadd..b0cf2bd152 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -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) |