From eddcc1c01c73e8744f77bff999a1d7503bda33d0 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 8 Jan 2023 13:00:49 +0000 Subject: [PATCH] pythonInterpreters.pypy27_prebuilt: remove global with lib --- .../development/interpreters/python/pypy/prebuilt_2_7.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index d57d77351c51..a95e0c2f651e 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -26,8 +26,6 @@ # This version of PyPy is primarily added to speed-up translation of # our PyPy source build when developing that expression. -with lib; - let isPy3k = majorVersion == "3"; passthru = passthruFun { @@ -134,12 +132,12 @@ in with passthru; stdenv.mkDerivation { "ssl" "sys" "curses" - ] ++ optionals (!isPy3k) [ + ] ++ lib.optionals (!isPy3k) [ "Tkinter" - ] ++ optionals isPy3k [ + ] ++ lib.optionals isPy3k [ "tkinter" ]; - imports = concatMapStringsSep "; " (x: "import ${x}") modules; + imports = lib.concatMapStringsSep "; " (x: "import ${x}") modules; in '' echo "Testing whether we can import modules" $out/bin/${executable} -c '${imports}'