python: Make .isPyPy flag more accurate.

nix-repl> map (s: s.isPyPy) [ python python3 pypy pypy3 ]
[ false false true true ]
wip/yesman
Corbin 5 years ago committed by Frederik Rietdijk
parent ef0345a3fa
commit 5719f892e1
  1. 2
      lib/default.nix
  2. 2
      pkgs/development/interpreters/python/default.nix

@ -81,7 +81,7 @@ let
intersperse concatStringsSep concatMapStringsSep
concatImapStringsSep makeSearchPath makeSearchPathOutput
makeLibraryPath makeBinPath optionalString
hasPrefix hasSuffix stringToCharacters stringAsChars escape
hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape
escapeShellArg escapeShellArgs replaceChars lowerChars
upperChars toLower toUpper addContextFrom splitString
removePrefix removeSuffix versionOlder versionAtLeast getVersion

@ -30,7 +30,7 @@ with pkgs;
isPy2 = lib.strings.substring 0 1 pythonVersion == "2";
isPy3 = lib.strings.substring 0 1 pythonVersion == "3";
isPy3k = isPy3;
isPyPy = interpreter == "pypy";
isPyPy = lib.hasInfix "pypy" interpreter;
buildEnv = callPackage ./wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
withPackages = import ./with-packages.nix { inherit buildEnv pythonPackages;};

Loading…
Cancel
Save