diff options
author | Austin Seipp <aseipp@pobox.com> | 2014-06-20 16:41:09 -0500 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2014-06-20 16:41:09 -0500 |
commit | 4d0d8916446584c8588f2ff8260e6ea869b7fb4a (patch) | |
tree | 0451405b3c0b5b459cd4ff69bf7ff2603aa03de9 /pkgs/applications | |
parent | 5a84af7b320d842c3c8d1701a94412ab1746a383 (diff) | |
parent | 25785270b74d93b7c7b1163a7967631e17f33706 (diff) | |
download | nixlib-4d0d8916446584c8588f2ff8260e6ea869b7fb4a.tar nixlib-4d0d8916446584c8588f2ff8260e6ea869b7fb4a.tar.gz nixlib-4d0d8916446584c8588f2ff8260e6ea869b7fb4a.tar.bz2 nixlib-4d0d8916446584c8588f2ff8260e6ea869b7fb4a.tar.lz nixlib-4d0d8916446584c8588f2ff8260e6ea869b7fb4a.tar.xz nixlib-4d0d8916446584c8588f2ff8260e6ea869b7fb4a.tar.zst nixlib-4d0d8916446584c8588f2ff8260e6ea869b7fb4a.zip |
Merge pull request #3019 from matejc/syncthing0815
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 { |