Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pulseaudio-dlna: unstable-2017-11-01 -> unstable-2019-02-09 #119469

Closed
wants to merge 1 commit into from
Closed

pulseaudio-dlna: unstable-2017-11-01 -> unstable-2019-02-09 #119469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 45 additions & 25 deletions pkgs/applications/audio/pulseaudio-dlna/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

ERROR: No matching distribution found for dbus-python>=1.0.0

We have 1.2.X https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/dbus/default.nix#L6

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, not sure what is going on there. That's the reason why this PR is in the draft state.

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
Expand Down
30 changes: 0 additions & 30 deletions pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };

Expand Down