Merge pull request #5614 from brendanlong/syncthing-0.10.18

syncthing: Update to 0.10.18 and remove workarounds needed for 0.10.17.

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

pkgs/applications/networking/syncthing/fix-go-1.4-range.patch

@@ -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)
- 		}
---