diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-22 23:23:53 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-22 23:23:53 +0100 |
| commit | 0a47a28f1df3bdf7b2cf074af84a432aa48cbba7 (patch) | |
| tree | 6c953c0d58cf6d178795383fefe9babddaa7da4e /pkgs/development/python-modules | |
| parent | 3e2e62ca31311dd7e5237aa97a815458a44a3a3e (diff) | |
| parent | 296cd6600943d5a349cda55a36137331f8c3eec8 (diff) | |
| download | nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.gz nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.bz2 nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.lz nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.xz nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.zst nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.zip | |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/generic/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/python-modules/offline-distutils/default.nix | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index adba30372861..f72fbff1806a 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -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"; diff --git a/pkgs/development/python-modules/offline-distutils/default.nix b/pkgs/development/python-modules/offline-distutils/default.nix index 2ed41b08bb71..269f67bf5cd0 100644 --- a/pkgs/development/python-modules/offline-distutils/default.nix +++ b/pkgs/development/python-modules/offline-distutils/default.nix @@ -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 |