git.iko.soy/typeable/nixpkgs
on master help sign in
poetry2nix: 1.15.4 -> 1.15.5
commite22280882c2d18be5a1f85ca5fc310a7719cc9f0 authoradisbladis <adisbladis@gmail.com> dateThu 18 Feb 2021, 09:27 (6 years ago) parent8d007ab
2 files changed+21−5
pkgs/development/tools/poetry2nix/poetry2nix/default.nix+1−1 pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix+20−4
pkgs/development/tools/poetry2nix/poetry2nix/default.nix+1−1
@@ -71,7 +71,7 @@ in
7171lib.makeScope pkgs.newScope (self: {
7272
7373 # Poetry2nix version
74− version = "1.15.4";
74+ version = "1.15.5";
7575
7676 /* Returns a package of editable sources whose changes will be available without needing to restart the
7777 nix-shell.
pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix+20−4
@@ -46,6 +46,12 @@ self: super:
4646 }
4747 );
4848
49+ anyio = super.anyio.overridePythonAttrs (old: {
50+ postPatch = ''
51+ substituteInPlace setup.py --replace 'setup()' 'setup(version="${old.version}")'
52+ '';
53+ });
54+
4955 astroid = super.astroid.overridePythonAttrs (
5056 old: rec {
5157 buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
@@ -82,7 +88,7 @@ self: super:
8288 );
8389
8490 celery = super.celery.overridePythonAttrs (old: {
85− propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ];
91+ propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
8692 });
8793
8894 cssselect2 = super.cssselect2.overridePythonAttrs (
@@ -283,7 +289,7 @@ self: super:
283289 patchPhase = ''
284290 substituteInPlace setup.py \
285291 --replace "/usr/include/openjpeg-2.3" \
286− "${pkgs.openjpeg.dev}/include/openjpeg-2.3"
292+ "${pkgs.openjpeg.dev}/include/${pkgs.openjpeg.dev.incDir}
287293 substituteInPlace setup.py \
288294 --replace "/usr/include/jxrlib" \
289295 "$out/include/libjxr"
@@ -379,8 +385,8 @@ self: super:
379385 );
380386
381387 jsonslicer = super.jsonslicer.overridePythonAttrs (old: {
382− nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
383− buildInputs = old.buildInputs ++ [ pkgs.yajl ];
388+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig ];
389+ buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.yajl ];
384390 });
385391
386392 jupyter = super.jupyter.overridePythonAttrs (
@@ -847,6 +853,11 @@ self: super:
847853 }
848854 );
849855
856+ pyfuse3 = super.pyfuse3.overridePythonAttrs (old: {
857+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
858+ buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.fuse3 ];
859+ });
860+
850861 pygame = super.pygame.overridePythonAttrs (
851862 old: rec {
852863 nativeBuildInputs = [
@@ -1157,6 +1168,11 @@ self: super:
11571168 '';
11581169 };
11591170
1171+
1172+ rmfuse = super.rmfuse.overridePythonAttrs (old: {
1173+ propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
1174+ });
1175+
11601176 scipy = super.scipy.overridePythonAttrs (
11611177 old:
11621178 if old.format != "wheel" then {