git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #116530 from adisbladis/poetry2nix-1_16_1

poetry2nix: 1.16.0 -> 1.16.1

commit6af448d9e54d8a0af9bc73ed3eb0eed095b78d03 authoradisbladis <adisbladis@gmail.com> dateTue 16 Mar 2021, 17:44 (6 years ago) parent45a014f215b49c
2 files changed+77−9
pkgs/development/tools/poetry2nix/poetry2nix/default.nix+1−1 pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix+76−8
pkgs/development/tools/poetry2nix/poetry2nix/default.nix+1−1
@@ -5,7 +5,7 @@
55}:
66let
77 # Poetry2nix version
8− version = "1.16.0";
8+ version = "1.16.1";
99
1010 inherit (poetryLib) isCompatible readTOML moduleName;
1111
pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix+76−8
@@ -250,6 +250,15 @@ self: super:
250250 }
251251 );
252252
253+ fiona = super.fiona.overridePythonAttrs (
254+ old: {
255+ buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.gdal_2 ];
256+ nativeBuildInputs = [
257+ pkgs.gdal_2 # for gdal-config
258+ ];
259+ }
260+ );
261+
253262 gdal = super.gdal.overridePythonAttrs (
254263 old: {
255264 preBuild = (old.preBuild or "") + ''
@@ -266,6 +275,23 @@ self: super:
266275 }
267276 );
268277
278+ grpcio = super.grpcio.overridePythonAttrs (old: {
279+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython pkgs.pkg-config ];
280+ buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.c-ares pkgs.openssl pkgs.zlib ];
281+
282+ outputs = [ "out" "dev" ];
283+
284+ GRPC_BUILD_WITH_BORING_SSL_ASM = "";
285+ GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1;
286+ GRPC_PYTHON_BUILD_SYSTEM_ZLIB = 1;
287+ GRPC_PYTHON_BUILD_SYSTEM_CARES = 1;
288+ DISABLE_LIBC_COMPATIBILITY = 1;
289+ });
290+
291+ grpcio-tools = super.grpcio-tools.overridePythonAttrs (old: {
292+ outputs = [ "out" "dev" ];
293+ });
294+
269295 h3 = super.h3.overridePythonAttrs (
270296 old: {
271297 preBuild = (old.preBuild or "") + ''
@@ -277,14 +303,34 @@ self: super:
277303
278304 h5py = super.h5py.overridePythonAttrs (
279305 old:
280− if old.format != "wheel" then rec {
281− nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
282− buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.hdf5 self.pkgconfig self.cython ];
283− configure_flags = "--hdf5=${pkgs.hdf5}";
284− postConfigure = ''
285− ${self.python.executable} setup.py configure ${configure_flags}
286− '';
287− } else old
306+ if old.format != "wheel" then
307+ (
308+ let
309+ mpi = pkgs.hdf5.mpi;
310+ mpiSupport = pkgs.hdf5.mpiSupport;
311+ in
312+ {
313+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
314+ buildInputs =
315+ (old.buildInputs or [ ])
316+ ++ [ pkgs.hdf5 self.pkgconfig self.cython ]
317+ ++ lib.optional mpiSupport mpi
318+ ;
319+ propagatedBuildInputs =
320+ old.propagatedBuildInputs
321+ ++ lib.optionals mpiSupport [ self.mpi4py self.openssh ]
322+ ;
323+ preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else "";
324+ HDF5_DIR = "${pkgs.hdf5}";
325+ HDF5_MPI = if mpiSupport then "ON" else "OFF";
326+ # avoid strict pinning of numpy
327+ postPatch = ''
328+ substituteInPlace setup.py \
329+ --replace "numpy ==" "numpy >="
330+ '';
331+ pythonImportsCheck = [ "h5py" ];
332+ }
333+ ) else old
288334 );
289335
290336 horovod = super.horovod.overridePythonAttrs (
@@ -618,6 +664,12 @@ self: super:
618664 }
619665 );
620666
667+ munch = super.munch.overridePythonAttrs (
668+ old: {
669+ buildInputs = (old.buildInputs or [ ]) ++ [ self.pbr ];
670+ }
671+ );
672+
621673 mysqlclient = super.mysqlclient.overridePythonAttrs (
622674 old: {
623675 buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libmysqlclient ];
@@ -939,6 +991,13 @@ self: super:
939991 }
940992 );
941993
994+ pygeos = super.pygeos.overridePythonAttrs (
995+ old: {
996+ buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.geos ];
997+ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.geos ];
998+ }
999+ );
1000+
9421001 pygobject = super.pygobject.overridePythonAttrs (
9431002 old: {
9441003 nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
@@ -1226,6 +1285,15 @@ self: super:
12261285 propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ];
12271286 });
12281287
1288+ rtree = super.rtree.overridePythonAttrs (old: {
1289+ propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [ ]) ++ [ pkgs.libspatialindex ];
1290+ postPatch = ''
1291+ substituteInPlace rtree/finder.py --replace \
1292+ "find_library('spatialindex_c')" \
1293+ "'${pkgs.libspatialindex}/lib/libspatialindex_c${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}'"
1294+ '';
1295+ });
1296+
12291297 scipy = super.scipy.overridePythonAttrs (
12301298 old:
12311299 if old.format != "wheel" then {