[bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4.

[bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4.

[Simen Endsjø]

* 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

[bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4.

[simendsjo]

* gnu/packages/syncthing.scm (syncthing): Update to 1.18.4.
---
 gnu/packages/syncthing.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index 4deb60bee2..f1e3ab8e52 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
@@ -68,6 +69,12 @@ (define-public syncthing
        #:import-path "github.com/syncthing/syncthing"
        ;; We don't need to install the source code for end-user applications.
        #:install-source? #f
+       ;; 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
+       #:tests? #f
        #:phases
        (modify-phases %standard-phases
          (add-before 'build 'increase-test-timeout

base-commit: 85ed37c170756bac78e4fd7fd83adba7e9537030
--
2.34.0

[bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4.

[Leo Famulari]

On Sat, Dec 04, 2021 at 12:51:36PM +0100, simendsjo wrote:
> * gnu/packages/syncthing.scm (syncthing): Update to 1.18.4.
> +       ;; 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
> +       #:tests? #f

Thanks for the patches!

Do you know what's wrong here? I think that we should at least
understand it before pushing an upgrade that doesn't pass its tests.

I tried building the entire 1.18 release series, and 1.18.0 does build
and pass its tests for me on x86_64. But I suppose there were good
reasons to make 4 minor releases since 1.18.0.

[bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4.

[Leo Famulari]

On Sun, Dec 05, 2021 at 12:44:20AM -0500, Leo Famulari wrote:
> Do you know what's wrong here? I think that we should at least
> understand it before pushing an upgrade that doesn't pass its tests.

I looked it up. Between 1.18.1 and 1.18.2, Syncthing's "build
constraints" were updated to "Go 1.17 style":

https://github.com/syncthing/syncthing/commit/d47745a86b00fe1122d8ebd5e17601aa1b7552b2

So, we can at least get 1.18.1 until we update our Go compiler. There
are pending patches to use 1.17.

1.18.1 does build and pass its tests for me.

[bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4.

[Simen Endsjø]

Great! As 1.16.1 is broken due to this bug: https://github.com/syncthing/syncthing/issues/7685
I updated the patch to 1.18.1, but should we rather use 1.17.0 you think?

Leo Famulari <leo@famulari.name> writes:

> On Sun, Dec 05, 2021 at 12:44:20AM -0500, Leo Famulari wrote:
>> Do you know what's wrong here? I think that we should at least
>> understand it before pushing an upgrade that doesn't pass its tests.
>
> I looked it up. Between 1.18.1 and 1.18.2, Syncthing's "build
> constraints" were updated to "Go 1.17 style":
>
> https://github.com/syncthing/syncthing/commit/d47745a86b00fe1122d8ebd5e17601aa1b7552b2
>
> So, we can at least get 1.18.1 until we update our Go compiler. There
> are pending patches to use 1.17.
>
> 1.18.1 does build and pass its tests for me.

[bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4.

[Leo Famulari]

On Sun, Dec 5, 2021, at 03:54, Simen Endsjø wrote:
> Great! As 1.16.1 is broken due to this bug: 
> https://github.com/syncthing/syncthing/issues/7685

Broken somewhat... It works quite well in general :) The CLI is rather new and untested compared to the GUI / web API.

> I updated the patch to 1.18.1, but should we rather use 1.17.0 you 
> think?

Can you clarify why we might choose Syncthing 1.17.0 if we could use 1.18.1? Or did you mean Go 1.17?

[bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4.

[Simen Endsjø]

"Leo Famulari" <leo@famulari.name> writes:

> On Sun, Dec 5, 2021, at 03:54, Simen Endsjø wrote:
>> Great! As 1.16.1 is broken due to this bug:
>> https://github.com/syncthing/syncthing/issues/7685
>
> Broken somewhat... It works quite well in general :) The CLI is rather new and untested compared to the GUI / web API.

I'm trying to run it from a server, and would like to avoid exposing a
web API.

>> I updated the patch to 1.18.1, but should we rather use 1.17.0 you
>> think?
>
> Can you clarify why we might choose Syncthing 1.17.0 if we could use 1.18.1? Or did you mean Go 1.17?

1.17.0 doesn't include any later patch versions, and might be more
stabel. Haven't looked at the issues closed 1.18.2-4, so it might be a
non-issue. I have very simple use, I just need something other than
1.16.1 as I cannot add devices with that version.

[bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4.

[Julien Lepiller]

[-- Attachment #1: Type: text/plain, Size: 1200 bytes --]

I've actually been running 1.18.4 for some time noo, without issues. Just skipping the tests makes it work, so why not? If this is a problem, I think 1.18.1 is better unless there is an important bug in it.

Le 6 décembre 2021 03:15:51 GMT-05:00, "Simen Endsjø" <simendsjo@gmail.com> a écrit :
>
>"Leo Famulari" <leo@famulari.name> writes:
>
>> On Sun, Dec 5, 2021, at 03:54, Simen Endsjø wrote:
>>> Great! As 1.16.1 is broken due to this bug:
>>> https://github.com/syncthing/syncthing/issues/7685
>>
>> Broken somewhat... It works quite well in general :) The CLI is rather new and untested compared to the GUI / web API.
>
>I'm trying to run it from a server, and would like to avoid exposing a
>web API.
>
>>> I updated the patch to 1.18.1, but should we rather use 1.17.0 you
>>> think?
>>
>> Can you clarify why we might choose Syncthing 1.17.0 if we could use 1.18.1? Or did you mean Go 1.17?
>
>1.17.0 doesn't include any later patch versions, and might be more
>stabel. Haven't looked at the issues closed 1.18.2-4, so it might be a
>non-issue. I have very simple use, I just need something other than
>1.16.1 as I cannot add devices with that version.
>
>
>

[-- Attachment #2: Type: text/html, Size: 2060 bytes --]

bug#52275: [PATCH] gnu: syncthing: Update to 1.18.4.

[Leo Famulari]

I pushed 4e282bc934488b1c9ab9e97c838efe058da9e0bd, which updates
Syncthing to 1.18.4 and builds it with Go 1.17. I did this because
Syncthing assumes that one is building with Go 1.17, based on the
changes in Syncthing 1.18.2.

I'll test the update of the Go 1.17 series shortly and hopefully put Go
1.17 into use across all packages this week.

On Mon, Dec 06, 2021 at 06:47:31AM -0500, Julien Lepiller wrote:
> I've actually been running 1.18.4 for some time noo, without issues. Just skipping the tests makes it work, so why not? If this is a problem, I think 1.18.1 is better unless there is an important bug in it.
> 
> Le 6 décembre 2021 03:15:51 GMT-05:00, "Simen Endsjø" <simendsjo@gmail.com> a écrit :
> >
> >"Leo Famulari" <leo@famulari.name> writes:
> >
> >> On Sun, Dec 5, 2021, at 03:54, Simen Endsjø wrote:
> >>> Great! As 1.16.1 is broken due to this bug:
> >>> https://github.com/syncthing/syncthing/issues/7685
> >>
> >> Broken somewhat... It works quite well in general :) The CLI is rather new and untested compared to the GUI / web API.
> >
> >I'm trying to run it from a server, and would like to avoid exposing a
> >web API.
> >
> >>> I updated the patch to 1.18.1, but should we rather use 1.17.0 you
> >>> think?
> >>
> >> Can you clarify why we might choose Syncthing 1.17.0 if we could use 1.18.1? Or did you mean Go 1.17?
> >
> >1.17.0 doesn't include any later patch versions, and might be more
> >stabel. Haven't looked at the issues closed 1.18.2-4, so it might be a
> >non-issue. I have very simple use, I just need something other than
> >1.16.1 as I cannot add devices with that version.
> >
> >
> >

[bug#52275] [PATCH] gnu: syncthing: Update to 1.18.4.

[Julien Lepiller]

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ø]

* gnu/packages/syncthing.scm (syncthing): Update to 1.18.1.
---
 gnu/packages/syncthing.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index 4deb60bee2..ee57998ce8 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.1")
     ; 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"))))
+                "112mj4vzxija6czaysn3siac9gka9r9694yqi4rsnwlyln3qwsrz"))))
     (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

base-commit: 85ed37c170756bac78e4fd7fd83adba7e9537030
--
2.34.0