nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-22 20:14:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

pythonInterpreters.pypy38_prebuilt: 7.3.6 -> 7.3.7

Browse Source 
Change python language version and attribute.
This commit is contained in:
Frederik Rietdijk 2022-01-15 16:48:02 +01:00 committed by Frederik Rietdijk
parent 731db1820d
commit 2ced686d5b
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/interpreters/python/default.nix
View File

@ -286,16 +286,16 @@ in {
inherit passthruFun;
};
pypy36_prebuilt = callPackage ./pypy/prebuilt.nix {
pypy38_prebuilt = callPackage ./pypy/prebuilt.nix {
# Not included at top-level
self = pythonInterpreters.pypy36_prebuilt;
self = pythonInterpreters.pypy38_prebuilt;
sourceVersion = {
major = "7";
minor = "3";
patch = "3";
patch = "7";
};
sha256 = "02lys9bjky9bqg6ggv8djirbd3zzcsq7755v4yvwm0k4a7fmzf2g"; # linux64
pythonVersion = "3.6";
sha256 = "sha256-Xe43x8PLixYAKPveOlkBxoBD36VFoWeUUCuJfUvEDX4="; # linux64
pythonVersion = "3.8";
inherit passthruFun;
};

20
pkgs/development/interpreters/python/pypy/prebuilt.nix
View File

@ -6,8 +6,9 @@
, which
# Dependencies
, bzip2
, sqlite
, zlib
, openssl_1_0_2
, openssl
, expat
, ncurses6
, tcl-8_5
@ -27,12 +28,12 @@ with lib;
let
isPy3k = majorVersion == "3";
passthru = passthruFun {
passthru = passthruFun rec {
inherit self sourceVersion pythonVersion packageOverrides;
implementation = "pypy";
libPrefix = "pypy${pythonVersion}";
executable = "pypy${if isPy3k then "3" else ""}";
sitePackages = "site-packages";
sitePackages = "lib/${libPrefix}/site-packages";
hasDistutilsCxxPatch = false;
# Not possible to cross-compile with.
@ -49,8 +50,9 @@ let
deps = [
bzip2
sqlite
zlib
openssl_1_0_2
openssl
expat
ncurses6
tcl-8_5
@ -68,10 +70,9 @@ in with passthru; stdenv.mkDerivation {
buildInputs = [ which ];
installPhase = ''
mkdir -p $out/lib
mkdir -p $out
echo "Moving files to $out"
mv -t $out bin include lib-python lib_pypy site-packages
mv lib/libffi.so.6* $out/lib/
mv -t $out bin include lib
mv $out/bin/libpypy*-c.so $out/lib/
@ -84,8 +85,9 @@ in with passthru; stdenv.mkDerivation {
$out/bin/pypy*
pushd $out
find {lib,lib_pypy*} -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \;
find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${lib.makeLibraryPath deps}:$out/lib {} \;
find ./lib -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \;
find ./lib -name "*.so" -exec patchelf --set-rpath ${lib.makeLibraryPath deps}:$out/lib {} \;
echo "Removing bytecode"
find . -name "__pycache__" -type d -depth -exec rm -rf {} \;