alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #112707 from adisbladis/poetry2nix-1_15_3

Browse source 
poetry2nix: 1.15.2 -> 1.15.3
This commit is contained in:
adisbladis 2021-02-11 09:25:27 +01:00 committed by GitHub
parent 0e7742c5ba 44321d73f7
commit 4ab0783f7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 97 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/tools/poetry2nix/poetry2nix/default.nix
View file

@ -71,7 +71,7 @@ in
lib.makeScope pkgs.newScope (self: { lib.makeScope pkgs.newScope (self: {
# Poetry2nix version # Poetry2nix version
version = "1.15.2"; version = "1.15.3";
/* 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.

188
pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
View file

@ -39,7 +39,7 @@ self: super:
ansible-lint = super.ansible-lint.overridePythonAttrs ( ansible-lint = super.ansible-lint.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ];
preBuild = '' preBuild = ''
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
''; '';
@ -48,42 +48,42 @@ self: super:
astroid = super.astroid.overridePythonAttrs ( astroid = super.astroid.overridePythonAttrs (
old: rec { old: rec {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
doCheck = false; doCheck = false;
} }
); );
av = super.av.overridePythonAttrs ( av = super.av.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
pkgs.pkg-config pkgs.pkg-config
]; ];
buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.ffmpeg_4 ];
} }
); );
bcrypt = super.bcrypt.overridePythonAttrs ( bcrypt = super.bcrypt.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ pkgs.libffi ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libffi ];
} }
); );
cairocffi = super.cairocffi.overridePythonAttrs ( cairocffi = super.cairocffi.overridePythonAttrs (
old: { old: {
inherit (pkgs.python3.pkgs.cairocffi) patches; inherit (pkgs.python3.pkgs.cairocffi) patches;
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
} }
); );
cairosvg = super.cairosvg.overridePythonAttrs ( cairosvg = super.cairosvg.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
} }
); );
cssselect2 = super.cssselect2.overridePythonAttrs ( cssselect2 = super.cssselect2.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
} }
); );
@ -93,14 +93,14 @@ self: super:
( (
super.cffi.overridePythonAttrs ( super.cffi.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs or [ ] ++ [ pkgs.libffi ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libffi ];
} }
) )
); );
cftime = super.cftime.overridePythonAttrs ( cftime = super.cftime.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ buildInputs = (old.buildInputs or [ ]) ++ [
self.cython self.cython
]; ];
} }
@ -108,13 +108,13 @@ self: super:
colour = super.colour.overridePythonAttrs ( colour = super.colour.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.d2to1 ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.d2to1 ];
} }
); );
configparser = super.configparser.overridePythonAttrs ( configparser = super.configparser.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ buildInputs = (old.buildInputs or [ ]) ++ [
self.toml self.toml
]; ];
@ -126,9 +126,12 @@ self: super:
cryptography = super.cryptography.overridePythonAttrs ( cryptography = super.cryptography.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs or [ ] nativeBuildInputs = (old.nativeBuildInputs or [ ])
++ lib.optional (lib.versionAtLeast old.version "3.4") [ self.setuptools-rust ]
++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi; ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi;
buildInputs = old.buildInputs ++ [ pkgs.openssl ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ];
} // lib.optionalAttrs (lib.versionAtLeast old.version "3.4" && lib.versionOlder old.version "3.5") {
CRYPTOGRAPHY_DONT_BUILD_RUST = "1";
} }
); );
@ -136,17 +139,17 @@ self: super:
postPatch = '' postPatch = ''
substituteInPlace setup.py --replace "setuptools==" "setuptools>=" substituteInPlace setup.py --replace "setuptools==" "setuptools>="
''; '';
buildInputs = old.buildInputs ++ [ self.setuptools ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools ];
}); });
ddtrace = super.ddtrace.overridePythonAttrs (old: { ddtrace = super.ddtrace.overridePythonAttrs (old: {
buildInputs = old.buildInputs ++ buildInputs = (old.buildInputs or [ ]) ++
(pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.darwin.IOKit ]) ++ [ self.cython ]; (pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.darwin.IOKit ]) ++ [ self.cython ];
}); });
dictdiffer = super.dictdiffer.overridePythonAttrs ( dictdiffer = super.dictdiffer.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ];
} }
); );
@ -178,8 +181,8 @@ self: super:
enableParallelBuilding = true; enableParallelBuilding = true;
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
nativeBuildInputs = old.nativeBuildInputs ++ pkgs.dlib.nativeBuildInputs; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ pkgs.dlib.nativeBuildInputs;
buildInputs = old.buildInputs ++ pkgs.dlib.buildInputs; buildInputs = (old.buildInputs or [ ]) ++ pkgs.dlib.buildInputs;
} }
); );
@ -206,7 +209,7 @@ self: super:
faker = super.faker.overridePythonAttrs ( faker = super.faker.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
doCheck = false; doCheck = false;
} }
); );
@ -223,13 +226,13 @@ self: super:
fastparquet = super.fastparquet.overridePythonAttrs ( fastparquet = super.fastparquet.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
} }
); );
grandalf = super.grandalf.overridePythonAttrs ( grandalf = super.grandalf.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
doCheck = false; doCheck = false;
} }
); );
@ -246,8 +249,8 @@ self: super:
h5py = super.h5py.overridePythonAttrs ( h5py = super.h5py.overridePythonAttrs (
old: old:
if old.format != "wheel" then rec { if old.format != "wheel" then rec {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.hdf5 self.pkgconfig self.cython ];
configure_flags = "--hdf5=${pkgs.hdf5}"; configure_flags = "--hdf5=${pkgs.hdf5}";
postConfigure = '' postConfigure = ''
${self.python.executable} setup.py configure ${configure_flags} ${self.python.executable} setup.py configure ${configure_flags}
@ -287,7 +290,7 @@ self: super:
''; '';
buildInputs = old.buildInputs ++ [ buildInputs = (old.buildInputs or [ ]) ++ [
# Commented out packages are declared required, but not actually # Commented out packages are declared required, but not actually
# needed to build. They are not yet packaged for nixpkgs. # needed to build. They are not yet packaged for nixpkgs.
# bitshuffle # bitshuffle
@ -347,7 +350,7 @@ self: super:
jira = super.jira.overridePythonAttrs ( jira = super.jira.overridePythonAttrs (
old: { old: {
inherit (pkgs.python3Packages.jira) patches; inherit (pkgs.python3Packages.jira) patches;
buildInputs = old.buildInputs ++ [ buildInputs = (old.buildInputs or [ ]) ++ [
self.pytestrunner self.pytestrunner
self.cryptography self.cryptography
self.pyjwt self.pyjwt
@ -372,7 +375,7 @@ self: super:
keyring = super.keyring.overridePythonAttrs ( keyring = super.keyring.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ buildInputs = (old.buildInputs or [ ]) ++ [
self.toml self.toml
]; ];
postPatch = '' postPatch = ''
@ -383,7 +386,7 @@ self: super:
kiwisolver = super.kiwisolver.overridePythonAttrs ( kiwisolver = super.kiwisolver.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ buildInputs = (old.buildInputs or [ ]) ++ [
self.cppy self.cppy
]; ];
} }
@ -404,7 +407,7 @@ self: super:
llvmlite = super.llvmlite.overridePythonAttrs ( llvmlite = super.llvmlite.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.llvm ];
# Disable static linking # Disable static linking
# https://github.com/numba/llvmlite/issues/93 # https://github.com/numba/llvmlite/issues/93
@ -433,8 +436,8 @@ self: super:
lxml = super.lxml.overridePythonAttrs ( lxml = super.lxml.overridePythonAttrs (
old: { old: {
nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkg-config libxml2.dev libxslt.dev ]; nativeBuildInputs = with pkgs; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ];
buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; buildInputs = with pkgs; (old.buildInputs or [ ]) ++ [ libxml2 libxslt ];
} }
); );
@ -459,11 +462,11 @@ self: super:
XDG_RUNTIME_DIR = "/tmp"; XDG_RUNTIME_DIR = "/tmp";
buildInputs = old.buildInputs buildInputs = (old.buildInputs or [ ])
++ lib.optional enableGhostscript pkgs.ghostscript ++ lib.optional enableGhostscript pkgs.ghostscript
++ lib.optional stdenv.isDarwin [ Cocoa ]; ++ lib.optional stdenv.isDarwin [ Cocoa ];
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
pkgs.pkg-config pkgs.pkg-config
]; ];
@ -494,16 +497,16 @@ self: super:
mccabe = super.mccabe.overridePythonAttrs ( mccabe = super.mccabe.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
doCheck = false; doCheck = false;
} }
); );
mip = super.mip.overridePythonAttrs ( mip = super.mip.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.autoPatchelfHook ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.autoPatchelfHook ];
buildInputs = old.buildInputs ++ [ pkgs.zlib self.cppy ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.zlib self.cppy ];
} }
); );
@ -519,11 +522,11 @@ self: super:
excludes = [ "pyproject.toml" ]; excludes = [ "pyproject.toml" ];
}) })
]; ];
buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ];
} }
)) else )) else
super.molecule.overridePythonAttrs (old: { super.molecule.overridePythonAttrs (old: {
buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.setuptools-scm-git-archive ];
}); });
mongomock = super.mongomock.overridePythonAttrs (oa: { mongomock = super.mongomock.overridePythonAttrs (oa: {
@ -557,19 +560,19 @@ self: super:
multiaddr = super.multiaddr.overridePythonAttrs ( multiaddr = super.multiaddr.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
} }
); );
mysqlclient = super.mysqlclient.overridePythonAttrs ( mysqlclient = super.mysqlclient.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ pkgs.libmysqlclient ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.libmysqlclient ];
} }
); );
netcdf4 = super.netcdf4.overridePythonAttrs ( netcdf4 = super.netcdf4.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ buildInputs = (old.buildInputs or [ ]) ++ [
self.cython self.cython
]; ];
@ -613,8 +616,8 @@ self: super:
}; };
in in
{ {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gfortran ];
buildInputs = old.buildInputs ++ [ blas self.cython ]; buildInputs = (old.buildInputs or [ ]) ++ [ blas self.cython ];
enableParallelBuilding = true; enableParallelBuilding = true;
preBuild = '' preBuild = ''
ln -s ${cfg} site.cfg ln -s ${cfg} site.cfg
@ -628,21 +631,21 @@ self: super:
openexr = super.openexr.overridePythonAttrs ( openexr = super.openexr.overridePythonAttrs (
old: rec { old: rec {
buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openexr pkgs.ilmbase ];
NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ];
} }
); );
osqp = super.osqp.overridePythonAttrs ( osqp = super.osqp.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cmake ];
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
} }
); );
parsel = super.parsel.overridePythonAttrs ( parsel = super.parsel.overridePythonAttrs (
old: rec { old: rec {
nativeBuildInputs = old.nativeBuildInputs ++ [ self.pytest-runner ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ];
} }
); );
@ -653,7 +656,7 @@ self: super:
withMysql = old.passthru.withMysql or false; withMysql = old.passthru.withMysql or false;
in in
{ {
buildInputs = old.buildInputs or [ ] ++ [ pkgs.sqlite ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.sqlite ];
propagatedBuildInputs = old.propagatedBuildInputs or [ ] propagatedBuildInputs = old.propagatedBuildInputs or [ ]
++ lib.optional withPostgres self.psycopg2 ++ lib.optional withPostgres self.psycopg2
++ lib.optional withMysql self.mysql-connector; ++ lib.optional withMysql self.mysql-connector;
@ -662,8 +665,8 @@ self: super:
pillow = super.pillow.overridePythonAttrs ( pillow = super.pillow.overridePythonAttrs (
old: { old: {
nativeBuildInputs = [ pkgs.pkg-config ] ++ old.nativeBuildInputs; nativeBuildInputs = [ pkgs.pkg-config ] ++ (old.nativeBuildInputs or [ ]);
buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ (old.buildInputs or [ ]);
} }
); );
@ -714,17 +717,17 @@ self: super:
psycopg2 = super.psycopg2.overridePythonAttrs ( psycopg2 = super.psycopg2.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs buildInputs = (old.buildInputs or [ ])
++ lib.optional stdenv.isDarwin pkgs.openssl; ++ lib.optional stdenv.isDarwin pkgs.openssl;
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.postgresql ];
} }
); );
psycopg2-binary = super.psycopg2-binary.overridePythonAttrs ( psycopg2-binary = super.psycopg2-binary.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs buildInputs = (old.buildInputs or [ ])
++ lib.optional stdenv.isDarwin pkgs.openssl; ++ lib.optional stdenv.isDarwin pkgs.openssl;
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.postgresql ];
} }
); );
@ -751,7 +754,7 @@ self: super:
in in
if arrowCppVersion != pyArrowVersion then throw errorMessage else { if arrowCppVersion != pyArrowVersion then throw errorMessage else {
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
self.cython self.cython
pkgs.pkg-config pkgs.pkg-config
pkgs.cmake pkgs.cmake
@ -764,7 +767,7 @@ self: super:
PARQUET_HOME = _arrow-cpp; PARQUET_HOME = _arrow-cpp;
inherit ARROW_HOME; inherit ARROW_HOME;
buildInputs = old.buildInputs ++ [ buildInputs = (old.buildInputs or [ ]) ++ [
pkgs.arrow-cpp pkgs.arrow-cpp
]; ];
@ -783,7 +786,7 @@ self: super:
) else ) else
super.pyarrow.overridePythonAttrs ( super.pyarrow.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
self.cython self.cython
]; ];
} }
@ -799,7 +802,7 @@ self: super:
).overridePythonAttrs ( ).overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
pkgs.meson pkgs.meson
pkgs.ninja pkgs.ninja
pkgs.pkg-config pkgs.pkg-config
@ -818,7 +821,7 @@ self: super:
pycocotools = super.pycocotools.overridePythonAttrs ( pycocotools = super.pycocotools.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ buildInputs = (old.buildInputs or [ ]) ++ [
self.cython self.cython
self.numpy self.numpy
]; ];
@ -869,27 +872,27 @@ self: super:
pygobject = super.pygobject.overridePythonAttrs ( pygobject = super.pygobject.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.glib pkgs.gobject-introspection ];
} }
); );
pylint = super.pylint.overridePythonAttrs ( pylint = super.pylint.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
doCheck = false; doCheck = false;
} }
); );
pyopenssl = super.pyopenssl.overridePythonAttrs ( pyopenssl = super.pyopenssl.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ pkgs.openssl ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl ];
} }
); );
python-bugzilla = super.python-bugzilla.overridePythonAttrs ( python-bugzilla = super.python-bugzilla.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
self.docutils self.docutils
]; ];
} }
@ -897,7 +900,7 @@ self: super:
python-ldap = super.python-ldap.overridePythonAttrs ( python-ldap = super.python-ldap.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ pkgs.openldap pkgs.cyrus_sasl ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openldap pkgs.cyrus_sasl ];
} }
); );
@ -919,7 +922,7 @@ self: super:
old: { old: {
format = "other"; format = "other";
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
pkgs.pkg-config pkgs.pkg-config
pkgs.qt5.qmake pkgs.qt5.qmake
pkgs.xorg.lndir pkgs.xorg.lndir
@ -936,7 +939,7 @@ self: super:
++ lib.optional withWebSockets pkgs.qt5.qtwebsockets ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets
; ;
buildInputs = old.buildInputs ++ [ buildInputs = (old.buildInputs or [ ]) ++ [
pkgs.dbus pkgs.dbus
pkgs.qt5.qtbase pkgs.qt5.qtbase
pkgs.qt5.qtsvg pkgs.qt5.qtsvg
@ -1071,13 +1074,13 @@ self: super:
ffmpeg-python = super.ffmpeg-python.overridePythonAttrs ( ffmpeg-python = super.ffmpeg-python.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
} }
); );
python-prctl = super.python-prctl.overridePythonAttrs ( python-prctl = super.python-prctl.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ buildInputs = (old.buildInputs or [ ]) ++ [
pkgs.libcap pkgs.libcap
]; ];
} }
@ -1085,7 +1088,7 @@ self: super:
pyzmq = super.pyzmq.overridePythonAttrs ( pyzmq = super.pyzmq.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ];
} }
); );
@ -1108,13 +1111,13 @@ self: super:
pandas = super.pandas.overridePythonAttrs ( pandas = super.pandas.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython ];
} }
); );
panel = super.panel.overridePythonAttrs ( panel = super.panel.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.nodejs ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.nodejs ];
} }
); );
@ -1138,11 +1141,11 @@ self: super:
scipy = super.scipy.overridePythonAttrs ( scipy = super.scipy.overridePythonAttrs (
old: old:
if old.format != "wheel" then { if old.format != "wheel" then {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.gfortran ];
propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ];
setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; setupPyBuildFlags = [ "--fcompiler='gnu95'" ];
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = old.buildInputs ++ [ self.numpy.blas ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.numpy.blas ];
preConfigure = '' preConfigure = ''
sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
@ -1155,14 +1158,14 @@ self: super:
scikit-learn = super.scikit-learn.overridePythonAttrs ( scikit-learn = super.scikit-learn.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ buildInputs = (old.buildInputs or [ ]) ++ [
pkgs.gfortran pkgs.gfortran
pkgs.glibcLocales pkgs.glibcLocales
] ++ lib.optionals stdenv.cc.isClang [ ] ++ lib.optionals stdenv.cc.isClang [
pkgs.llvmPackages.openmp pkgs.llvmPackages.openmp
]; ];
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
self.cython self.cython
]; ];
@ -1172,7 +1175,7 @@ self: super:
shapely = super.shapely.overridePythonAttrs ( shapely = super.shapely.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.geos self.cython ];
inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH; inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH;
} }
); );
@ -1190,8 +1193,8 @@ self: super:
tables = super.tables.overridePythonAttrs ( tables = super.tables.overridePythonAttrs (
old: { old: {
HDF5_DIR = "${pkgs.hdf5}"; HDF5_DIR = "${pkgs.hdf5}";
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ];
propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; propagatedBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.hdf5 self.numpy self.numexpr ];
} }
); );
@ -1220,7 +1223,7 @@ self: super:
tinycss2 = super.tinycss2.overridePythonAttrs ( tinycss2 = super.tinycss2.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
} }
); );
@ -1241,13 +1244,14 @@ self: super:
# is explicitly disabled with USE_CUDA=0. # is explicitly disabled with USE_CUDA=0.
find $out -name "*.so" -exec ${pkgs.patchelf}/bin/patchelf --remove-needed libcuda.so.1 {} \; find $out -name "*.so" -exec ${pkgs.patchelf}/bin/patchelf --remove-needed libcuda.so.1 {} \;
''; '';
buildInputs = (old.buildInputs or [ ]) buildInputs =
(old.buildInputs or [ ])
++ [ self.typing-extensions ] ++ [ self.typing-extensions ]
++ lib.optionals enableCuda [ ++ lib.optionals enableCuda [
pkgs.linuxPackages.nvidia_x11 pkgs.linuxPackages.nvidia_x11
pkgs.nccl.dev pkgs.nccl.dev
pkgs.nccl.out pkgs.nccl.out
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
self.numpy self.numpy
self.future self.future
@ -1285,7 +1289,7 @@ self: super:
vispy = super.vispy.overrideAttrs ( vispy = super.vispy.overrideAttrs (
old: { old: {
inherit (pkgs.python3.pkgs.vispy) patches; inherit (pkgs.python3.pkgs.vispy) patches;
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [
self.cython self.cython
self.setuptools-scm-git-archive self.setuptools-scm-git-archive
]; ];
@ -1294,7 +1298,7 @@ self: super:
uvloop = super.uvloop.overridePythonAttrs ( uvloop = super.uvloop.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [ buildInputs = (old.buildInputs or [ ]) ++ lib.optionals stdenv.isDarwin [
pkgs.darwin.apple_sdk.frameworks.ApplicationServices pkgs.darwin.apple_sdk.frameworks.ApplicationServices
pkgs.darwin.apple_sdk.frameworks.CoreServices pkgs.darwin.apple_sdk.frameworks.CoreServices
]; ];
@ -1312,7 +1316,7 @@ self: super:
weasyprint = super.weasyprint.overridePythonAttrs ( weasyprint = super.weasyprint.overridePythonAttrs (
old: { old: {
inherit (pkgs.python3.pkgs.weasyprint) patches; inherit (pkgs.python3.pkgs.weasyprint) patches;
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ];
} }
); );
@ -1368,19 +1372,19 @@ self: super:
credis = super.credis.overridePythonAttrs ( credis = super.credis.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.cython ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.cython ];
} }
); );
hashids = super.hashids.overridePythonAttrs ( hashids = super.hashids.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.flit-core ]; buildInputs = (old.buildInputs or [ ]) ++ [ self.flit-core ];
} }
); );
packaging = super.packaging.overridePythonAttrs ( packaging = super.packaging.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ buildInputs = (old.buildInputs or [ ]) ++
# From 20.5 until 20.7, packaging used flit for packaging (heh) # From 20.5 until 20.7, packaging used flit for packaging (heh)
# See https://github.com/pypa/packaging/pull/352 and https://github.com/pypa/packaging/pull/367 # See https://github.com/pypa/packaging/pull/352 and https://github.com/pypa/packaging/pull/367
lib.optional (lib.versionAtLeast old.version "20.5" && lib.versionOlder old.version "20.8") [ self.flit-core ]; lib.optional (lib.versionAtLeast old.version "20.5" && lib.versionOlder old.version "20.8") [ self.flit-core ];
@ -1407,13 +1411,13 @@ self: super:
# is not translated correctly to a nix dependency. # is not translated correctly to a nix dependency.
tqdm = super.tqdm.overrideAttrs ( tqdm = super.tqdm.overrideAttrs (
old: { old: {
buildInputs = [ super.toml ] ++ old.buildInputs; buildInputs = [ super.toml ] ++ (old.buildInputs or [ ]);
} }
); );
watchdog = super.watchdog.overrideAttrs ( watchdog = super.watchdog.overrideAttrs (
old: { old: {
buildInputs = old.buildInputs or [ ] buildInputs = (old.buildInputs or [ ])
++ pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreServices; ++ pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.CoreServices;
} }
); );