* GTK 2.6 plus associated libraries.

* Updated libtiff, libpng, libxml2, libxslt, gettext.

svn path=/nixpkgs/trunk/; revision=2238

pkgs/development/libraries/gettext/builder.sh

@@ -1,7 +0,0 @@
-. $stdenv/setup || exit 1
-
-tar xvfz $src || exit 1
-cd gettext-* || exit 1
-./configure --prefix=$out || exit 1
-make || exit 1
-make install || exit 1

pkgs/development/libraries/gettext/default.nix

@@ -1,8 +1,8 @@
 {stdenv, fetchurl}: stdenv.mkDerivation {
-  name = "gettext-0.12.1";
+  name = "gettext-0.14";
-  builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gettext-0.12.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gettext-0.14.tar.gz;
-    md5 = "5d4bddd300072315e668247e5b7d5bdb";
+    md5 = "e715be150bbe32439ae68fab32df0299";
   };
+  configureFlags = "--disable-csharp";
 }

pkgs/development/libraries/gtk-libs-2.6/atk/default.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, pkgconfig, glib, perl}:
+
+assert pkgconfig != null && glib != null && perl != null;
+
+stdenv.mkDerivation {
+  name = "atk-1.9.0";
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/atk-1.9.0.tar.bz2;
+    md5 = "7f41bd9c6dcd83c8df391dc1805be653";
+  };
+  buildInputs = [pkgconfig perl];
+  propagatedBuildInputs = [glib];
+}

pkgs/development/libraries/gtk-libs-2.6/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, gettext, perl, x11
+, libtiff, libjpeg, libpng}:
+
+rec {
+
+  glib = (import ./glib) {
+    inherit fetchurl stdenv pkgconfig gettext perl;
+  };
+
+  atk = (import ./atk) {
+    inherit fetchurl stdenv pkgconfig glib perl;
+  };
+
+  pango = (import ./pango) {
+    inherit fetchurl stdenv pkgconfig glib x11;
+  };
+
+  gtk = (import ./gtk+) {
+    inherit fetchurl stdenv pkgconfig glib atk pango perl
+            libtiff libjpeg libpng x11;
+  };
+
+}

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

@@ -0,0 +1,12 @@
+{stdenv, fetchurl, pkgconfig, gettext, perl}:
+
+assert pkgconfig != null && gettext != null && perl != null;
+
+stdenv.mkDerivation {
+  name = "glib-2.6.2";
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glib-2.6.2.tar.bz2;
+    md5 = "31fafaf9b1a96ab804c078fb965eb529";
+  };
+  buildInputs = [pkgconfig gettext perl];
+}

pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, x11, glib, atk
+, pango, perl, libtiff, libjpeg, libpng}:
+
+assert pkgconfig != null && x11 != null && glib != null && atk != null
+  && pango != null && perl != null && perl != null && libtiff != null
+  && libjpeg != null && libpng != null;
+assert x11.buildClientLibs;
+#assert glib == atk.glib;
+#assert glib == pango.glib;
+#assert x11 == pango.x11;
+
+stdenv.mkDerivation {
+  name = "gtk+-2.6.2";
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk+-2.6.2.tar.bz2;
+    md5 = "f5cbbcb82627bc6d0d186063e6109399";
+  };
+  buildInputs = [pkgconfig perl libtiff libjpeg libpng];
+  propagatedBuildInputs = [x11 glib atk pango];
+  inherit libtiff libjpeg libpng;
+}

pkgs/development/libraries/gtk-libs-2.6/pango/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl, pkgconfig, x11, glib}:
+
+assert pkgconfig != null && x11 != null && glib != null;
+assert x11.buildClientLibs;
+
+stdenv.mkDerivation {
+  name = "pango-1.8.0";
+  src = fetchurl {
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/pango-1.8.0.tar.bz2;
+    md5 = "d11f9857df7216321163e14d66d0cab8";
+  };
+  buildInputs = [pkgconfig];
+  propagatedBuildInputs = [x11 glib];
+}

pkgs/development/libraries/libpng/default.nix

@@ -3,11 +3,11 @@
 assert zlib != null;
 
 stdenv.mkDerivation {
-  name = "libpng-1.2.7";
+  name = "libpng-1.2.8";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libpng-1.2.7.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libpng-1.2.8.tar.bz2;
-    md5 = "21030102f99f81c37276403e5956d198";
+    md5 = "00cea4539bea4bd34cbf8b82ff9589cd";
   };
   propagatedBuildInputs = [zlib];
   inherit zlib;

pkgs/development/libraries/libtiff/default.nix

@@ -3,11 +3,11 @@
 assert zlib != null && libjpeg != null;
 
 stdenv.mkDerivation {
-  name = "libtiff-3.6.1";
+  name = "libtiff-3.7.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/tiff-v3.6.1.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/tiff-3.7.1.tar.gz;
-    md5 = "b3f0ee7617593c2703755672fb1bfed3";
+    md5 = "37d222df12eb23691614cd40b7b1f215";
   };
   propagatedBuildInputs = [zlib libjpeg];
   inherit zlib libjpeg;

pkgs/development/libraries/libxml2/default.nix

@@ -4,12 +4,12 @@ assert zlib != null;
 assert pythonSupport -> python != null;
 
 stdenv.mkDerivation {
-  name = "libxml2-2.6.13";
+  name = "libxml2-2.6.17";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libxml2-2.6.13.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libxml2-2.6.17.tar.gz;
-    md5 = "23e9a2cfcd700fd4ff70996fd7c632c0";
+    md5 = "a678d37e68d98788ef51b6f913cdc868";
   };
 
   python = if pythonSupport then python else null;

pkgs/development/libraries/libxslt/default.nix

@@ -3,10 +3,10 @@
 assert libxml2 != null;
 
 stdenv.mkDerivation {
-  name = "libxslt-1.1.10";
+  name = "libxslt-1.1.12";
   src = fetchurl {
-    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libxslt-1.1.10.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/libxslt-1.1.12.tar.gz;
-    md5 = "9839e6a309c7c97ffd260c8a2aa03cf5";
+    md5 = "cf82a767c016ff1668d1c295c47ae700";
   };
   buildInputs = [libxml2];
 }

pkgs/system/all-packages-generic.nix

@@ -600,11 +600,17 @@ rec {
             docbook_xml_dtd_42 perlXMLParser;
   };
 
-  gtkLibs = import ../development/libraries/gtk-libs-2.4 {
+  gtkLibs = gtkLibs26;
+
+  gtkLibs26 = import ../development/libraries/gtk-libs-2.6 {
     inherit fetchurl stdenv pkgconfig gettext perl x11
             libtiff libjpeg libpng;
   };
 
+  gtkLibs22 = import ../development/libraries/gtk-libs-2.4 {
+    inherit fetchurl stdenv pkgconfig gettext perl x11
+            libtiff libjpeg libpng;
+  };
   gtkLibs22 = import ../development/libraries/gtk-libs-2.2 {
     inherit fetchurl stdenv pkgconfig gettext perl x11
             libtiff libjpeg libpng;