diff options
| author | Benjamin Staffin <benley@gmail.com> | 2020-06-17 17:22:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 17:22:24 -0400 |
| commit | 19d3665b75f59eb98ca656c2b643a4adc0f0744e (patch) | |
| tree | 455aed025973e748f264df336d5dc0e7ae40dad5 /pkgs/top-level/python-packages.nix | |
| parent | 13a14e2bfe4ff3b7da222624ce5749218105e465 (diff) | |
| parent | 19dfc1b01149e5d60860cd0f4b0f8abcb3faabbf (diff) | |
| download | nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.gz nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.bz2 nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.lz nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.xz nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.tar.zst nixlib-19d3665b75f59eb98ca656c2b643a4adc0f0744e.zip | |
Merge branch 'master' into benley/melonDS
Diffstat (limited to 'pkgs/top-level/python-packages.nix')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e7e70563526..331f7292b930 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1927,7 +1927,9 @@ in { bids-validator = callPackage ../development/python-modules/bids-validator { }; - binwalk = callPackage ../development/python-modules/binwalk { }; + binwalk = callPackage ../development/python-modules/binwalk { + pyqtgraph = null; + }; binwalk-full = appendToName "full" (self.binwalk.override { pyqtgraph = self.pyqtgraph; @@ -3250,6 +3252,8 @@ in { plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy {}; + playsound = callPackage ../development/python-modules/playsound { }; + plexapi = callPackage ../development/python-modules/plexapi { }; plexauth = callPackage ../development/python-modules/plexauth { }; |