Package: guix-patches;
Reported by: Leo Famulari <leo <at> famulari.name>
Date: Mon, 16 Dec 2024 21:14:02 UTC
Severity: normal
Tags: patch
Done: Sharlatan Hellseher <sharlatanus <at> gmail.com>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: help-debbugs <at> gnu.org (GNU bug Tracking System) To: Sharlatan Hellseher <sharlatanus <at> gmail.com> Cc: tracker <at> debbugs.gnu.org Subject: bug#74917: closed ([PATCH] gnu: Syncthing: Update to 1.28.1.) Date: Fri, 24 Jan 2025 14:14:02 +0000
[Message part 1 (text/plain, inline)]
Your message dated Fri, 24 Jan 2025 14:12:50 +0000 with message-id <87ed0sgv19.fsf <at> gmail.com> and subject line [PATCH] gnu: Syncthing: Update to 1.28.1. has caused the debbugs.gnu.org bug report #74917, regarding [PATCH] gnu: Syncthing: Update to 1.28.1. to be marked as done. (If you believe you have received this mail in error, please contact help-debbugs <at> gnu.org.) -- 74917: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=74917 GNU Bug Tracking System Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: Leo Famulari <leo <at> famulari.name> To: guix-patches <at> gnu.org Subject: [PATCH] gnu: Syncthing: Update to 1.28.1. Date: Mon, 16 Dec 2024 16:12:45 -0500* gnu/packages/syncthing.scm (syncthing): Update to 1.28.1. [arguments]: Adjust the 'build' and 'install' phases to upstream changes. Change-Id: Icc7342ce13ffa03df51e4e71faf2e19a0636635f --- gnu/packages/syncthing.scm | 113 ++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 57 deletions(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index 71a1eb3326..345017d80d 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Petter <petter <at> mykolab.ch> -;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari <leo <at> famulari.name> +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021, 2024 Leo Famulari <leo <at> famulari.name> ;;; Copyright © 2020 Tobias Geerinckx-Rice <me <at> tobias.gr> ;;; Copyright © 2020-2022 Efraim Flashner <efraim <at> flashner.co.il> ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul <at> autistici.org> @@ -49,7 +49,7 @@ (define-module (gnu packages syncthing) (define-public syncthing (package (name "syncthing") - (version "1.27.2") + (version "1.28.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -57,71 +57,70 @@ (define-public syncthing "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "0g418jyqqik8ds8qcrlnmm2bhwwpbrfgd82fg2jyip4zw1aicqia")))) + "16j5w6hdr1x2231hw0zsxm53sw34wxcs4ijjjcnzcg1vz9drjrg9")))) (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 ;; of "out" by ~144 MiB. (outputs '("out" "utils")) (arguments - (list #:modules '((srfi srfi-26) ; for cut - (guix build utils) - (guix build go-build-system)) - #:import-path "github.com/syncthing/syncthing" - ;; We don't need to install the source code for end-user applications. - #:install-source? #f - #:phases - #~(modify-phases %standard-phases - (add-before 'build 'increase-test-timeout - (lambda _ - (substitute* "src/github.com/syncthing/syncthing/build.go" - (("120s") "999s")))) + (list + #:modules '((srfi srfi-26) ; for cut + (guix build utils) + (guix build go-build-system)) + #:import-path "github.com/syncthing/syncthing" + ;; We don't need to install the source code for end-user applications. + #:install-source? #f + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'increase-test-timeout + (lambda _ + (substitute* "src/github.com/syncthing/syncthing/build.go" + (("120s") "999s")))) - (replace 'build - (lambda _ - (with-directory-excursion "src/github.com/syncthing/syncthing" - ;; XXX The only way to build Syncthing without its automatic - ;; updater and to build the utilities is to "build all" and then - ;; "build syncthing" again with -no-upgrade. - ;; https://github.com/syncthing/syncthing/issues/6118 - (invoke "go" "run" "build.go") - (delete-file "bin/syncthing") - (invoke "go" "run" "build.go" "-no-upgrade" "build" "syncthing")))) + (replace 'build + (lambda _ + (with-directory-excursion "src/github.com/syncthing/syncthing" + ; Build the primary Syncthing executable + (invoke "go" "run" "build.go" "-no-upgrade") + ; Build utilities used to run an independent Syncthing network + (for-each (cut invoke "go" "run" "build.go" "build" <>) + '("stcrashreceiver" "strelaypoolsrv" "stupgrades" + "ursrv"))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (with-directory-excursion "src/github.com/syncthing/syncthing" - (invoke "go" "run" "build.go" "test"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "src/github.com/syncthing/syncthing" + (invoke "go" "run" "build.go" "test"))))) - (replace 'install - (lambda _ - (with-directory-excursion "src/github.com/syncthing/syncthing/bin" - (install-file "../syncthing" (string-append #$output "/bin")) - (for-each (cut install-file <> (string-append #$output:utils "/bin/")) - '("stcompdirs" "stcrashreceiver" - "stdisco" "stdiscosrv" "stevents" "stfileinfo" - "stfinddevice" "stfindignored" "stgenfiles" - "strelaypoolsrv" "strelaysrv" "stsigtool" - "stvanity" "stwatchfile" "ursrv"))))) + (replace 'install + (lambda _ + (with-directory-excursion "src/github.com/syncthing/syncthing/bin" + (install-file "syncthing" (string-append #$output "/bin")) + (for-each (cut install-file <> (string-append #$output:utils "/bin/")) + '("stdiscosrv" "strelaysrv"))) + (with-directory-excursion "src/github.com/syncthing/syncthing" + (for-each (cut install-file <> (string-append #$output:utils "/bin/")) + '("ursrv" "stupgrades" "strelaypoolsrv" "stcrashreceiver"))))) - (add-after 'install 'install-docs - (lambda _ - (let ((man (string-append #$output "/share/man")) - (man:utils (string-append #$output:utils "/share/man"))) - ;; Install all the man pages to "out". - (for-each - (lambda (file) - (install-file file - (string-append man "/man" (string-take-right file 1)))) - (find-files "src/github.com/syncthing/syncthing/man" "\\.[1-9]")) - ;; Copy all the man pages to "utils" - (copy-recursively man man:utils) - ;; Delete extraneous man pages from "out" and "utils", - ;; respectively. - (delete-file (string-append man "/man1/stdiscosrv.1")) - (delete-file (string-append man "/man1/strelaysrv.1")) - (delete-file (string-append man:utils "/man1/syncthing.1")))))))) + (add-after 'install 'install-docs + (lambda _ + (let ((man (string-append #$output "/share/man")) + (man:utils (string-append #$output:utils "/share/man"))) + ;; Install all the man pages to "out". + (for-each + (lambda (file) + (install-file file + (string-append man "/man" (string-take-right file 1)))) + (find-files "src/github.com/syncthing/syncthing/man" "\\.[1-9]")) + ;; Copy all the man pages to "utils" + (copy-recursively man man:utils) + ;; Delete extraneous man pages from "out" and "utils", + ;; respectively. + (delete-file (string-append man "/man1/stdiscosrv.1")) + (delete-file (string-append man "/man1/strelaysrv.1")) + (delete-file (string-append man:utils "/man1/syncthing.1")))))))) (synopsis "Decentralized continuous file system synchronization") (description "Syncthing is a peer-to-peer file synchronization tool that supports a wide variety of computing platforms. It uses the Block Exchange base-commit: 93eca69d69355dc37ebcc9193d5af19cbac8071c -- 2.46.0
[Message part 3 (message/rfc822, inline)]
From: Sharlatan Hellseher <sharlatanus <at> gmail.com> To: 74917-done <at> debbugs.gnu.org Subject: [PATCH] gnu: Syncthing: Update to 1.28.1. Date: Fri, 24 Jan 2025 14:12:50 +0000[Message part 4 (text/plain, inline)]Hi, Pushed as 317ee994d6beb3cf3f26eab31f3c9916ba28a6e9 to master. --8<---------------cut here---------------start------------->8--- > $(./pre-inst-env guix build syncthing | head -n1)/bin/syncthing --version syncthing v1.28.1 "Gold Grasshopper" (go1.21.5 linux-amd64) nixbld <at> localhost 1970-01-01 00:00:01 UTC [noupgrade, purego] --8<---------------cut here---------------end--------------->8--- -- Thanks, Oleg[signature.asc (application/pgp-signature, inline)]
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.