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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-01-05 10:15:00 +01:00
parent aca57f1aed d9707792b5
commit 60a3973a55
263 changed files with 5867 additions and 3218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/top-level/python-packages.nix
View File

@@ -1119,6 +1119,8 @@ in {
blockdiag = callPackage ../development/python-modules/blockdiag { };
blockdiagcontrib-cisco = callPackage ../development/python-modules/blockdiagcontrib-cisco { };
bpython = callPackage ../development/python-modules/bpython {};
bsddb3 = callPackage ../development/python-modules/bsddb3 { };
@@ -5137,6 +5139,10 @@ in {
pybotvac = callPackage ../development/python-modules/pybotvac { };
pytado = callPackage ../development/python-modules/pytado { };
casttube = callPackage ../development/python-modules/casttube { };
});
in fix' (extends overrides packages)