diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-09-27 18:40:33 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-09-27 18:40:41 +0000 |
commit | 030c5028b07afcedce7c5956015c629486cc79d9 (patch) | |
tree | 4c3cb9c6cff0e30919a97fc0c1d3203446696f4e /pkgs/development/interpreters/python/python2/mk-python-derivation.nix | |
parent | 4b852f7ef3cb92277f212ba7dc168da1073e65cc (diff) | |
parent | 04c0744afbab2369baf4f134c544db3f24164d80 (diff) | |
download | nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.gz nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.bz2 nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.lz nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.xz nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.tar.zst nixpkgs-030c5028b07afcedce7c5956015c629486cc79d9.zip |
Rebase onto c1a53897ad4290a1cbfa02fbe6f3869577b93744
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'pkgs/development/interpreters/python/python2/mk-python-derivation.nix')
-rw-r--r-- | pkgs/development/interpreters/python/python2/mk-python-derivation.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix index e5f9c00b2fb..d42e4e85c10 100644 --- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix @@ -98,12 +98,10 @@ , ... } @ attrs: -assert lib.assertMsg (format != "flit") "flit is not a supported Python 2 format"; - let inherit (python) stdenv; - withDistOutput = lib.elem format ["pyproject" "setuptools" "flit" "wheel"]; + withDistOutput = lib.elem format ["pyproject" "setuptools" "wheel"]; name_ = name; @@ -171,7 +169,7 @@ let nativeBuildInputs = [ python wrapPython - ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? + ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, ...)? pythonRemoveTestsDirHook ] ++ lib.optionals catchConflicts [ pythonCatchConflictsHook |