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
2019-01-02 21:08:27 +01:00
parent 070290bda7 82f679c269
commit 092e3b50a8
97 changed files with 1187 additions and 858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1129,6 +1129,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 { };
@@ -5139,6 +5141,16 @@ in {
importlib-resources = callPackage ../development/python-modules/importlib-resources {};
srptools = callPackage ../development/python-modules/srptools { };
curve25519-donna = callPackage ../development/python-modules/curve25519-donna { };
pyatv = callPackage ../development/python-modules/pyatv { };
pybotvac = callPackage ../development/python-modules/pybotvac { };
pytado = callPackage ../development/python-modules/pytado { };
});
in fix' (extends overrides packages)