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:
github-actions[bot]
2021-03-11 12:21:28 +00:00
committed by GitHub
parent 31dc9fe457 0213d5f933
commit b4d5951d9e
33 changed files with 388 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+16 -4
View File
@@ -1464,7 +1464,10 @@ in {
constantly = callPackage ../development/python-modules/constantly { };
construct = callPackage ../development/python-modules/construct { };
construct = if isPy27 then
callPackage ../development/python-modules/construct/2.10.54.nix { }
else
callPackage ../development/python-modules/construct { };
consul = callPackage ../development/python-modules/consul { };
@@ -1474,7 +1477,10 @@ in {
contextvars = callPackage ../development/python-modules/contextvars { };
convertdate = callPackage ../development/python-modules/convertdate { };
convertdate = if isPy27 then
callPackage ../development/python-modules/convertdate/2.2.x.nix { }
else
callPackage ../development/python-modules/convertdate { };
cookiecutter = callPackage ../development/python-modules/cookiecutter { };
@@ -1668,7 +1674,10 @@ in {
inherit (pkgs.llvmPackages) libcxx;
};
dateparser = callPackage ../development/python-modules/dateparser { };
dateparser = if isPy27 then
callPackage ../development/python-modules/dateparser/0.x.nix { }
else
callPackage ../development/python-modules/dateparser { };
datrie = callPackage ../development/python-modules/datrie { };
@@ -8367,7 +8376,10 @@ in {
varint = callPackage ../development/python-modules/varint { };
vcrpy = callPackage ../development/python-modules/vcrpy { };
vcrpy = if isPy27 then
callPackage ../development/python-modules/vcrpy/3.nix { }
else
callPackage ../development/python-modules/vcrpy { };
vcver = callPackage ../development/python-modules/vcver { };