Merge pull request #104781 from NixOS/staging-next

Staging next
This commit is contained in:
Frederik Rietdijk
2020-11-30 18:27:29 +01:00
committed by GitHub
87 changed files with 856 additions and 449 deletions
+4 -2
View File
@@ -3465,13 +3465,13 @@ in {
p.overrideAttrs (super: {
meta = super.meta // {
outputsToInstall = [ "py" ];
broken = (super.meta.broken or false) || pythonAtLeast "3.8";
broken = super.meta.broken or isPy27;
};
}))
(p:
p.override {
enablePython = true;
inherit python;
python3 = python;
})
(p: p.py)
];
@@ -6570,6 +6570,8 @@ in {
seabreeze = callPackage ../development/python-modules/seabreeze { };
seccomp = callPackage ../development/python-modules/seccomp { };
secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkgconfig; };
secretstorage = if isPy3k then