Rewritten gettext-version stuff.

I've added listOfListsToAttrs to lib because I don't like to type "name =" and
"value =".


svn path=/nixpkgs/trunk/; revision=10315
This commit is contained in:
Yury G. Kudryashov 2008-01-28 19:30:13 +00:00
parent bc5974fb89
commit 0aef28a212
6 changed files with 14 additions and 9 deletions

View file

@ -1,4 +1,5 @@
{stdenv, fetchurl}: stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "gettext-0.14.6";
src = fetchurl {
url = mirror://gnu/gettext/gettext-0.14.6.tar.gz;

View file

@ -1,4 +1,5 @@
{stdenv, fetchurl}: stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "gettext-0.15";
src = fetchurl {
url = mirror://gnu/gettext/gettext-0.15.tar.gz;

View file

@ -1,4 +1,5 @@
{stdenv, fetchurl}: stdenv.mkDerivation {
args: with args;
stdenv.mkDerivation {
name = "gettext-0.16.1";
src = fetchurl {
url = mirror://gnu/gettext/gettext-0.16.1.tar.gz;

View file

@ -1,7 +1,8 @@
args:
builtins.listToAttrs [
{ name = "recurseForDerivations"; value = true; }
{ name = "0.14.6"; value = (import ./0.14.6.nix) args; }
{ name = "0.15"; value = (import ./0.15.nix) args; }
{ name = "0.16.x"; value = (import ./0.16.x.nix) args; }
args.lib.listOfListsToAttrs [
[ "recurseForDerivations" true ]
[ "0.14.6" (import ./0.14.6.nix args) ]
[ "0.15" (import ./0.15.nix args) ]
[ "0.16.x" (import ./0.16.x.nix args) ]
[ "default" (import ./0.16.x.nix args) ]
]

View file

@ -9,6 +9,7 @@ let
in
rec {
listOfListsToAttrs = ll : builtins.listToAttrs (map (l : { name = (head l); value = (head (tail l)); }) ll);
# Identity function.

View file

@ -1908,7 +1908,7 @@ rec {
gettext = getVersion "gettext" gettext_alts;
gettext_alts = import ../development/libraries/gettext {
inherit fetchurl stdenv;
inherit fetchurl stdenv lib;
};
gd = import ../development/libraries/gd {