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

Merge older staging

Browse Source 
Enough rebuilds have finished on Hydra now.
This commit is contained in:
Vladimír Čunát
2017-06-11 08:58:57 +02:00
parent d373b7b61a cb9f953c92
commit 32916ab1de
19 changed files with 142 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/python-modules/bootstrapped-pip/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, python, fetchPypi, makeWrapper, unzip }:
{ stdenv, python, fetchPypi, fetchurl, makeWrapper, unzip }:
let
wheel_source = fetchPypi {
@@ -13,6 +13,15 @@ let
format = "wheel";
sha256 = "f2900e560efc479938a219433c48f15a4ff4ecfe575a65de385eeb44f2425587";
};
# TODO: Shouldn't be necessary anymore for pip > 9.0.1!
# https://github.com/NixOS/nixpkgs/issues/26392
# https://github.com/pypa/setuptools/issues/885
pkg_resources = fetchurl {
url = https://raw.githubusercontent.com/pypa/setuptools/v36.0.1/pkg_resources/__init__.py;
sha256 = "1wdnq3mammk75mifkdmmjx7yhnpydvnvi804na8ym4mj934l2jkv";
};
in stdenv.mkDerivation rec {
pname = "pip";
version = "9.0.1";
@@ -29,6 +38,8 @@ in stdenv.mkDerivation rec {
unzip -d $out/${python.sitePackages} $src
unzip -d $out/${python.sitePackages} ${setuptools_source}
unzip -d $out/${python.sitePackages} ${wheel_source}
# TODO: Shouldn't be necessary anymore for pip > 9.0.1!
cp ${pkg_resources} $out/${python.sitePackages}/pip/_vendor/pkg_resources/__init__.py
'';
patchPhase = ''