From 658f02b5ca109d6eb1713550049a5fdbb3eda273 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Wed, 14 Apr 2021 23:53:49 +0200
Subject: [PATCH] pulseaudio-dlna: unstable-2017-11-01 -> unstable-2019-02-09

---
 .../audio/pulseaudio-dlna/default.nix         | 70 ++++++++++++-------
 .../audio/pulseaudio-dlna/zeroconf.nix        | 30 --------
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 46 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix

diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix
index 83de192c6b316ce..3adf14404a2cccb 100644
--- a/pkgs/applications/audio/pulseaudio-dlna/default.nix
+++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix
@@ -1,37 +1,57 @@
-{ fetchFromGitHub, lib, pythonPackages
-, mp3Support ? true, lame ? null
-, opusSupport ? true, opusTools ? null
-, faacSupport ? false, faac ? null
-, flacSupport ? true, flac ? null
-, soxSupport ? true, sox ? null
-, vorbisSupport ? true, vorbis-tools ? null
+{ lib
+, buildPythonApplication
+, fetchFromGitHub
+, chardet
+, dbus-python
+, docopt
+, lxml
+, netifaces
+, notify2
+, protobuf
+, psutil
+, PyChromecast
+, pygobject2
+, pyroute2
+, requests
+, setproctitle
+, setuptools
+, zeroconf
+, mp3Support ? true, lame
+, opusSupport ? true, opusTools
+, faacSupport ? false, faac
+, flacSupport ? true, flac
+, soxSupport ? true, sox
+, vorbisSupport ? true, vorbis-tools
 }:
 
-assert mp3Support -> lame != null;
-assert opusSupport -> opusTools != null;
-assert faacSupport -> faac != null;
-assert flacSupport -> flac != null;
-assert soxSupport -> sox != null;
-assert vorbisSupport -> vorbis-tools != null;
-
-let
-  zeroconf = pythonPackages.callPackage ./zeroconf.nix { };
-in
-pythonPackages.buildPythonApplication {
+buildPythonApplication rec {
   pname = "pulseaudio-dlna";
-  version = "unstable-2017-11-01";
+  version = "unstable-2019-02-09";
 
   src = fetchFromGitHub {
     owner = "masmu";
     repo = "pulseaudio-dlna";
-    rev = "4472928dd23f274193f14289f59daec411023ab0";
-    sha256 = "1dfn7036vrq49kxv4an7rayypnm5dlawsf02pfsldw877hzdamqk";
+    rev = "b0db8137224f5a293329a60187365168304c3768";  # HEAD of "python3" branch
+    sha256 = "109dhww3vq87apwrbl82ylcvl595vm1aw04y217fidd854xbh07h";
   };
 
-  propagatedBuildInputs = with pythonPackages; [
-    dbus-python docopt requests setproctitle protobuf psutil futures
-    chardet notify2 netifaces pyroute2 pygobject2 lxml setuptools ]
-    ++ [ zeroconf ]
+  propagatedBuildInputs = [
+    chardet
+    dbus-python
+    docopt
+    lxml
+    netifaces
+    notify2
+    protobuf
+    psutil
+    PyChromecast
+    pygobject2
+    pyroute2
+    requests
+    setproctitle
+    setuptools
+    zeroconf
+  ]
     ++ lib.optional mp3Support lame
     ++ lib.optional opusSupport opusTools
     ++ lib.optional faacSupport faac
diff --git a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix
deleted file mode 100644
index d4f3306697d7cf7..000000000000000
--- a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, ifaddr
-, typing
-, pythonOlder
-, netifaces
-, six
-, enum-compat
-}:
-
-buildPythonPackage rec {
-  pname = "zeroconf";
-  version = "0.19.1";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0ykzg730n915qbrq9bn5pn06bv6rb5zawal4sqjyfnjjm66snkj3";
-  };
-
-  propagatedBuildInputs = [ netifaces six enum-compat ifaddr ]
-    ++ lib.optionals (pythonOlder "3.5") [ typing ];
-
-  meta = with lib; {
-    description = "A pure python implementation of multicast DNS service discovery";
-    homepage = "https://github.com/jstasiak/python-zeroconf";
-    license = licenses.lgpl21;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee8b9b9e3d25901..4cb5e5da3a5f1e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26992,7 +26992,7 @@ with pkgs;
 
   pulseaudio-ctl = callPackage ../applications/audio/pulseaudio-ctl { };
 
-  pulseaudio-dlna = callPackage ../applications/audio/pulseaudio-dlna { };
+  pulseaudio-dlna = python3Packages.callPackage ../applications/audio/pulseaudio-dlna { };
 
   pulseview = libsForQt514.callPackage ../applications/science/electronics/pulseview { };