public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-06-17 08:40:33 +02:00
parent c610d82167 0b671216bb
commit 8850815577
68 changed files with 458 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+5 -1
View File
@@ -1933,7 +1933,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;
@@ -3264,6 +3266,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 { };