Merge pull request #113564 from adisbladis/poetry2nix-1_15_5

poetry2nix: 1.15.4 -> 1.15.5
This commit is contained in:
adisbladis 2021-02-18 09:43:54 +01:00 committed by GitHub
commit ba1643d29d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 5 deletions

View file

@ -71,7 +71,7 @@ in
lib.makeScope pkgs.newScope (self: { lib.makeScope pkgs.newScope (self: {
# Poetry2nix version # 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 /* Returns a package of editable sources whose changes will be available without needing to restart the
nix-shell. nix-shell.

View file

@ -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 ( astroid = super.astroid.overridePythonAttrs (
old: rec { old: rec {
buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
@ -82,7 +88,7 @@ self: super:
); );
celery = super.celery.overridePythonAttrs (old: { celery = super.celery.overridePythonAttrs (old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
}); });
cssselect2 = super.cssselect2.overridePythonAttrs ( cssselect2 = super.cssselect2.overridePythonAttrs (
@ -283,7 +289,7 @@ self: super:
patchPhase = '' patchPhase = ''
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace "/usr/include/openjpeg-2.3" \ --replace "/usr/include/openjpeg-2.3" \
"${pkgs.openjpeg.dev}/include/openjpeg-2.3" "${pkgs.openjpeg.dev}/include/${pkgs.openjpeg.dev.incDir}
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace "/usr/include/jxrlib" \ --replace "/usr/include/jxrlib" \
"$out/include/libjxr" "$out/include/libjxr"
@ -379,8 +385,8 @@ self: super:
); );
jsonslicer = super.jsonslicer.overridePythonAttrs (old: { jsonslicer = super.jsonslicer.overridePythonAttrs (old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkgconfig ];
buildInputs = old.buildInputs ++ [ pkgs.yajl ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.yajl ];
}); });
jupyter = super.jupyter.overridePythonAttrs ( 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 ( pygame = super.pygame.overridePythonAttrs (
old: rec { old: rec {
nativeBuildInputs = [ nativeBuildInputs = [
@ -1157,6 +1168,11 @@ self: super:
''; '';
}; };
rmfuse = super.rmfuse.overridePythonAttrs (old: {
propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
});
scipy = super.scipy.overridePythonAttrs ( scipy = super.scipy.overridePythonAttrs (
old: old:
if old.format != "wheel" then { if old.format != "wheel" then {