hiro/poetry2nix
1
0
Fork 0
mirror of https://github.com/vale981/poetry2nix synced 2025-03-05 09:11:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-cross'

Browse source
This commit is contained in:
adisbladis 2020-11-25 03:08:05 +01:00
commit cac2eaed19
No known key found for this signature in database
GPG key ID: 110BFAD44C6249B7
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mk-poetry-dep.nix
View file

@ -27,6 +27,7 @@ pythonPackages.callPackage
, ... , ...
}@args: }@args:
let let
inherit (pkgs) stdenv;
inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi moduleName; inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi moduleName;
inherit (import ./pep425.nix { inherit (import ./pep425.nix {
@ -113,9 +114,10 @@ pythonPackages.callPackage
buildInputs = ( buildInputs = (
baseBuildInputs baseBuildInputs
++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) pythonPackages.setuptools
++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg ++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg
++ lib.optional isLocal buildSystemPkgs ++ lib.optional isLocal buildSystemPkgs
++ lib.optional (!__isBootstrap) [ pythonPackages.poetry ] ++ lib.optional (!__isBootstrap) pythonPackages.poetry
); );
propagatedBuildInputs = propagatedBuildInputs =

10
overrides.nix
View file

@ -120,6 +120,8 @@ self: super:
cryptography = super.cryptography.overridePythonAttrs ( cryptography = super.cryptography.overridePythonAttrs (
old: { old: {
nativeBuildInputs = old.nativeBuildInputs or []
++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) self.python.pythonForBuild.pkgs.cffi;
buildInputs = old.buildInputs ++ [ pkgs.openssl ]; buildInputs = old.buildInputs ++ [ pkgs.openssl ];
} }
); );
@ -620,8 +622,8 @@ self: super:
withMysql = old.passthru.withMysql or false; withMysql = old.passthru.withMysql or false;
in in
{ {
buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ]; buildInputs = old.buildInputs or [] ++ [ pkgs.sqlite ];
propagatedBuildInputs = old.propagatedBuildInputs 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;
} }
@ -638,8 +640,8 @@ self: super:
# "Vendor" dependencies (for build-system support) # "Vendor" dependencies (for build-system support)
postPatch = '' postPatch = ''
echo "import sys" >> poetry/__init__.py echo "import sys" >> poetry/__init__.py
for path in ''${PYTHONPATH//:/ }; do echo $path; done | uniq | while read path; do for path in $propagatedBuildInputs; do
echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py
done done
''; '';

4
pkgs/poetry/default.nix
View file

@ -15,8 +15,8 @@ poetry2nix.mkPoetryApplication {
# "Vendor" dependencies (for build-system support) # "Vendor" dependencies (for build-system support)
postPatch = '' postPatch = ''
echo "import sys" >> poetry/__init__.py echo "import sys" >> poetry/__init__.py
for path in ''${PYTHONPATH//:/ }; do echo $path; done | uniq | while read path; do for path in $propagatedBuildInputs; do
echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py
done done
''; '';