public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

poetry2nix: 1.7.0 -> 1.7.1

Browse Source
This commit is contained in:
adisbladis 2020-03-27 23:47:40 +00:00
parent b101527140
commit aa2552c6ce
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
3 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix
View File

@ -79,7 +79,7 @@ if __name__ == "__main__":
indent( indent(
textwrap.dedent( textwrap.dedent(
""" """
%s = super.%s.overrideAttrs ( %s = super.%s.overridePythonAttrs (
_: { _: {
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "%s"; url = "%s";

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

@ -7,7 +7,7 @@ let
inherit (poetryLib) isCompatible readTOML; inherit (poetryLib) isCompatible readTOML;
# Poetry2nix version # Poetry2nix version
version = "1.7.0"; version = "1.7.1";
/* The default list of poetry2nix override overlays */ /* The default list of poetry2nix override overlays */
defaultPoetryOverrides = (import ./overrides.nix { inherit pkgs lib; }); defaultPoetryOverrides = (import ./overrides.nix { inherit pkgs lib; });

98
pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
View File

@ -6,14 +6,14 @@
self: super: self: super:
{ {
astroid = super.astroid.overrideAttrs ( astroid = super.astroid.overridePythonAttrs (
old: rec { old: rec {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = old.buildInputs ++ [ self.pytest-runner ];
doCheck = false; doCheck = false;
} }
); );
av = super.av.overrideAttrs ( av = super.av.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.pkgconfig pkgs.pkgconfig
@ -22,7 +22,7 @@ self: super:
} }
); );
bcrypt = super.bcrypt.overrideAttrs ( bcrypt = super.bcrypt.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ pkgs.libffi ]; buildInputs = old.buildInputs ++ [ pkgs.libffi ];
} }
@ -31,14 +31,14 @@ self: super:
cffi = cffi =
# cffi is bundled with pypy # cffi is bundled with pypy
if self.python.implementation == "pypy" then null else ( if self.python.implementation == "pypy" then null else (
super.cffi.overrideAttrs ( super.cffi.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ pkgs.libffi ]; buildInputs = old.buildInputs ++ [ pkgs.libffi ];
} }
) )
); );
cftime = super.cftime.overrideAttrs ( cftime = super.cftime.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ buildInputs = old.buildInputs ++ [
self.cython self.cython
@ -46,14 +46,14 @@ self: super:
} }
); );
cryptography = super.cryptography.overrideAttrs ( cryptography = super.cryptography.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ pkgs.openssl ]; buildInputs = old.buildInputs ++ [ pkgs.openssl ];
} }
); );
django = ( django = (
super.django.overrideAttrs ( super.django.overridePythonAttrs (
old: { old: {
propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or []) propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [])
++ [ pkgs.gettext ]; ++ [ pkgs.gettext ];
@ -61,7 +61,7 @@ self: super:
) )
); );
django-bakery = super.django-bakery.overrideAttrs ( django-bakery = super.django-bakery.overridePythonAttrs (
old: { old: {
configurePhase = '' configurePhase = ''
if ! test -e LICENSE; then if ! test -e LICENSE; then
@ -71,7 +71,7 @@ self: super:
} }
); );
dlib = super.dlib.overrideAttrs ( dlib = super.dlib.overridePythonAttrs (
old: { old: {
# Parallel building enabled # Parallel building enabled
inherit (pkgs.python.pkgs.dlib) patches; inherit (pkgs.python.pkgs.dlib) patches;
@ -87,14 +87,14 @@ self: super:
# Environment markers are not always included (depending on how a dep was defined) # Environment markers are not always included (depending on how a dep was defined)
enum34 = if self.pythonAtLeast "3.4" then null else super.enum34; enum34 = if self.pythonAtLeast "3.4" then null else super.enum34;
faker = super.faker.overrideAttrs ( faker = super.faker.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = old.buildInputs ++ [ self.pytest-runner ];
doCheck = false; doCheck = false;
} }
); );
fancycompleter = super.fancycompleter.overrideAttrs ( fancycompleter = super.fancycompleter.overridePythonAttrs (
old: { old: {
postPatch = '' postPatch = ''
substituteInPlace setup.py \ substituteInPlace setup.py \
@ -104,20 +104,20 @@ self: super:
} }
); );
fastparquet = super.fastparquet.overrideAttrs ( fastparquet = super.fastparquet.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = old.buildInputs ++ [ self.pytest-runner ];
} }
); );
grandalf = super.grandalf.overrideAttrs ( grandalf = super.grandalf.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = old.buildInputs ++ [ self.pytest-runner ];
doCheck = false; doCheck = false;
} }
); );
h5py = super.h5py.overrideAttrs ( h5py = super.h5py.overridePythonAttrs (
old: rec { old: rec {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ];
@ -128,20 +128,20 @@ self: super:
} }
); );
horovod = super.horovod.overrideAttrs ( horovod = super.horovod.overridePythonAttrs (
old: { old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ];
} }
); );
# importlib-metadata has an incomplete dependency specification # importlib-metadata has an incomplete dependency specification
importlib-metadata = super.importlib-metadata.overrideAttrs ( importlib-metadata = super.importlib-metadata.overridePythonAttrs (
old: { old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2; propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2;
} }
); );
jupyter = super.jupyter.overrideAttrs ( jupyter = super.jupyter.overridePythonAttrs (
old: rec { old: rec {
# jupyter is a meta-package. Everything relevant comes from the # jupyter is a meta-package. Everything relevant comes from the
# dependencies. It does however have a jupyter.py file that conflicts # dependencies. It does however have a jupyter.py file that conflicts
@ -150,7 +150,7 @@ self: super:
} }
); );
lap = super.lap.overrideAttrs ( lap = super.lap.overridePythonAttrs (
old: { old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [ propagatedBuildInputs = old.propagatedBuildInputs ++ [
self.numpy self.numpy
@ -158,7 +158,7 @@ self: super:
} }
); );
llvmlite = super.llvmlite.overrideAttrs ( llvmlite = super.llvmlite.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ];
@ -181,26 +181,26 @@ self: super:
} }
); );
lockfile = super.lockfile.overrideAttrs ( lockfile = super.lockfile.overridePythonAttrs (
old: { old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ];
} }
); );
lxml = super.lxml.overrideAttrs ( lxml = super.lxml.overridePythonAttrs (
old: { old: {
nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ]; nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ];
buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ];
} }
); );
markupsafe = super.markupsafe.overrideAttrs ( markupsafe = super.markupsafe.overridePythonAttrs (
old: { old: {
src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; }; src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; };
} }
); );
matplotlib = super.matplotlib.overrideAttrs ( matplotlib = super.matplotlib.overridePythonAttrs (
old: old:
let let
enableGhostscript = old.passthru.enableGhostscript or false; enableGhostscript = old.passthru.enableGhostscript or false;
@ -241,14 +241,14 @@ self: super:
preferWheel = true; preferWheel = true;
}; };
mccabe = super.mccabe.overrideAttrs ( mccabe = super.mccabe.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = old.buildInputs ++ [ self.pytest-runner ];
doCheck = false; doCheck = false;
} }
); );
netcdf4 = super.netcdf4.overrideAttrs ( netcdf4 = super.netcdf4.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ buildInputs = old.buildInputs ++ [
self.cython self.cython
@ -271,7 +271,7 @@ self: super:
} }
); );
numpy = super.numpy.overrideAttrs ( numpy = super.numpy.overridePythonAttrs (
old: old:
let let
blas = old.passthru.args.blas or pkgs.openblasCompat; blas = old.passthru.args.blas or pkgs.openblasCompat;
@ -305,7 +305,7 @@ self: super:
} }
); );
openexr = super.openexr.overrideAttrs ( openexr = super.openexr.overridePythonAttrs (
old: rec { old: rec {
buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ]; buildInputs = old.buildInputs ++ [ 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" ];
@ -326,26 +326,26 @@ self: super:
} }
); );
pillow = super.pillow.overrideAttrs ( pillow = super.pillow.overridePythonAttrs (
old: { old: {
nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs; nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs;
buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs;
} }
); );
psycopg2 = super.psycopg2.overrideAttrs ( psycopg2 = super.psycopg2.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ];
} }
); );
psycopg2-binary = super.psycopg2-binary.overrideAttrs ( psycopg2-binary = super.psycopg2-binary.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ];
} }
); );
pyarrow = super.pyarrow.overrideAttrs ( pyarrow = super.pyarrow.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ buildInputs = old.buildInputs ++ [
self.cython self.cython
@ -360,7 +360,7 @@ self: super:
format = "other"; format = "other";
} }
) )
).overrideAttrs ( ).overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ nativeBuildInputs = old.nativeBuildInputs ++ [
@ -379,7 +379,7 @@ self: super:
) )
) super.pycairo; ) super.pycairo;
pycocotools = super.pycocotools.overrideAttrs ( pycocotools = super.pycocotools.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ buildInputs = old.buildInputs ++ [
self.cython self.cython
@ -388,21 +388,21 @@ self: super:
} }
); );
pygobject = super.pygobject.overrideAttrs ( pygobject = super.pygobject.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ];
} }
); );
pylint = super.pylint.overrideAttrs ( pylint = super.pylint.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ self.pytest-runner ]; buildInputs = old.buildInputs ++ [ self.pytest-runner ];
doCheck = false; doCheck = false;
} }
); );
pyopenssl = super.pyopenssl.overrideAttrs ( pyopenssl = super.pyopenssl.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ pkgs.openssl ]; buildInputs = old.buildInputs ++ [ pkgs.openssl ];
} }
@ -509,7 +509,7 @@ self: super:
} }
); );
pytest-datadir = super.pytest-datadir.overrideAttrs ( pytest-datadir = super.pytest-datadir.overridePythonAttrs (
old: { old: {
postInstall = '' postInstall = ''
rm -f $out/LICENSE rm -f $out/LICENSE
@ -525,7 +525,7 @@ self: super:
pytest-runner = super.pytest-runner or super.pytestrunner; pytest-runner = super.pytest-runner or super.pytestrunner;
python-prctl = super.python-prctl.overrideAttrs ( python-prctl = super.python-prctl.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ buildInputs = old.buildInputs ++ [
pkgs.libcap pkgs.libcap
@ -533,14 +533,14 @@ self: super:
} }
); );
pyzmq = super.pyzmq.overrideAttrs ( pyzmq = super.pyzmq.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ];
} }
); );
rockset = super.rockset.overrideAttrs ( rockset = super.rockset.overridePythonAttrs (
old: rec { old: rec {
postPatch = '' postPatch = ''
cp ./setup_rockset.py ./setup.py cp ./setup_rockset.py ./setup.py
@ -548,7 +548,7 @@ self: super:
} }
); );
scaleapi = super.scaleapi.overrideAttrs ( scaleapi = super.scaleapi.overridePythonAttrs (
old: { old: {
postPatch = '' postPatch = ''
substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true
@ -556,7 +556,7 @@ self: super:
} }
); );
pandas = super.pandas.overrideAttrs ( pandas = super.pandas.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ]; nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ];
} }
@ -573,7 +573,7 @@ self: super:
} }
); );
scipy = super.scipy.overrideAttrs ( scipy = super.scipy.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ];
propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ];
@ -607,7 +607,7 @@ self: super:
} }
); );
shapely = super.shapely.overrideAttrs ( shapely = super.shapely.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ]; buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ];
inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH; inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH;
@ -622,7 +622,7 @@ self: super:
) )
) else super.shellingham; ) else super.shellingham;
tables = super.tables.overrideAttrs ( tables = super.tables.overridePythonAttrs (
old: { old: {
HDF5_DIR = "${pkgs.hdf5}"; HDF5_DIR = "${pkgs.hdf5}";
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
@ -630,7 +630,7 @@ self: super:
} }
); );
tensorpack = super.tensorpack.overrideAttrs ( tensorpack = super.tensorpack.overridePythonAttrs (
old: { old: {
postPatch = '' postPatch = ''
substituteInPlace setup.cfg --replace "# will call find_packages()" "" substituteInPlace setup.cfg --replace "# will call find_packages()" ""
@ -638,7 +638,7 @@ self: super:
} }
); );
urwidtrees = super.urwidtrees.overrideAttrs ( urwidtrees = super.urwidtrees.overridePythonAttrs (
old: { old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [ propagatedBuildInputs = old.propagatedBuildInputs ++ [
self.urwid self.urwid
@ -646,7 +646,7 @@ self: super:
} }
); );
vose-alias-method = super.vose-alias-method.overrideAttrs ( vose-alias-method = super.vose-alias-method.overridePythonAttrs (
old: { old: {
postInstall = '' postInstall = ''
rm -f $out/LICENSE rm -f $out/LICENSE
@ -654,7 +654,7 @@ self: super:
} }
); );
uvloop = super.uvloop.overrideAttrs ( uvloop = super.uvloop.overridePythonAttrs (
old: { old: {
buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [ buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [
pkgs.darwin.apple_sdk.frameworks.ApplicationServices pkgs.darwin.apple_sdk.frameworks.ApplicationServices