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

pkgs/development/libraries/gettext/0.14.6.nix

@@ -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;

pkgs/development/libraries/gettext/0.15.nix

@@ -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;

pkgs/development/libraries/gettext/0.16.x.nix

@@ -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;

pkgs/development/libraries/gettext/default.nix

@@ -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) ]
 ]

pkgs/lib/default.nix

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

pkgs/top-level/all-packages.nix

@@ -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 {