cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

pypy{27,38,39}: remove global with lib

Browse source
This commit is contained in:
Thiago Kenji Okada 2023-01-08 12:59:25 +00:00
parent 92f0173213
commit a7ffcced44
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pkgs/development/interpreters/python/pypy/default.nix
View file

@ -19,11 +19,9 @@
assert zlibSupport -> zlib != null; assert zlibSupport -> zlib != null;
with lib;
let let
isPy3k = (lib.versions.major pythonVersion) == "3"; isPy3k = (lib.versions.major pythonVersion) == "3";
isPy39OrNewer = versionAtLeast pythonVersion "3.9"; isPy39OrNewer = lib.versionAtLeast pythonVersion "3.9";
passthru = passthruFun { passthru = passthruFun {
inherit self sourceVersion pythonVersion packageOverrides; inherit self sourceVersion pythonVersion packageOverrides;
implementation = "pypy"; implementation = "pypy";
@ -54,13 +52,13 @@ in with passthru; stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl libX11 gdbm db bzip2 openssl pythonForPypy libffi ncurses expat sqlite tk tcl libX11 gdbm db
] ++ optionals isPy3k [ ] ++ lib.optionals isPy3k [
xz xz
] ++ optionals (stdenv ? cc && stdenv.cc.libc != null) [ ] ++ lib.optionals (stdenv ? cc && stdenv.cc.libc != null) [
stdenv.cc.libc stdenv.cc.libc
] ++ optionals zlibSupport [ ] ++ lib.optionals zlibSupport [
zlib zlib
] ++ optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
libunwind Security libunwind Security
]; ];
@ -68,9 +66,9 @@ in with passthru; stdenv.mkDerivation rec {
dontPatchShebangs = true; dontPatchShebangs = true;
disallowedReferences = [ python ]; disallowedReferences = [ python ];
C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" buildInputs; C_INCLUDE_PATH = lib.makeSearchPathOutput "dev" "include" buildInputs;
LIBRARY_PATH = makeLibraryPath buildInputs; LIBRARY_PATH = lib.makeLibraryPath buildInputs;
LD_LIBRARY_PATH = makeLibraryPath (filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); LD_LIBRARY_PATH = lib.makeLibraryPath (builtins.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs);
patches = [ patches = [
./dont_fetch_vendored_deps.patch ./dont_fetch_vendored_deps.patch
@ -117,7 +115,7 @@ in with passthru; stdenv.mkDerivation rec {
cp -R {include,lib_pypy,lib-python,${executable}-c} $out/${executable}-c cp -R {include,lib_pypy,lib-python,${executable}-c} $out/${executable}-c
cp lib${executable}-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/ cp lib${executable}-c${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/
ln -s $out/${executable}-c/${executable}-c $out/bin/${executable} ln -s $out/${executable}-c/${executable}-c $out/bin/${executable}
${optionalString isPy39OrNewer "ln -s $out/bin/${executable}-c $out/bin/pypy3"} ${lib.optionalString isPy39OrNewer "ln -s $out/bin/${executable}-c $out/bin/pypy3"}
# other packages expect to find stuff according to libPrefix # other packages expect to find stuff according to libPrefix
ln -s $out/${executable}-c/include $out/include/${libPrefix} ln -s $out/${executable}-c/include $out/include/${libPrefix}
@ -148,12 +146,12 @@ in with passthru; stdenv.mkDerivation rec {
"test_shutil" "test_shutil"
# disable socket because it has two actual network tests that fail # disable socket because it has two actual network tests that fail
"test_socket" "test_socket"
] ++ optionals (!isPy3k) [ ] ++ lib.optionals (!isPy3k) [
# disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com) # disable test_urllib2net, test_urllib2_localnet, and test_urllibnet because they require networking (example.com)
"test_urllib2net" "test_urllib2net"
"test_urllibnet" "test_urllibnet"
"test_urllib2_localnet" "test_urllib2_localnet"
] ++ optionals isPy3k [ ] ++ lib.optionals isPy3k [
# disable asyncio due to https://github.com/NixOS/nix/issues/1238 # disable asyncio due to https://github.com/NixOS/nix/issues/1238
"test_asyncio" "test_asyncio"
# disable os due to https://github.com/NixOS/nixpkgs/issues/10496 # disable os due to https://github.com/NixOS/nixpkgs/issues/10496
@ -171,7 +169,7 @@ in with passthru; stdenv.mkDerivation rec {
export TERM="xterm"; export TERM="xterm";
export HOME="$TMPDIR"; export HOME="$TMPDIR";
${pythonForPypy.interpreter} ./pypy/test_all.py --pypy=./${executable}-c -k 'not (${concatStringsSep " or " disabledTests})' lib-python ${pythonForPypy.interpreter} ./pypy/test_all.py --pypy=./${executable}-c -k 'not (${lib.concatStringsSep " or " disabledTests})' lib-python
''; '';
# verify cffi modules # verify cffi modules
@ -180,13 +178,13 @@ in with passthru; stdenv.mkDerivation rec {
modules = [ modules = [
"curses" "curses"
"sqlite3" "sqlite3"
] ++ optionals (!isPy3k) [ ] ++ lib.optionals (!isPy3k) [
"Tkinter" "Tkinter"
] ++ optionals isPy3k [ ] ++ lib.optionals isPy3k [
"tkinter" "tkinter"
"lzma" "lzma"
]; ];
imports = concatMapStringsSep "; " (x: "import ${x}") modules; imports = lib.concatMapStringsSep "; " (x: "import ${x}") modules;
in '' in ''
echo "Testing whether we can import modules" echo "Testing whether we can import modules"
$out/bin/${executable} -c '${imports}' $out/bin/${executable} -c '${imports}'