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
2018-12-26 09:30:32 +01:00
parent e5271b72cc 0a1dc96ada
commit e45ca47f14
43 changed files with 264 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -648,6 +648,7 @@ in {
python-hosts = callPackage ../development/python-modules/python-hosts { };
python-lz4 = callPackage ../development/python-modules/python-lz4 { };
lz4 = self.python-lz4; # alias 2018-12-05
python-ldap-test = callPackage ../development/python-modules/python-ldap-test { };
@@ -3268,8 +3269,6 @@ in {
ldappool = callPackage ../development/python-modules/ldappool { };
lz4 = callPackage ../development/python-modules/lz4 { };
retrying = callPackage ../development/python-modules/retrying { };
fasteners = callPackage ../development/python-modules/fasteners { };
@@ -4259,7 +4258,9 @@ in {
blessings = callPackage ../development/python-modules/blessings { };
secretstorage = callPackage ../development/python-modules/secretstorage { };
secretstorage = if isPy3k
then callPackage ../development/python-modules/secretstorage { }
else callPackage ../development/python-modules/secretstorage/2.nix { };
semantic = callPackage ../development/python-modules/semantic { };