diff options
| author | Corbin <cds@corbinsimpson.com> | 2019-02-04 00:09:38 -0800 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-04-09 20:41:08 +0200 |
| commit | 5719f892e1139bae3a9c70bcc77fc1bc98cfb7ea (patch) | |
| tree | 47aaef58a78f1fc227d7b413f6af5b7db85a7ef3 | |
| parent | ef0345a3fa8df8065fd570a453cc352f04842643 (diff) | |
| download | nixpkgs-5719f892e1139bae3a9c70bcc77fc1bc98cfb7ea.tar nixpkgs-5719f892e1139bae3a9c70bcc77fc1bc98cfb7ea.tar.gz nixpkgs-5719f892e1139bae3a9c70bcc77fc1bc98cfb7ea.tar.bz2 nixpkgs-5719f892e1139bae3a9c70bcc77fc1bc98cfb7ea.tar.lz nixpkgs-5719f892e1139bae3a9c70bcc77fc1bc98cfb7ea.tar.xz nixpkgs-5719f892e1139bae3a9c70bcc77fc1bc98cfb7ea.tar.zst nixpkgs-5719f892e1139bae3a9c70bcc77fc1bc98cfb7ea.zip | |
python: Make .isPyPy flag more accurate.
nix-repl> map (s: s.isPyPy) [ python python3 pypy pypy3 ] [ false false true true ]
| -rw-r--r-- | lib/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/default.nix b/lib/default.nix index 688c117d52b..8735b647679 100644 --- a/lib/default.nix +++ b/lib/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 diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 15af58be6fc..71aea332433 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -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;}; |