diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-12-05 22:02:00 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-12-05 22:02:00 -0800 |
| commit | 5263fb820e7d21f5db9053659b183ffcaf398f5b (patch) | |
| tree | e129ad5b5e1cfc90026a294453f33b4d778cb66a /pkgs/development/interpreters/python | |
| parent | 423aff986c53d465175135ee72c3584c88394de9 (diff) | |
| parent | 2aaf7277718841775d6c69d7db86e8e8e1d1f678 (diff) | |
| download | nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar.gz nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar.bz2 nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar.lz nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar.xz nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.tar.zst nixpkgs-5263fb820e7d21f5db9053659b183ffcaf398f5b.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/python-modules/django-rq/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/interpreters/python')
| -rw-r--r-- | pkgs/development/interpreters/python/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 9c61eeb5a1d..e7b86eef96c 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -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; |