diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-05-09 14:44:48 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-05-09 14:44:48 +0200 |
| commit | da3be3ff4f6d8b643ed9bdf6834df366b1bcea44 (patch) | |
| tree | 913ff6010447b6a31dfbe4be6eccc06b11fd83cf /gnu/packages/version-control.scm | |
| parent | f5fe0082abe4547f3fb9f29d8351473cfb3a387b (diff) | |
| parent | 4980630d1e3e6f9a6dc05438c7593a727207d9a0 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/version-control.scm')
| -rw-r--r-- | gnu/packages/version-control.scm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index ca339b9285..49b53789f9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com> -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> @@ -874,7 +874,14 @@ write native speed custom Git applications in any language with bindings.") "1fjdglkh04qv3b4alg621pxa689i0wlf8m7nf2755zawjr2zhwxd")) (patches (search-patches "libgit2-mtime-0.patch")) (snippet '(begin - (delete-file-recursively "deps") #t)) + (delete-file-recursively "deps") + + ;; The "refs:revparse::date" test is time-dependent: it + ;; assumes "HEAD@{10 years ago}" doesn't match anything, + ;; which is no longer true. Adjust that test. + (substitute* "tests/refs/revparse.c" + (("10 years ago") + "100 years ago")))) (modules '((guix build utils))))))) (define-public git-crypt @@ -2564,13 +2571,13 @@ based on a manifest file published by servers.") (define-public b4 (package (name "b4") - (version "0.6.2") + (version "0.8.0") (source (origin (method url-fetch) (uri (pypi-uri "b4" version)) (sha256 - (base32 "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z")) + (base32 "115ysciq15sxc8fd9hf7p0f4wnd5xapcfkmq8g33y1c8nbdxclbx")) (modules '((guix build utils))) (snippet '(begin |