diff options
| -rw-r--r-- | pkgs/servers/wsdd/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/servers/wsdd/increase_timeout.patch | 13 |
2 files changed, 19 insertions, 9 deletions
diff --git a/pkgs/servers/wsdd/default.nix b/pkgs/servers/wsdd/default.nix index f1a385c6809d..07c26872f3fb 100644 --- a/pkgs/servers/wsdd/default.nix +++ b/pkgs/servers/wsdd/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, nixosTests, python3, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, nixosTests, python3 }: stdenv.mkDerivation rec { pname = "wsdd"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "christgau"; repo = pname; rev = "v${version}"; - sha256 = "0444xh1r5wd0zfch1hg1f9s4cw68srrm87hqx16qvlgx6jmz5j0p"; + sha256 = "0lfvpbk1lkri597ac4gz5x4csfyik8axz4b41i03xsqv9bci2vh6"; }; nativeBuildInputs = [ makeWrapper ]; @@ -16,12 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ python3 ]; patches = [ - (fetchpatch { - # https://github.com/christgau/wsdd/issues/72 - name = "fix_send_messages_using_correct_socket.patch"; - url = "https://github.com/christgau/wsdd/commit/1ed74fe73a9fe2e2720859e2822116d65e4ffa5b.patch"; - sha256 = "1n9bqvh20nhnvnc5pxvzf9kk8nky6rmbmfryg65lfmr1hmg676zg"; - }) + # Increase timeout to socket urlopen + # See https://github.com/christgau/wsdd/issues/80#issuecomment-76848906 + ./increase_timeout.patch ]; installPhase = '' diff --git a/pkgs/servers/wsdd/increase_timeout.patch b/pkgs/servers/wsdd/increase_timeout.patch new file mode 100644 index 000000000000..ac619f705d8e --- /dev/null +++ b/pkgs/servers/wsdd/increase_timeout.patch @@ -0,0 +1,13 @@ +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)) |