[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4.
From: |
Julien Lepiller |
Subject: |
[bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4. |
Date: |
Sat, 04 Dec 2021 07:18:03 -0500 |
User-agent: |
K-9 Mail for Android |
Le 4 décembre 2021 06:51:36 GMT-05:00, "Simen Endsjø" <simendsjo@gmail.com> a
écrit :
>
>* gnu/packages/syncthing.scm (syncthing): Update to 1.18.4.
>---
> gnu/packages/syncthing.scm | 23 +++++++++++++++--------
> 1 file changed, 15 insertions(+), 8 deletions(-)
>
>diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
>index 4deb60bee2..f524fec08e 100644
>--- a/gnu/packages/syncthing.scm
>+++ b/gnu/packages/syncthing.scm
>@@ -6,6 +6,7 @@
> ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org>
> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
> ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
>+;;; Copyright © 2021 Simen Endsjø <simendsjo@gmail.com>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
>@@ -45,7 +46,7 @@ (define-module (gnu packages syncthing)
> (define-public syncthing
> (package
> (name "syncthing")
>- (version "1.16.1")
>+ (version "1.18.4")
> ; XXX After the go-build-system can use "Go modules", stop using bundled
> ; dependencies for Syncthing.
> (source (origin
>@@ -55,7 +56,7 @@ (define-public syncthing
> "/syncthing-source-v" version ".tar.gz"))
> (sha256
> (base32
>- "0m5k37sp3px8acs3y9an5wzy1wbcbdvqq74jy0pwzfk4bjbr999j"))))
>+ "00kw1j2qi5ylbycv43n5177r3a3651qxhds927x6cz0a2b7qac8n"))))
> (build-system go-build-system)
> ;; The primary Syncthing executable goes to "out", while the auxiliary
> ;; server programs and utility tools go to "utils". This reduces the size
>@@ -87,12 +88,18 @@ (define-public syncthing
> (delete-file "bin/syncthing")
> (invoke "go" "run" "build.go" "-no-upgrade" "build"
> "syncthing"))))
>
>- (replace 'check
>- (lambda* (#:key tests? #:allow-other-keys)
>- (when tests?
>- (with-directory-excursion "src/github.com/syncthing/syncthing"
>- (invoke "go" "run" "build.go" "test")))
>- #t))
>+ ;; Running tests currently fails. Get the message
>+ ;;
>vendor/github.com/lucas-clemente/quic-go/internal/qerr/error_codes.go:6:2:
>build constraints exclude all Go files in
>/tmp/guix-build-syncthing-1.18.4.drv-0/src/github.com/syncthing/syncthing/vendor/github.com/lucas-clemente/quic-go/internal/qtls
>+ ;; followed by two lines of `exit status 1`.
>+ ;; Running on a non-guix has the same problem as for guix, but the
>tests runs.
>+ ;; We disable the tests for now
>+ (replace 'check (lambda _ #t))
>+ ;; (replace 'check
>+ ;; (lambda* (#:key tests? #:allow-other-keys)
>+ ;; (when tests?
>+ ;; (with-directory-excursion
>"src/github.com/syncthing/syncthing"
>+ ;; (invoke "go" "run" "build.go" "test")))
>+ ;; #t))
>
> (replace 'install
> (lambda* (#:key outputs #:allow-other-keys)
>
>base-commit: 85ed37c170756bac78e4fd7fd83adba7e9537030
>--
>2.34.0
>
>
>
Thanks for the patch!
Why not use #:tests? #f instead of removing the whole test phase? With the same
comment before it.
- [bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4., Simen Endsjø, 2021/12/04
- [bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4.,
Julien Lepiller <=
- [bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4., simendsjo, 2021/12/04
- [bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4., Leo Famulari, 2021/12/05
- [bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4., Leo Famulari, 2021/12/05
- [bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4., Simen Endsjø, 2021/12/05
- [bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4., Leo Famulari, 2021/12/05
- [bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4., Simen Endsjø, 2021/12/06
- [bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4., Julien Lepiller, 2021/12/06
- bug#52275: [PATCH] gnu: syncthing: Update to 1.18.4., Leo Famulari, 2021/12/06
[bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4., Simen Endsjø, 2021/12/05