From 7f63ecfff9f8b3f6c5c7138b6bedec90676a71cb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 22 Oct 2019 13:14:36 +0200 Subject: [PATCH] pipenv: fix dependencies - setup_requires belong in nativeBuildInputs - requests is only for Python 2. We offer only a Python 3 version of pipenv - setting PYTHONPATH is not needed because the magical sed expression injects the dependencies in the executables. Otherwise, we would use NIX_PYTHONPATH. - PIP_IGNORE_INSTALLED was needed because of PYTHONPATH, but since we do not set that anymore we can remove. --- pkgs/development/tools/pipenv/default.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index cb8e61e119d..1b4815a8687 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonApplication -, flake8 +, certifi +, setuptools , invoke , parver , pip @@ -21,23 +22,18 @@ buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; + nativeBuildInputs = [ invoke parver ]; + propagatedBuildInputs = [ - flake8 - invoke - parver + certifi + setuptools pip - requests virtualenv virtualenv-clone ]; doCheck = false; - makeWrapperArgs = [ - "--set PYTHONPATH \".:$PYTHONPATH\"" - "--set PIP_IGNORE_INSTALLED 1" - ]; - meta = with lib; { description = "Python Development Workflow for Humans"; license = licenses.mit;