diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-15 00:02:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-15 00:02:50 +0000 |
| commit | 58cfebde3eede0e9c2748c5bed37214bfbc9fe6f (patch) | |
| tree | b9d168d1652129d38f70a1237f1bc1f404a7c867 /pkgs/development/interpreters/python | |
| parent | 09d09e98283d7258e6b199b7ab363f34b004dc6a (diff) | |
| parent | 7eb730a25d36b1aaf6ce0e1bb9a8fb306c06a44e (diff) | |
| download | nixpkgs-58cfebde3eede0e9c2748c5bed37214bfbc9fe6f.tar nixpkgs-58cfebde3eede0e9c2748c5bed37214bfbc9fe6f.tar.gz nixpkgs-58cfebde3eede0e9c2748c5bed37214bfbc9fe6f.tar.bz2 nixpkgs-58cfebde3eede0e9c2748c5bed37214bfbc9fe6f.tar.lz nixpkgs-58cfebde3eede0e9c2748c5bed37214bfbc9fe6f.tar.xz nixpkgs-58cfebde3eede0e9c2748c5bed37214bfbc9fe6f.tar.zst nixpkgs-58cfebde3eede0e9c2748c5bed37214bfbc9fe6f.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/interpreters/python')
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 6fad25ee8d6..b7597a9925b 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -26,7 +26,7 @@ let inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; - executable = "pypy${if isPy39OrNewer then lib.versions.majorMinor pythonVersion else if isPy3k then "3" else ""}"; + executable = "pypy${if isPy39OrNewer then lib.versions.majorMinor pythonVersion else lib.optionalString isPy3k "3"}"; sitePackages = "site-packages"; hasDistutilsCxxPatch = false; inherit pythonAttr; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index a25ab8a7822..9b3baf84848 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -32,7 +32,7 @@ let inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; - executable = "pypy${if isPy3k then "3" else ""}"; + executable = "pypy${lib.optionalString isPy3k "3"}"; sitePackages = "lib/${libPrefix}/site-packages"; hasDistutilsCxxPatch = false; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index a95e0c2f651..ddf3963060d 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -32,7 +32,7 @@ let inherit self sourceVersion pythonVersion packageOverrides; implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; - executable = "pypy${if isPy3k then "3" else ""}"; + executable = "pypy${lib.optionalString isPy3k "3"}"; sitePackages = "site-packages"; hasDistutilsCxxPatch = false; |