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

fix remaining broken python packages due to refactoring

Browse Source
This commit is contained in:
Domen Kožar 2014-02-21 23:26:56 +01:00
parent 92794f775a
commit 40b8b3206e
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/graphics/mirage/default.nix
View File

@ -9,10 +9,6 @@ buildPythonPackage rec {
sha256 = "d214a1b6d99d1d1e83da5848a2cef181f6781e0990e93f7ebff5880b0c43f43c"; sha256 = "d214a1b6d99d1d1e83da5848a2cef181f6781e0990e93f7ebff5880b0c43f43c";
}; };
postInstall = ''
mv $out/lib/${python.libPrefix}/site-packages/*.egg/share $out
'';
doCheck = false; doCheck = false;
buildInputs = [ stdenv libX11 gettext ]; buildInputs = [ stdenv libX11 gettext ];

9
pkgs/top-level/python-packages.nix
View File

@ -1594,7 +1594,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
buildInputs = [ fudge nose ]; buildInputs = [ fudge nose ];
}; };
fedora_cert = buildPythonPackage (rec { fedora_cert = stdenv.mkDerivation (rec {
name = "fedora-cert-0.5.9.2"; name = "fedora-cert-0.5.9.2";
meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; meta.maintainers = [ stdenv.lib.maintainers.mornfall ];
@ -1602,10 +1602,12 @@ pythonPackages = modules // import ./python-packages-generated.nix {
url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2"; url = "https://fedorahosted.org/releases/f/e/fedora-packager/fedora-packager-0.5.9.2.tar.bz2";
sha256 = "105swvzshgn3g6bjwk67xd8pslnhpxwa63mdsw6cl4c7cjp2blx9"; sha256 = "105swvzshgn3g6bjwk67xd8pslnhpxwa63mdsw6cl4c7cjp2blx9";
}; };
installCommand = "make install";
propagatedBuildInputs = [ python_fedora ]; propagatedBuildInputs = [ python python_fedora wrapPython ];
postInstall = "mv $out/bin/fedpkg $out/bin/fedora-cert-fedpkg"; postInstall = "mv $out/bin/fedpkg $out/bin/fedora-cert-fedpkg";
doCheck = false; doCheck = false;
postFixup = "wrapPythonPrograms";
}); });
fedpkg = buildPythonPackage (rec { fedpkg = buildPythonPackage (rec {
@ -6176,6 +6178,7 @@ pythonPackages = modules // import ./python-packages-generated.nix {
# TODO: add ATLAS=${pkgs.atlas} # TODO: add ATLAS=${pkgs.atlas}
preConfigure = '' preConfigure = ''
export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack} export BLAS=${pkgs.blas} LAPACK=${pkgs.liblapack}
sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
''; '';
setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; setupPyBuildFlags = [ "--fcompiler='gnu95'" ];