* Gnome 2.22.1.

* Moved some of the Gnome package Nix expressions into
  pkgs/desktops/gnome/default.nix - no need to have them in separate
  files.  This way the code is much shorter.  Still to be done for all
  the other Gnome packages.
* Glib 2.16.3.

svn path=/nixpkgs/branches/stdenv-updates/; revision=11855

pkgs/development/libraries/audiofile/default.nix

@@ -1,9 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "audiofile-0.2.6";
-  src = fetchurl {
-    url = http://www.68k.org/~michael/audiofile/audiofile-0.2.6.tar.gz;
-    sha256 = "1a921w6jwcnkmx3vm091qrj7109jzri6kw4ygjq6ym91dssnfqab";
-  };
-}

pkgs/development/libraries/gtk-libs/2.12/glib/default.nix

@@ -1,11 +1,11 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name = "glib-2.14.6";
+  name = "glib-2.16.3";
   
   src = fetchurl {
-    url = mirror://gnome/sources/glib/2.14/glib-2.14.6.tar.bz2;
-    sha256 = "1fi4xb07d7bfnfi65snvbi6i5kzhr3kad8knbwklj47z779vppvq";
+    url = mirror://gnome/sources/glib/2.16/glib-2.16.3.tar.bz2;
+    md5 = "195f9a803cc5279dbb39afdf985f44cb";
   };
   
   buildInputs = [pkgconfig gettext perl];

pkgs/development/libraries/librsvg/default.nix

@@ -1,17 +0,0 @@
-{stdenv, fetchurl
-, pkgconfig, glib, cairo, fontconfig, freetype, pango, gtk
-, libxml2, libart
-
-}:
-
-#required: libxml and libart at a minimum, while providing extra features when used with libcroco, libgsf, and mozilla
-
-stdenv.mkDerivation {
-  name = "librsvg-2.16.1";
-  src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.16/librsvg-2.16.1.tar.gz;
-    md5 = "2bbd4f634ef229cbb1552b574aacf0bd";
-  };
-  propagatedBuildInputs = [ libxml2 libart pkgconfig glib pkgconfig cairo fontconfig freetype pango gtk ];
-
-}

pkgs/development/libraries/libtasn1/default.nix

@@ -0,0 +1,15 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "libtasn1-1.4";
+  
+  src = fetchurl {
+    url = http://josefsson.org/gnutls/releases/libtasn1/libtasn1-1.4.tar.gz;
+    sha256 = "15k14cl334cjdw6hbw3scdxm0pfv078kfq6bnz9ngyg4by1kgal4";
+  };
+
+  meta = {
+    homepage = http://josefsson.org/libtasn1/;
+    description = "An ASN.1 library";
+  };
+}