From 60ba7d233e49e8b9b3ecde68b6b0f25f1bbe92de Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 6 Sep 2018 19:40:24 +0000 Subject: [PATCH] pythonPackages.requests: disable multiple outputs The `dev` output is empty anyway. The problem is that it interacts badly with other parts of python and stdenv infrastructure. In particular, before this patch it installs code into `out` output (with only generated `nix-support` in `dev`), but `makePythonPath` then uses `propagatedBuildInputs` to generate `PYTHONPATH` while stdenv selects `dev` outputs for `propagatedBuiltInputs`. This results in `makePythonPath` linking to the empty `dev` output in `PYTHONPATH`. This reverts a piece of commit 28299f669adc41e5278372cad952fb1e1165b44b. --- pkgs/development/python-modules/requests/default.nix | 2 -- pkgs/development/tools/glslviewer/default.nix | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 99d4b56b2b1..9894c4319c5 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -11,8 +11,6 @@ buildPythonPackage rec { sha256 = "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a"; }; - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pytest ]; propagatedBuildInputs = [ urllib3 idna chardet certifi ]; # sadly, tests require networking diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index fbae0a76f25..e8315e7b60c 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { libXi libX11 ] ++ (with python2Packages; [ python setuptools wrapPython ]) ++ stdenv.lib.optional stdenv.isDarwin Cocoa; - pythonPath = with python2Packages; [ requests.dev ]; + pythonPath = with python2Packages; [ requests ]; # Makefile has /usr/local/bin hard-coded for 'make install' preConfigure = ''