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

Merge branch 'staging-next'

Browse Source
This commit is contained in:
Vladimír Čunát
2019-01-13 00:39:38 +01:00
parent 6ca8443c3b 3131a8ea84
commit 570d84a01e
226 changed files with 2164 additions and 2740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/python-modules/cypari2/default.nix
View File

@@ -1,5 +1,4 @@
{ stdenv
, bootstrapped-pip
, buildPythonPackage
, python
, fetchPypi
@@ -24,11 +23,11 @@ buildPythonPackage rec {
# That is because while the default install phase succeeds to build the package,
# it fails to generate the file "auto_paridecl.pxd".
installPhase = ''
mkdir -p "$out/lib/${python.libPrefix}/site-packages"
export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
mkdir -p "$out/lib/${python.sitePackages}"
export PYTHONPATH="$out/lib/${python.sitePackages}:$PYTHONPATH"
# install "." instead of "*.whl"
${bootstrapped-pip}/bin/pip install --no-index --prefix=$out --no-cache --build=tmpdir .
${python.pythonForBuild.pkgs.bootstrapped-pip}/bin/pip install --no-index --prefix=$out --no-cache --build=tmpdir .
'';
buildInputs = [

2
pkgs/development/python-modules/matplotlib/2.nix
View File

@@ -45,7 +45,7 @@ buildPythonPackage rec {
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
++ stdenv.lib.optionals enableQt [ pyqt4 ]
++ stdenv.lib.optionals (builtins.hasAttr "isPy2" python) [ functools32 subprocess32 ];
++ stdenv.lib.optionals python.isPy2 [ functools32 subprocess32 ];
patches =
[ ./basedirlist.patch ] ++

4
pkgs/development/python-modules/pyyaml/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, libyaml }:
{ lib, buildPythonPackage, fetchPypi, libyaml, buildPackages }:
buildPythonPackage rec {
pname = "PyYAML";
@@ -9,6 +9,8 @@ buildPythonPackage rec {
sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf";
};
nativeBuildInputs = [ buildPackages.stdenv.cc ];
propagatedBuildInputs = [ libyaml ];
meta = with lib; {

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

@@ -17,19 +17,24 @@ stdenv.mkDerivation rec {
sha256 = "86bb4d8e1b0fabad1f4642b64c335b673e53e7a381de03c9a89fe678152c4c64";
};
nativeBuildInputs = [ unzip wrapPython ];
buildInputs = [ python ];
nativeBuildInputs = [ unzip wrapPython python.pythonForBuild ];
doCheck = false; # requires pytest
installPhase = ''
dst=$out/${python.sitePackages}
mkdir -p $dst
export PYTHONPATH="$dst:$PYTHONPATH"
${python.interpreter} setup.py install --prefix=$out
${python.pythonForBuild.interpreter} setup.py install --prefix=$out
wrapPythonPrograms
'';
pythonPath = [];
dontPatchShebangs = true;
# Python packages built through cross-compilation are always for the host platform.
disallowedReferences = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ python.pythonForBuild ];
meta = with stdenv.lib; {
description = "Utilities to facilitate the installation of Python packages";
homepage = https://pypi.python.org/pypi/setuptools;

2
pkgs/development/python-modules/tensorflow/bin.nix
View File

@@ -45,7 +45,7 @@ in buildPythonPackage rec {
format = "wheel";
src = let
pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) "${python.majorVersion}";
pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) "${python.pythonVersion}";
pyver = if stdenv.isDarwin then builtins.substring 0 1 pyVerNoDot else pyVerNoDot;
platform = if stdenv.isDarwin then "mac" else "linux";
unit = if cudaSupport then "gpu" else "cpu";

4
pkgs/development/python-modules/virtkey/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xextproto, xproto }:
{ lib, buildPythonPackage, fetchurl, pkgconfig, gtk2, libX11, libXtst, libXi, libxkbfile, xorgproto }:
let
majorVersion = "0.63";
@@ -14,7 +14,7 @@ in buildPythonPackage rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 libX11 libXtst libXi libxkbfile xextproto xproto ];
buildInputs = [ gtk2 libX11 libXtst libXi libxkbfile xorgproto ];
meta = with lib; {
description = "Extension to emulate keypresses and to get the layout information from the X server";