[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
35/35: gnu: Syncthing: Update to 1.3.4.
From: |
guix-commits |
Subject: |
35/35: gnu: Syncthing: Update to 1.3.4. |
Date: |
Thu, 13 Feb 2020 19:55:40 -0500 (EST) |
lfam pushed a commit to branch master
in repository guix.
commit 3dbab6824de2a733420929d269deb2e746064e09
Author: Leo Famulari <address@hidden>
AuthorDate: Wed Feb 12 17:04:41 2020 -0500
gnu: Syncthing: Update to 1.3.4.
* gnu/packages/syncthing.scm (syncthing): Update to 1.3.4.
[arguments]: Adjust to changes in the upstream build tooling in the 'build'
and 'install' phases.
[inputs]: Add go-github-com-cespare-xxhash.
---
gnu/packages/syncthing.scm | 38 +++++++++++++++++++++++++-------------
1 file changed, 25 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm
index 10f5e59..2357b08 100644
--- a/gnu/packages/syncthing.scm
+++ b/gnu/packages/syncthing.scm
@@ -30,7 +30,7 @@
(define-public syncthing
(package
(name "syncthing")
- (version "1.2.2")
+ (version "1.3.4")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/syncthing/syncthing"
@@ -38,7 +38,7 @@
"/syncthing-source-v" version ".tar.gz"))
(sha256
(base32
- "1wdjh8xw09s1nfkpc95v04619gqa4dpbygp2y5l35ww4g916lv3s"))
+ "025fhfqzcl5qd38zak8485pd67iqkzsf6frm02cl25s3ggv2f0p4"))
(modules '((guix build utils)))
;; Delete bundled ("vendored") free software source code.
(snippet '(begin
@@ -100,7 +100,10 @@
("go-github-com-d4l3k-messagediff" ,go-github-com-d4l3k-messagediff)))
(arguments
- `(#:import-path "github.com/syncthing/syncthing"
+ `(#: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
@@ -114,7 +117,13 @@
(replace 'build
(lambda _
(with-directory-excursion "src/github.com/syncthing/syncthing"
- (invoke "go" "run" "build.go" "-no-upgrade"))))
+ ;; 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" "build" "all")
+ (delete-file "syncthing")
+ (invoke "go" "run" "build.go" "-no-upgrade" "build"
"syncthing"))))
(replace 'check
(lambda _
@@ -124,14 +133,16 @@
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
- (utils (assoc-ref outputs "utils"))
- (src "src/github.com/syncthing/syncthing/bin/"))
- (install-file (string-append src "/syncthing")
- (string-append out "/bin"))
- (delete-file (string-append src "/syncthing"))
- (copy-recursively "src/github.com/syncthing/syncthing/bin/"
- (string-append utils "/bin"))
- #t)))
+ (utils (assoc-ref outputs "utils")))
+ (with-directory-excursion "src/github.com/syncthing/syncthing"
+ (install-file "syncthing" (string-append out "/bin"))
+ (for-each (cut install-file <> utils)
+ '("stcli" "stcompdirs" "stcrashreceiver"
+ "stdisco" "stdiscosrv" "stevents" "stfileinfo"
+ "stfinddevice" "stfindignored" "stgenfiles"
+ "stindex" "strelaypoolsrv" "strelaysrv"
"stsigtool"
+ "stvanity" "stwatchfile" "uraggregate" "ursrv"))
+ #t))))
(add-after 'install 'install-docs
(lambda* (#:key outputs #:allow-other-keys)
@@ -920,7 +931,8 @@ system, kernel, and process metrics from the @file{/proc}
pseudo file system.")
,go-github-com-prometheus-client-model)
("go-github-com-prometheus-common"
,go-github-com-prometheus-common)
- ("go-github-com-prometheus-procfs" ,go-github-com-prometheus-procfs)))
+ ("go-github-com-prometheus-procfs" ,go-github-com-prometheus-procfs)
+ ("go-github-com-cespare-xxhash" ,go-github-com-cespare-xxhash)))
(synopsis "HTTP server and client tools for Prometheus")
(description "This package @code{promhttp} provides HTTP client and
server tools for Prometheus metrics.")
- 11/35: gnu: go-golang-org-x-net: Update to 0.0.0-4.ba9fcec., (continued)
- 11/35: gnu: go-golang-org-x-net: Update to 0.0.0-4.ba9fcec., guix-commits, 2020/02/13
- 14/35: gnu: go-gopkg.in-asn1-ber.v1: Update to 1.3., guix-commits, 2020/02/13
- 17/35: gnu: go-github-com-rcrowley-go-metrics: Update to 0.0.0-2.cac0b30., guix-commits, 2020/02/13
- 15/35: gnu: go-github-com-minio-sha256-simd: Update to 0.1.0., guix-commits, 2020/02/13
- 19/35: gnu: go-github-com-gogo-protobuf: Update to 1.3.1., guix-commits, 2020/02/13
- 24/35: gnu: Add go-github-com-pmezard-go-difflib., guix-commits, 2020/02/13
- 26/35: gnu: Add go-github-com-russross-blackfriday., guix-commits, 2020/02/13
- 20/35: gnu: go-github-com-oschwald-geoip2-golang: Update to 1.4.0., guix-commits, 2020/02/13
- 32/35: gnu: go-github-com-marten-seemann-qtls: Update to 0.3.2., guix-commits, 2020/02/13
- 34/35: gnu: Add go-github-com-cespare-xxhash., guix-commits, 2020/02/13
- 35/35: gnu: Syncthing: Update to 1.3.4.,
guix-commits <=
- 31/35: gnu: go-github-com-minio-sha256-simd: Update to 0.1.1., guix-commits, 2020/02/13
- 30/35: gnu: go-github-com-syndtr-goleveldb: Update to 1.0.1-4.7581283., guix-commits, 2020/02/13
- 21/35: gnu: go-github-com-pkg-errors: Update to 0.9.0., guix-commits, 2020/02/13
- 28/35: gnu: go-github-com-urfave-cli: Update to 1.22.2., guix-commits, 2020/02/13
- 22/35: gnu: Change upstream for the go-nat-pmp Go NAT-PMP client., guix-commits, 2020/02/13
- 27/35: gnu: Add go-github-com-go-md2man., guix-commits, 2020/02/13
- 23/35: gnu: go-github-com-mattn-go-isatty: Update to 0.0.11., guix-commits, 2020/02/13
- 25/35: gnu: Add go-github-com-shurcool-sanitized-anchor-name., guix-commits, 2020/02/13
- 29/35: gnu: go-github-com-prometheus-client-golang: Update to 1.2.1., guix-commits, 2020/02/13
- 33/35: gnu: go-github-com-lucas-clemente-quic-go: Update to 0.12.1., guix-commits, 2020/02/13