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-16 18:05:38 +02:00
parent 7e5769c70c 4fbf2d1b1b
commit 4af4a49251
117 changed files with 1171 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+1 -1
View File
@@ -5745,7 +5745,7 @@ in {
rply = callPackage ../development/python-modules/rply {};
rpm = toPythonModule (pkgs.rpm.override{inherit python;});
rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override{ inherit python; }));
rpmfluff = callPackage ../development/python-modules/rpmfluff {};