about summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorIzorkin <izorkin@elven.pw>2024-04-04 10:08:26 +0300
committerIzorkin <izorkin@elven.pw>2024-04-04 14:08:35 +0300
commit95dd498dd7faeb18520bb7888fe9f2065288ee9d (patch)
treee49089e255769a04a3a1da294e3be8fefa7650ec /pkgs/servers
parente9f2343ea6f770bdc73fde2ffe42753b329fe6f8 (diff)
wsdd: 0.7.1 -> 0.8
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/wsdd/default.nix10
-rw-r--r--pkgs/servers/wsdd/increase_timeout.patch13
2 files changed, 2 insertions, 21 deletions
diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix
index 6b99e6c593738..65aae2be2ce5f 100644
--- a/pkgs/servers/wsdd/default.nix
+++ b/pkgs/servers/wsdd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wsdd";
-  version = "0.7.1";
+  version = "0.8";
 
   src = fetchFromGitHub {
     owner = "christgau";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-xfZVGi3OxuRI+Zh6L3Ru4J4j5BB1EAN3fllRCVA/c5o=";
+    hash = "sha256-T8/XlQpx4CtNy8LuLwOQBG9muFe9pp5583tDaCT4ReI=";
   };
 
   outputs = [ "out" "man" ];
@@ -17,12 +17,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ python3 ];
 
-  patches = [
-    # Increase timeout to socket urlopen
-    # See https://github.com/christgau/wsdd/issues/80#issuecomment-76848906
-    ./increase_timeout.patch
-  ];
-
   installPhase = ''
     install -Dm0555 src/wsdd.py $out/bin/wsdd
     installManPage man/wsdd.8
diff --git a/pkgs/servers/wsdd/increase_timeout.patch b/pkgs/servers/wsdd/increase_timeout.patch
deleted file mode 100644
index ac619f705d8e3..0000000000000
--- a/pkgs/servers/wsdd/increase_timeout.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/wsdd.py b/src/wsdd.py
-index 88a7a2a..360e4f7 100755
---- a/src/wsdd.py
-+++ b/src/wsdd.py
-@@ -699,7 +699,7 @@ class WSDClient(WSDUDPMessageHandler):
-             request.add_header('Host', host)
-
-         try:
--            with urllib.request.urlopen(request, None, 2.0) as stream:
-+            with urllib.request.urlopen(request, None, 5.0) as stream:
-                 self.handle_metadata(stream.read(), endpoint, xaddr)
-         except urllib.error.URLError as e:
-             logger.warning('could not fetch metadata from: {} {}'.format(url, e))