Merge pull request #3019 from matejc/syncthing0815

syncthing: update from 0.8.11 to 0.8.15

pkgs/applications/networking/syncthing/default.nix

@@ -2,18 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "syncthing-${version}";
-  version = "0.8.11";
+  version = "0.8.15";
 
   src = fetchgit {
     url = "git://github.com/calmh/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "16dl9sqwhv0n1602pmi10d5j7z2196ijhvz4rfx7732210qbkpnn";
+    sha256 = "0xv8kaji60zqxws72srh5hdi9fyvaipdcsawp6gcyahhr3cz0ddq";
   };
 
   buildInputs = [ go ];
 
-  patches = [ ./upnp.patch ];
-
   buildPhase = ''
     mkdir -p "./dependencies/src/github.com/calmh/syncthing"
 

pkgs/applications/networking/syncthing/upnp.patch

@@ -1,28 +0,0 @@
-Trying to fix upnp for miniupnpd:
-https://github.com/calmh/syncthing/issues/211
-
-diff --git a/upnp/upnp.go b/upnp/upnp.go
-index 9de719a..9c85b23 100644
---- a/upnp/upnp.go
-+++ b/upnp/upnp.go
-@@ -60,14 +60,12 @@ func Discover() (*IGD, error) {
- 		return nil, err
- 	}
- 
--	search := []byte(`
--M-SEARCH * HTTP/1.1
--Host: 239.255.255.250:1900
--St: urn:schemas-upnp-org:device:InternetGatewayDevice:1
--Man: "ssdp:discover"
--Mx: 3
--
--`)
-+	search := []byte("M-SEARCH * HTTP/1.1\r\n" +
-+"Host: 239.255.255.250:1900\r\n" +
-+"St: urn:schemas-upnp-org:device:InternetGatewayDevice:1\r\n" +
-+"Man: \"ssdp:discover\"\r\n" +
-+"Mx: 3\r\n" +
-+"\r\n")
- 
- 	_, err = socket.WriteTo(search, ssdp)
- 	if err != nil {