diff options
| author | Brendan Long <self@brendanlong.com> | 2015-01-06 17:57:14 -0600 |
|---|---|---|
| committer | Brendan Long <self@brendanlong.com> | 2015-01-06 17:57:14 -0600 |
| commit | ca88aec8ed024d0831a38bc733a44dd5de93fd8c (patch) | |
| tree | 330b57e61bd4ba21662114052297c26bc20f7763 /pkgs/applications/networking | |
| parent | f8bd5bb401e7c47b66b4cf44b150707824a5f41d (diff) | |
| download | nixpkgs-ca88aec8ed024d0831a38bc733a44dd5de93fd8c.tar nixpkgs-ca88aec8ed024d0831a38bc733a44dd5de93fd8c.tar.gz nixpkgs-ca88aec8ed024d0831a38bc733a44dd5de93fd8c.tar.bz2 nixpkgs-ca88aec8ed024d0831a38bc733a44dd5de93fd8c.tar.lz nixpkgs-ca88aec8ed024d0831a38bc733a44dd5de93fd8c.tar.xz nixpkgs-ca88aec8ed024d0831a38bc733a44dd5de93fd8c.tar.zst nixpkgs-ca88aec8ed024d0831a38bc733a44dd5de93fd8c.zip | |
syncthing: Update to 0.10.18 and remove workarounds needed for 0.10.17.
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/syncthing/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/applications/networking/syncthing/fix-go-1.4-range.patch | 14 |
2 files changed, 2 insertions, 23 deletions
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 09facfab3d5..5f45c3a8d04 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -2,29 +2,22 @@ stdenv.mkDerivation rec { name = "syncthing-${version}"; - version = "0.10.17"; + version = "0.10.18"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "1hv0va7234rgyahn8xvpyj1bsbmn7ifsyqm7b3ghhybinclghp1w"; + sha256 = "145i7rrqjly6h07b5kf0zwlxy8gh0jlpq6pwfgjmf0kilrvncla1"; }; buildInputs = [ go ]; - patches = [ - # Remove when Go 1.4 is available in Nix, or when this pull request is released: - # https://github.com/syncthing/syncthing/pull/1183 - ./fix-go-1.4-range.patch - ]; - buildPhase = '' mkdir -p "./dependencies/src/github.com/syncthing/syncthing" cp -r internal "./dependencies/src/github.com/syncthing/syncthing" export GOPATH="`pwd`/Godeps/_workspace:`pwd`/dependencies" - # Tests can't be run in parallel because TestPredictableRandom relies on global state go run build.go test mkdir ./bin diff --git a/pkgs/applications/networking/syncthing/fix-go-1.4-range.patch b/pkgs/applications/networking/syncthing/fix-go-1.4-range.patch deleted file mode 100644 index 8aacc68bd98..00000000000 --- a/pkgs/applications/networking/syncthing/fix-go-1.4-range.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/internal/model/queue_test.go b/internal/model/queue_test.go -index 3745664..96aaf38 100644 ---- a/internal/model/queue_test.go -+++ b/internal/model/queue_test.go -@@ -191,7 +191,7 @@ func BenchmarkJobQueuePushPopDone10k(b *testing.B) { - for _, f := range files { - q.Push(f.Name) - } -- for range files { -+ for _ = range files { - n, _ := q.Pop() - q.Done(n) - } --- |