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-01-28 10:46:13 +01:00
parent 778f317820 e328078fe0
commit dce0ca29d9
745 changed files with 15146 additions and 15353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/interpreters/python/default.nix
View File

@@ -159,9 +159,11 @@ in {
};
sha256 = "0yq6ln1ic476sasp8zs4mg5i9524l1p96qwanp486rr1yza1grlg";
pythonVersion = "2.7";
db = db.override { dbmSupport = true; };
db = db.override { dbmSupport = !stdenv.isDarwin; };
python = python27;
inherit passthruFun;
inherit (darwin) libunwind;
inherit (darwin.apple_sdk.frameworks) Security;
};
pypy36 = callPackage ./pypy {
@@ -173,9 +175,11 @@ in {
};
sha256 = "1hqvnran7d2dzj5555n7q680dyzhmbklz04pvkxgb5j604v7kkx1";
pythonVersion = "3.6";
db = db.override { dbmSupport = true; };
db = db.override { dbmSupport = !stdenv.isDarwin; };
python = python27;
inherit passthruFun;
inherit (darwin) libunwind;
inherit (darwin.apple_sdk.frameworks) Security;
};
pypy27_prebuilt = callPackage ./pypy/prebuilt.nix {