diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2023-01-04 21:40:39 +0000 |
|---|---|---|
| committer | Thiago Kenji Okada <thiagokokada@gmail.com> | 2023-01-07 21:11:48 +0000 |
| commit | 284d9a1067bc0714017659d294bcf260421e4ef7 (patch) | |
| tree | 050be03b18f2753aeac1195147af3f9fb60fc813 | |
| parent | 6339c29710b71c2f575d1a4e67385b3b1ca02734 (diff) | |
| download | nixpkgs-284d9a1067bc0714017659d294bcf260421e4ef7.tar nixpkgs-284d9a1067bc0714017659d294bcf260421e4ef7.tar.gz nixpkgs-284d9a1067bc0714017659d294bcf260421e4ef7.tar.bz2 nixpkgs-284d9a1067bc0714017659d294bcf260421e4ef7.tar.lz nixpkgs-284d9a1067bc0714017659d294bcf260421e4ef7.tar.xz nixpkgs-284d9a1067bc0714017659d294bcf260421e4ef7.tar.zst nixpkgs-284d9a1067bc0714017659d294bcf260421e4ef7.zip | |
pypy27: 7.3.9 -> 7.3.11
Also build it with pythonInterpreters.pypy27_prebuilt instead of python27, to avoid it being broken after #201859 is merged. Keep in mind that the above change will make this derivation only work with x86_64-linux for now (since pypy27_prebuilt is only packaged for that platform). However support for newer platforms can be added later, and a working package for one platform is better than a broken package in 4 platforms.
| -rw-r--r-- | pkgs/development/interpreters/python/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 7f220054f28..d0cb4a7a992 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -247,13 +247,13 @@ in { sourceVersion = { major = "7"; minor = "3"; - patch = "9"; + patch = "11"; }; - sha256 = "sha256-ObCXKVb2VIzlgoAZ264SUDwy1svpGivs+I0+QsxSGXs="; + sha256 = "sha256-ERevtmgx2k6m852NIIR4enRon9AineC+MB+e2bJVCTw="; pythonVersion = "2.7"; db = db.override { dbmSupport = !stdenv.isDarwin; }; - python = __splicedPackages.python27; + python = __splicedPackages.pythonInterpreters.pypy27_prebuilt; inherit passthruFun; inherit (darwin) libunwind; inherit (darwin.apple_sdk.frameworks) Security; diff --git a/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch b/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch index 15d03830e07..cf1bcddeba6 100644 --- a/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch +++ b/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch @@ -1,14 +1,18 @@ --- a/lib_pypy/_tkinter/tklib_build.py +++ b/lib_pypy/_tkinter/tklib_build.py -@@ -17,19 +17,14 @@ elif sys.platform == 'win32': +@@ -17,23 +17,14 @@ elif sys.platform == 'win32': incdirs = [] linklibs = ['tcl85', 'tk85'] libdirs = [] -elif sys.platform == 'darwin': - # homebrew +- homebrew = os.environ.get('HOMEBREW_PREFIX', '') - incdirs = ['/usr/local/opt/tcl-tk/include'] - linklibs = ['tcl8.6', 'tk8.6'] -- libdirs = ['/usr/local/opt/tcl-tk/lib'] +- libdirs = [] +- if homebrew: +- incdirs.append(homebrew + '/include') +- libdirs.append(homebrew + '/opt/tcl-tk/lib') else: # On some Linux distributions, the tcl and tk libraries are # stored in /usr/include, so we must check this case also |