Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-07-17 12:01:55 +00:00
committed by GitHub
66 changed files with 1668 additions and 1997 deletions
@@ -239,9 +239,9 @@ in {
sourceVersion = {
major = "7";
minor = "3";
patch = "3";
patch = "5";
};
sha256 = "0di3dr5ry4r0hwxh4fbqjhyl5im948wdby0bhijzsxx83c2qhd7n";
sha256 = "sha256-wERP2YcwWMHA2Z4TqTTpIoXLBZksmWi/Ujwyv5vsCp0=";
pythonVersion = "2.7";
db = db.override { dbmSupport = !stdenv.isDarwin; };
python = python27;
@@ -250,15 +250,15 @@ in {
inherit (darwin.apple_sdk.frameworks) Security;
};
pypy36 = callPackage ./pypy {
self = pypy36;
pypy37 = callPackage ./pypy {
self = pypy37;
sourceVersion = {
major = "7";
minor = "3";
patch = "3";
patch = "5";
};
sha256 = "1bq5i2mqgjjfc4rhxgxm6ihwa76vn2qapd7l59ri7xp01p522gd2";
pythonVersion = "3.6";
sha256 = "sha256-2SD+QJqeytnQdKqFaMpfPtNYG+ZvZuXYmIt+xm5tmaI=";
pythonVersion = "3.7";
db = db.override { dbmSupport = !stdenv.isDarwin; };
python = python27;
inherit passthruFun;