summary refs log tree commit diff
diff options
context:
space:
mode:
authorTheodore Ni <3806110+tjni@users.noreply.github.com>2023-08-01 18:35:33 -0700
committerFrederik Rietdijk <fridh@fridh.nl>2023-08-20 11:00:52 +0200
commit6b6390885543ee52d0569128648ffefb3d2439b7 (patch)
tree88c392db96146e90ed882cb202c37e10a4222328
parent3cd71e0ae67cc48f1135e55bf78cb0d67b53ff86 (diff)
downloadnixpkgs-6b6390885543ee52d0569128648ffefb3d2439b7.tar
nixpkgs-6b6390885543ee52d0569128648ffefb3d2439b7.tar.gz
nixpkgs-6b6390885543ee52d0569128648ffefb3d2439b7.tar.bz2
nixpkgs-6b6390885543ee52d0569128648ffefb3d2439b7.tar.lz
nixpkgs-6b6390885543ee52d0569128648ffefb3d2439b7.tar.xz
nixpkgs-6b6390885543ee52d0569128648ffefb3d2439b7.tar.zst
nixpkgs-6b6390885543ee52d0569128648ffefb3d2439b7.zip
poetry2nix.overrides.wheel: adapt to new wheel version
Co-authored-by: adisbladis <adisbladis@gmail.com>
-rw-r--r--pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix13
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
index 14338423ec3..341d299906b 100644
--- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
+++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides/default.nix
@@ -2738,15 +2738,12 @@ lib.composeManyExtensions [
         }
       );
 
-      wheel = ((
-        pkgs.python3.pkgs.override {
-          python = self.python;
+      wheel = if self.python.isPy2 then
+        super.wheel.override {
+          inherit (self) bootstrapped-pip;
         }
-      ).wheel.override {
-        inherit (self) buildPythonPackage bootstrapped-pip setuptools;
-      }).overrideAttrs (old: {
-        inherit (super.wheel) pname name version src;
-      });
+      else
+        super.wheel;
 
       zipp = if super.zipp == null then null else
       super.zipp.overridePythonAttrs (