gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
	pkgs/development/python-modules/django-rq/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Jonathan Ringer
2021-12-05 22:02:00 -08:00
parent 423aff986c 2aaf727771
commit 5263fb820e
142 changed files with 808 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/python/default.nix
+5 -5
View File
@@ -252,15 +252,15 @@ in {
inherit (darwin.apple_sdk.frameworks) Security;
};
pypy37 = callPackage ./pypy {
self = pypy37;
pypy38 = callPackage ./pypy {
self = pypy38;
sourceVersion = {
major = "7";
minor = "3";
patch = "5";
patch = "7";
};
sha256 = "sha256-2SD+QJqeytnQdKqFaMpfPtNYG+ZvZuXYmIt+xm5tmaI=";
pythonVersion = "3.7";
sha256 = "sha256-Ia4zn09QFtbKcwAwXz47VUNzg1yzw5qQQf4w5oEcgMY=";
pythonVersion = "3.8";
db = db.override { dbmSupport = !stdenv.isDarwin; };
python = python27;
inherit passthruFun;