Dawoox/nixpkgs
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into stdenv-updates

Browse Source
This commit is contained in:
Eelco Dolstra
2013-01-22 23:23:53 +01:00
parent 3e2e62ca31 296cd66009
commit 0a47a28f1d
73 changed files with 2686 additions and 1817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/python-modules/generic/default.nix
View File

@@ -50,11 +50,13 @@ python.stdenv.mkDerivation (attrs // {
name = namePrefix + name;
# default values for maintainers and platforms
# default to python's platforms and add maintainer(s) to every
# package
meta = {
maintainers = python.meta.maintainers;
platforms = python.meta.platforms;
} // meta;
} // meta // {
maintainers = (meta.maintainers or []) ++ [ lib.maintainers.chaoflow ];
};
# checkPhase after installPhase to run tests on installed packages
phases = "unpackPhase patchPhase configurePhase buildPhase installPhase checkPhase fixupPhase distPhase";

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

@@ -10,7 +10,7 @@ stdenv.mkDerivation {
unpackPhase = "true";
installPhase = ''
dst="$out/lib/${python.libPrefix}"
dst="$out/lib/${python.libPrefix}/site-packages"
ensureDir $dst/distutils
ln -s ${python}/lib/${python.libPrefix}/distutils/* $dst/distutils/
cat <<EOF > $dst/distutils/distutils.cfg