diff options
| author | Marius Bakke <marius@gnu.org> | 2022-08-27 00:17:57 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-08-27 00:17:57 +0200 |
| commit | 1fd262e8d36b4477556ca06b569d39f5604c7176 (patch) | |
| tree | 5b0c93931c22787df1f56858c827abfd0c2a02f8 /gnu/packages/syncthing.scm | |
| parent | c1a4ef98932799adbd278068fa4fdd8c24fff714 (diff) | |
| parent | 9f7236e3baf0523c53193c1836ed888e63449f50 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/syncthing.scm')
| -rw-r--r-- | gnu/packages/syncthing.scm | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 717a953f2f..15ce6a8e29 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 Petter <petter@mykolab.ch> ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari <leo@famulari.name> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2020, 2021 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2020-2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net> @@ -27,6 +27,7 @@ #:use-module (guix build-system go) #:use-module (guix build-system python) #:use-module (guix build-system trivial) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -1111,7 +1112,7 @@ and RFC 5389).") (define-public go-github-com-cespare-xxhash (package (name "go-github-com-cespare-xxhash") - (version "2.1.0") + (version "2.1.2") (source (origin (method git-fetch) (uri (git-reference @@ -1120,10 +1121,19 @@ and RFC 5389).") (file-name (git-file-name name version)) (sha256 (base32 - "12ad3z7ki9j07c4kx3ywkl6188i2afsjg7sl60wd21p6zkkpfjxq")))) + "1f3wyr9msnnz94szrkmnfps9wm40s5sp9i4ak0kl92zcrkmpy29a")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/cespare/xxhash")) + (list + #:import-path "github.com/cespare/xxhash" + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs #:allow-other-keys #:rest args) + (unless + ;; The tests fail when run with gccgo. + (false-if-exception (search-input-file inputs "/bin/gccgo")) + (apply (assoc-ref %standard-phases 'check) args))))))) (synopsis "Go implementation of xxHash") (description "This package provides of Go implementation of the 64-bit xxHash algorithm (XXH64).") |