From e22280882c2d18be5a1f85ca5fc310a7719cc9f0 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 18 Feb 2021 09:27:20 +0100 Subject: [PATCH] poetry2nix: 1.15.4 -> 1.15.5 --- .../tools/poetry2nix/poetry2nix/default.nix | 2 +- .../tools/poetry2nix/poetry2nix/overrides.nix | 24 +++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 47c3e26fa6a..c23b50b8403 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -71,7 +71,7 @@ in lib.makeScope pkgs.newScope (self: { # Poetry2nix version - version = "1.15.4"; + version = "1.15.5"; /* Returns a package of editable sources whose changes will be available without needing to restart the nix-shell. diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 9ee690815fa..7a5233fecdf 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -46,6 +46,12 @@ self: super: } ); + anyio = super.anyio.overridePythonAttrs (old: { + postPatch = '' + substituteInPlace setup.py --replace 'setup()' 'setup(version="${old.version}")' + ''; + }); + astroid = super.astroid.overridePythonAttrs ( old: rec { buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; @@ -82,7 +88,7 @@ self: super: ); celery = super.celery.overridePythonAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; }); cssselect2 = super.cssselect2.overridePythonAttrs ( @@ -283,7 +289,7 @@ self: super: patchPhase = '' substituteInPlace setup.py \ --replace "/usr/include/openjpeg-2.3" \ - "${pkgs.openjpeg.dev}/include/openjpeg-2.3" + "${pkgs.openjpeg.dev}/include/${pkgs.openjpeg.dev.incDir} substituteInPlace setup.py \ --replace "/usr/include/jxrlib" \ "$out/include/libjxr" @@ -379,8 +385,8 @@ self: super: ); jsonslicer = super.jsonslicer.overridePythonAttrs (old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.yajl ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.yajl ]; }); jupyter = super.jupyter.overridePythonAttrs ( @@ -847,6 +853,11 @@ self: super: } ); + pyfuse3 = super.pyfuse3.overridePythonAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.fuse3 ]; + }); + pygame = super.pygame.overridePythonAttrs ( old: rec { nativeBuildInputs = [ @@ -1157,6 +1168,11 @@ self: super: ''; }; + + rmfuse = super.rmfuse.overridePythonAttrs (old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; + }); + scipy = super.scipy.overridePythonAttrs ( old: if old.format != "wheel" then {