public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python: Make .isPyPy flag more accurate. 

nix-repl> map (s: s.isPyPy) [ python python3 pypy pypy3 ]
[ false false true true ]
This commit is contained in:
Corbin 2019-02-04 00:09:38 -08:00 committed by Frederik Rietdijk
parent ef0345a3fa
commit 5719f892e1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/default.nix
View File

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

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

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