From d053ef9922a39496d531332441cf52375304c104 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 28 Feb 2020 07:57:34 +0000 Subject: [PATCH] poetry: Remove hacky build steps Poetry can now be built normally. --- pkgs/poetry/default.nix | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/pkgs/poetry/default.nix b/pkgs/poetry/default.nix index 1517e53..96355b0 100644 --- a/pkgs/poetry/default.nix +++ b/pkgs/poetry/default.nix @@ -1,52 +1,28 @@ -{ lib, poetry2nix, python, fetchFromGitHub, runtimeShell }: +{ lib, poetry2nix, python, fetchFromGitHub }: poetry2nix.mkPoetryApplication { inherit python; - pyproject = ./pyproject.toml; - poetrylock = ./poetry.lock; + projectDir = ./.; src = fetchFromGitHub (lib.importJSON ./src.json); # "Vendor" dependencies (for build-system support) postPatch = '' - for path in ''${PYTHONPATH//:/ }; do + for path in ''${PYTHONPATH//:/ }; do echo $path; done | uniq | while read path; do echo "sys.path.insert(0, \"$path\")" >> poetry/__init__.py done ''; - # Poetry is a bit special in that it can't use itself as the `build-system` property in pyproject.toml. - # That's why we need to hackily install outputs completely manually. - # - # For projects using poetry normally overriding the installPhase is not required. - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/${python.libPrefix}/site-packages - cp -r poetry $out/lib/${python.libPrefix}/site-packages - - mkdir -p $out/bin - cat > $out/bin/poetry < "$out/share/bash-completion/completions/poetry" mkdir -p "$out/share/zsh/vendor-completions" "$out/bin/poetry" completions zsh > "$out/share/zsh/vendor-completions/_poetry" mkdir -p "$out/share/fish/vendor_completions.d" "$out/bin/poetry" completions fish > "$out/share/fish/vendor_completions.d/poetry.fish" - - runHook postInstall ''; # Propagating dependencies leads to issues downstream