diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-07-14 19:37:37 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-07-16 23:31:15 -0400 |
| commit | 3d68137c6e5094ac738745ac41ec980af725590b (patch) | |
| tree | a4d2754738bad9a517d9deb1f58fc6548c3a81c8 /pkgs/development/interpreters | |
| parent | c168edeeb93fd551e8d0eb50387cc44addce7aef (diff) | |
| download | nixlib-3d68137c6e5094ac738745ac41ec980af725590b.tar nixlib-3d68137c6e5094ac738745ac41ec980af725590b.tar.gz nixlib-3d68137c6e5094ac738745ac41ec980af725590b.tar.bz2 nixlib-3d68137c6e5094ac738745ac41ec980af725590b.tar.lz nixlib-3d68137c6e5094ac738745ac41ec980af725590b.tar.xz nixlib-3d68137c6e5094ac738745ac41ec980af725590b.tar.zst nixlib-3d68137c6e5094ac738745ac41ec980af725590b.zip | |
pypy: 7.3.3 -> 7.3.5
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/python/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/pypy/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/pypy/sqlite_paths.patch | 12 |
3 files changed, 21 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 2c89fdd42196..f700eb163a90 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -236,9 +236,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; @@ -252,9 +252,9 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "3"; + patch = "5"; }; - sha256 = "sha256-9slkAfdjMeR0zKLRRDfrOy9ooPJyIKbcvFN0Rf6dW3g="; + sha256 = "sha256-2SD+QJqeytnQdKqFaMpfPtNYG+ZvZuXYmIt+xm5tmaI="; pythonVersion = "3.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; python = python27; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index e4e95ad4c57d..668a4e24b39e 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -83,6 +83,11 @@ in with passthru; stdenv.mkDerivation rec { tk_libprefix = tk.libPrefix; tcl_libprefix = tcl.libPrefix; }) + + (substituteAll { + src = ./sqlite_paths.patch; + inherit (sqlite) out dev; + }) ]; postPatch = '' @@ -90,8 +95,6 @@ in with passthru; stdenv.mkDerivation rec { --replace "multiprocessing.cpu_count()" "$NIX_BUILD_CORES" substituteInPlace "lib-python/${if isPy3k then "3/tkinter/tix.py" else "2.7/lib-tk/Tix.py"}" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" - - sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py ''; buildPhase = '' diff --git a/pkgs/development/interpreters/python/pypy/sqlite_paths.patch b/pkgs/development/interpreters/python/pypy/sqlite_paths.patch new file mode 100644 index 000000000000..42de7efb3ea3 --- /dev/null +++ b/pkgs/development/interpreters/python/pypy/sqlite_paths.patch @@ -0,0 +1,12 @@ +diff -ur a/lib_pypy/_sqlite3_build.py b/lib_pypy/_sqlite3_build.py +--- a/lib_pypy/_sqlite3_build.py 2021-04-12 01:11:48.000000000 -0400 ++++ b/lib_pypy/_sqlite3_build.py 2021-07-14 18:08:33.000000000 -0400 +@@ -301,6 +301,8 @@ + else: + extra_args = dict( + libraries=libraries, ++ include_dirs=['@dev@/include'], ++ library_dirs=['@out@/lib'] + ) + + SOURCE = """ |