diff options
| author | Matej Cotman <cotman.matej@gmail.com> | 2014-06-19 18:03:40 +0200 |
|---|---|---|
| committer | Matej Cotman <cotman.matej@gmail.com> | 2014-06-19 18:04:18 +0200 |
| commit | 25785270b74d93b7c7b1163a7967631e17f33706 (patch) | |
| tree | e119f22fb1ea2efeb4088e05b434b072bdd1d76b /pkgs/applications | |
| parent | e0de0bc47087974aae1275e0c5c641fd0a1b8002 (diff) | |
| download | nixlib-25785270b74d93b7c7b1163a7967631e17f33706.tar nixlib-25785270b74d93b7c7b1163a7967631e17f33706.tar.gz nixlib-25785270b74d93b7c7b1163a7967631e17f33706.tar.bz2 nixlib-25785270b74d93b7c7b1163a7967631e17f33706.tar.lz nixlib-25785270b74d93b7c7b1163a7967631e17f33706.tar.xz nixlib-25785270b74d93b7c7b1163a7967631e17f33706.tar.zst nixlib-25785270b74d93b7c7b1163a7967631e17f33706.zip | |
syncthing: update from 0.8.11 to 0.8.15
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/syncthing/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/networking/syncthing/upnp.patch | 28 |
2 files changed, 2 insertions, 32 deletions
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 28603daa9c67..8f169180dd5e 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/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" diff --git a/pkgs/applications/networking/syncthing/upnp.patch b/pkgs/applications/networking/syncthing/upnp.patch deleted file mode 100644 index f4164b4f6bc3..000000000000 --- a/pkgs/applications/networking/syncthing/upnp.patch +++ /dev/null @@ -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 { |