···

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
stdenv.mkDerivation rec {

     

       
4
       
4
       
 
       
  name = "syncthing-${version}";

     

       
5
       
5
       
-
       
  version = "0.10.17";

     

       
5
       
5
       
+
       
  version = "0.10.18";

     

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
  src = fetchgit {

     

       
8
       
8
       
 
       
    url = "git://github.com/syncthing/syncthing.git";

     

       
9
       
9
       
 
       
    rev = "refs/tags/v${version}";

     

       
10
       
10
       
-
       
    sha256 = "1hv0va7234rgyahn8xvpyj1bsbmn7ifsyqm7b3ghhybinclghp1w";

     

       
10
       
10
       
+
       
    sha256 = "145i7rrqjly6h07b5kf0zwlxy8gh0jlpq6pwfgjmf0kilrvncla1";

     

       
11
       
11
       
 
       
  };

     

       
12
       
12
       
 
       


     

       
13
       
13
       
 
       
  buildInputs = [ go ];

     

       
14
       
14
       
 
       


     

       
15
       
15
       
-
       
  patches = [

     

       
16
       
16
       
-
       
    # Remove when Go 1.4 is available in Nix, or when this pull request is released:

     

       
17
       
17
       
-
       
    # https://github.com/syncthing/syncthing/pull/1183

     

       
18
       
18
       
-
       
    ./fix-go-1.4-range.patch

     

       
19
       
19
       
-
       
  ];

     

       
20
       
20
       
-
       


     

       
21
       
15
       
 
       
  buildPhase = ''

     

       
22
       
16
       
 
       
    mkdir -p "./dependencies/src/github.com/syncthing/syncthing"

     

       
23
       
17
       
 
       
    cp -r internal "./dependencies/src/github.com/syncthing/syncthing"

     

       
24
       
18
       
 
       


     

       
25
       
19
       
 
       
    export GOPATH="`pwd`/Godeps/_workspace:`pwd`/dependencies"

     

       
26
       
20
       
 
       


     

       
27
       
27
       
-
       
    # Tests can't be run in parallel because TestPredictableRandom relies on global state

     

       
28
       
21
       
 
       
    go run build.go test

     

       
29
       
22
       
 
       


     

       
30
       
23
       
 
       
    mkdir ./bin

     

···

       
1
       
1
       
-
       
diff --git a/internal/model/queue_test.go b/internal/model/queue_test.go

     

       
2
       
2
       
-
       
index 3745664..96aaf38 100644

     

       
3
       
3
       
-
       
--- a/internal/model/queue_test.go

     

       
4
       
4
       
-
       
+++ b/internal/model/queue_test.go

     

       
5
       
5
       
-
       
@@ -191,7 +191,7 @@ func BenchmarkJobQueuePushPopDone10k(b *testing.B) {

     

       
6
       
6
       
-
       
 		for _, f := range files {

     

       
7
       
7
       
-
       
 			q.Push(f.Name)

     

       
8
       
8
       
-
       
 		}

     

       
9
       
9
       
-
       
-		for range files {

     

       
10
       
10
       
-
       
+		for _ = range files {

     

       
11
       
11
       
-
       
 			n, _ := q.Pop()

     

       
12
       
12
       
-
       
 			q.Done(n)

     

       
13
       
13
       
-
       
 		}

     

       
14
       
14
       
-
       
--