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

Merge branch 'master' into closure-size

Browse Source 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
This commit is contained in:
Vladimír Čunát
2016-04-01 10:06:01 +02:00
parent c643ccaa8c a26357eefe
commit ab15a62c68
1108 changed files with 76254 additions and 11297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,13 +9,17 @@ let
url = "https://pypi.python.org/packages/3.5/s/setuptools/setuptools-19.4-py2.py3-none-any.whl";
sha256 = "0801e6d862ca4ce24d918420d62f07ee2fe736dc016e3afa99d2103e7a02e9a6";
};
argparse_source = fetchurl {
url = "https://pypi.python.org/packages/2.7/a/argparse/argparse-1.4.0-py2.py3-none-any.whl";
sha256 = "0533cr5w14da8wdb2q4py6aizvbvsdbk3sj7m1jx9lwznvnlf5n3";
};
in stdenv.mkDerivation rec {
name = "python-${python.version}-bootstrapped-pip-${version}";
version = "8.0.2";
version = "8.1.1";
src = fetchurl {
url = "https://pypi.python.org/packages/py2.py3/p/pip/pip-${version}-py2.py3-none-any.whl";
sha256 = "249a6f3194be8c2e8cb4d4be3f6fd16a9f1e3336218caffa8e7419e3816f9988";
sha256 = "0p62v87lm595kwmxrnqxc81dr7h6maaxj1y28b00bf9ag11c7fa4";
};
unpackPhase = ''
@@ -23,8 +27,11 @@ in stdenv.mkDerivation rec {
unzip -d $out/${python.sitePackages} $src
unzip -d $out/${python.sitePackages} ${setuptools_source}
unzip -d $out/${python.sitePackages} ${wheel_source}
'' + stdenv.lib.optionalString (python.isPy26 or false) ''
unzip -d $out/${python.sitePackages} ${argparse_source}
'';
patchPhase = ''
mkdir -p $out/bin
'';
@@ -34,7 +41,9 @@ in stdenv.mkDerivation rec {
installPhase = ''
# install pip binary
echo '${python.interpreter} -m pip "$@"' > $out/bin/pip
echo '#!${python.interpreter}' > $out/bin/pip
echo 'import sys;from pip import main' >> $out/bin/pip
echo 'sys.exit(main())' >> $out/bin/pip
chmod +x $out/bin/pip
# wrap binaries with PYTHONPATH

2
pkgs/development/python-modules/pyqt/5.x.nix
View File

@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
homepage = http://www.riverbankcomputing.co.uk;
license = licenses.gpl3;
platforms = platforms.mesaPlatforms;
maintainers = with maintainers; [ sander iyzsong ];
maintainers = with maintainers; [ sander ];
};
src = fetchurl {

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

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "19.4"; # 18.4 and up breaks python34Packages.characteristic and many others
src = fetchurl {
url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz";
url = "https://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz";
sha256 = "214bf29933f47cf25e6faa569f710731728a07a19cae91ea64f826051f68a8cf";
};

6
pkgs/development/python-modules/wxPython/generic.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, python, isPy3k, isPyPy, wxGTK, openglSupport ? true, pyopengl
, version, sha256, wrapPython, setuptools, ...
, version, sha256, wrapPython, setuptools, libX11, ...
}:
assert wxGTK.unicode;
@@ -17,9 +17,11 @@ stdenv.mkDerivation rec {
};
pythonPath = [ python setuptools ];
buildInputs = [ python setuptools pkgconfig wxGTK (wxGTK.gtk) wrapPython ] ++ stdenv.lib.optional openglSupport pyopengl;
buildInputs = [ python setuptools pkgconfig wxGTK (wxGTK.gtk) wrapPython libX11 ] ++ stdenv.lib.optional openglSupport pyopengl;
preConfigure = "cd wxPython";
NIX_LDFLAGS = "-lX11 -lgdk-x11-2.0";
installPhase = ''
${python.interpreter} setup.py install WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out
wrapPythonPrograms