Merge pull request #116530 from adisbladis/poetry2nix-1_16_1

poetry2nix: 1.16.0 -> 1.16.1

authored by adisbladis and committed by GitHub 6af448d9 45a014f4

+77 -9
+1 -1
pkgs/development/tools/poetry2nix/poetry2nix/default.nix
··· 5 5 }: 6 6 let 7 7 # Poetry2nix version 8 - version = "1.16.0"; 8 + version = "1.16.1"; 9 9 10 10 inherit (poetryLib) isCompatible readTOML moduleName; 11 11
+76 -8
pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
··· 250 250 } 251 251 ); 252 252 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 + 253 262 gdal = super.gdal.overridePythonAttrs ( 254 263 old: { 255 264 preBuild = (old.preBuild or "") + '' ··· 266 275 } 267 276 ); 268 277 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 + 269 295 h3 = super.h3.overridePythonAttrs ( 270 296 old: { 271 297 preBuild = (old.preBuild or "") + '' ··· 277 303 278 304 h5py = super.h5py.overridePythonAttrs ( 279 305 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 288 334 ); 289 335 290 336 horovod = super.horovod.overridePythonAttrs ( ··· 618 664 } 619 665 ); 620 666 667 + munch = super.munch.overridePythonAttrs ( 668 + old: { 669 + buildInputs = (old.buildInputs or [ ]) ++ [ self.pbr ]; 670 + } 671 + ); 672 + 621 673 mysqlclient = super.mysqlclient.overridePythonAttrs ( 622 674 old: { 623 675 buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libmysqlclient ]; ··· 939 991 } 940 992 ); 941 993 994 + pygeos = super.pygeos.overridePythonAttrs ( 995 + old: { 996 + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.geos ]; 997 + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.geos ]; 998 + } 999 + ); 1000 + 942 1001 pygobject = super.pygobject.overridePythonAttrs ( 943 1002 old: { 944 1003 nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; ··· 1224 1283 1225 1284 rmfuse = super.rmfuse.overridePythonAttrs (old: { 1226 1285 propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ self.setuptools ]; 1286 + }); 1287 + 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 + ''; 1227 1295 }); 1228 1296 1229 1297 scipy = super.scipy.overridePythonAttrs (