nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Update syncthing to 0.14.44. 

* gnu/packages/syncthing.scm (syncthing): Update to 0.14.44.
[inputs]: Add go-github-com-prometheus-union and remove
go-github-com-edsrzf-mmap-go.
[source]: Delete bundled dependencies in a snippet.
[arguments]: Remove the 'delete-bundled-source-code' phase.
master
Leo Famulari 2018-01-28 19:09:09 -05:00
parent 5c8c1511e8
commit 30335a2963
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gnu/packages/syncthing.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 Petter <petter@mykolab.ch>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2018 Leo Famulari <leo@famulari.name>
;;;
;;; This file is part of GNU Guix.
;;;
@ -28,7 +28,7 @@
(define-public syncthing
(package
(name "syncthing")
(version "0.14.43")
(version "0.14.44")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/syncthing/syncthing"
@ -36,7 +36,11 @@
"/syncthing-source-v" version ".tar.gz"))
(sha256
(base32
"175xkc4i00axxljc5kgkr30lm1s9hfmz0hrzrsl91rpwpbh500mv"))))
"0fxq52w1b05928xp0a333rg23fabj0nykgg7v4gz01f3vrxyydi1"))
(modules '((guix build utils)))
;; Delete bundled ("vendored") free software source code.
(snippet
'(delete-file-recursively "vendor"))))
(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
@ -49,18 +53,6 @@
#:install-source? #f
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'delete-bundled-source-code
(lambda _
;; Keep the bundled cznic libraries. There are some "internal"
;; cznic libraries that complicate the use of non-bundled copies.
(rename-file "src/github.com/syncthing/syncthing/vendor/github.com/cznic"
"cznic")
(delete-file-recursively "src/github.com/syncthing/syncthing/vendor")
(mkdir-p "src/github.com/syncthing/syncthing/vendor/github.com/")
(rename-file "cznic"
"src/github.com/syncthing/syncthing/vendor/github.com/cznic")
#t))
(add-before 'build 'increase-test-timeout
(lambda _
(substitute* "src/github.com/syncthing/syncthing/build.go"
@ -129,11 +121,9 @@
("go-github-com-calmh-xdr" ,go-github-com-calmh-xdr)
("go-github-com-ccding-go-stun"
,go-github-com-ccding-go-stun)
("go-github-com-prometheus-union" ,(go-github-com-prometheus-union))
("go-github-com-chmduquesne-rollinghash-adler32"
,go-github-com-chmduquesne-rollinghash-adler32)
; ("go-github-com-cznic-ql" ,go-github-com-cznic-ql) ; bundled
; Used by bundled ql
("go-github-com-edsrzf-mmap-go" ,go-github-com-edsrzf-mmap-go)
("go-github-com-gobwas-glob" ,go-github-com-gobwas-glob)
("go-github-com-gogo-protobuf-union"
,(go-github-com-gogo-protobuf-union))