diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-19 21:31:51 +0000 |
| commit | 84c018503859be28aded86677c9dbc54c7067e11 (patch) | |
| tree | 44896c72bb5eaddc3b9ebc5e4701f40560774ff0 /pkgs/lib | |
| parent | 3980444b2b918ef74ac7b9f1128f399767d06fa1 (diff) | |
| parent | b94fef3cbad6b3b830f8f7c4a987c65c81c9e93d (diff) | |
| download | nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.gz nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.bz2 nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.lz nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.xz nixlib-84c018503859be28aded86677c9dbc54c7067e11.tar.zst nixlib-84c018503859be28aded86677c9dbc54c7067e11.zip | |
svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
Diffstat (limited to 'pkgs/lib')
| -rw-r--r-- | pkgs/lib/customisation.nix | 2 | ||||
| -rw-r--r-- | pkgs/lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | pkgs/lib/platforms.nix | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/lib/customisation.nix b/pkgs/lib/customisation.nix index b914d4ca6033..49ae440a7299 100644 --- a/pkgs/lib/customisation.nix +++ b/pkgs/lib/customisation.nix @@ -42,6 +42,8 @@ rec { in newDrv // { meta = if drv ? meta then drv.meta else {}; passthru = if drv ? passthru then drv.passthru else {}; + hostDrv = overrideDerivation drv.hostDrv f; + buildDrv = overrideDerivation drv.buildDrv f; }; diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index d377dd2e1c58..d4c08515545a 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -8,6 +8,7 @@ andres = "Andres Loeh <ksnixos@andres-loeh.de>"; astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>"; bjg = "Brian Gough <bjg@gnu.org>"; + bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>"; chaoflow = "Florian Friesdorf <flo@chaoflow.net>"; eelco = "Eelco Dolstra <e.dolstra@tudelft.nl>"; goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>"; diff --git a/pkgs/lib/platforms.nix b/pkgs/lib/platforms.nix index e9ed1e226e79..19ceb16fcff5 100644 --- a/pkgs/lib/platforms.nix +++ b/pkgs/lib/platforms.nix @@ -12,5 +12,5 @@ rec { unix = linux ++ darwin ++ freebsd ++ openbsd; all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd; allBut = platform: lists.filter (x: platform != x) all; - mesaPlatforms = linux ++ darwin ++ freebsd; + mesaPlatforms = linux; } |