From ca88aec8ed024d0831a38bc733a44dd5de93fd8c Mon Sep 17 00:00:00 2001
From: Brendan Long <self@brendanlong.com>
Date: Tue, 6 Jan 2015 17:57:14 -0600
Subject: [PATCH] syncthing: Update to 0.10.18 and remove workarounds needed
 for 0.10.17.

---
 pkgs/applications/networking/syncthing/default.nix | 11 ++---------
 .../networking/syncthing/fix-go-1.4-range.patch    | 14 --------------
 2 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/applications/networking/syncthing/fix-go-1.4-range.patch

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 09facfab3d51..5f45c3a8d043 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 8aacc68bd988..000000000000
--- 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)
- 		}
---