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

pythonPackages.requests: disable multiple outputs

Browse Source 
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.
This commit is contained in:
Jan Malakhovski 2018-09-06 19:40:24 +00:00 committed by Frederik Rietdijk
parent 0d0d7dcd06
commit 60ba7d233e
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/requests/default.nix
View File

@ -11,8 +11,6 @@ buildPythonPackage rec {
sha256 = "ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a";
};
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pytest ];
propagatedBuildInputs = [ urllib3 idna chardet certifi ];
# sadly, tests require networking

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

@ -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 = ''