Move gtkLibs3x to top-level namespace, gtk+-3.2.3

svn path=/nixpkgs/branches/glib-2.30/; revision=32044

pkgs/desktops/gnome-2/desktop/gvfs/default.nix

@@ -1,13 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, dbus, samba, hal, libarchive, fuse, libgphoto2
+{ stdenv, fetchurl, pkgconfig, dbus, samba, libarchive, fuse, libgphoto2
-, cdparanoia, libxml2, libtool, glib, intltool, GConf, gnome_keyring, libsoup}:
+, cdparanoia, libxml2, libtool, glib, intltool, GConf, libgnome_keyring, libsoup}:
 
 stdenv.mkDerivation {
-  name = "gvfs-1.4.0";
+  name = "gvfs-1.10.1";
+
   src = fetchurl {
-    url = mirror://gnome/sources/gvfs/1.4/gvfs-1.4.0.tar.bz2;
+    url = mirror://gnome/sources/gvfs/1.10/gvfs-1.10.1.tar.xz;
-    sha256 = "1fzqq21888c1w357kcy8m12393wd6jjlk4pg118npn11m4gbb13s";
+    sha256 = "124jrkph3cqr2pijmzzr6qwzy2vaq3vvndskzkxd0v5dwp7glc6d";
   };
-  builder = ./builder.sh;
+
-  buildInputs = [ pkgconfig dbus.libs samba hal libarchive fuse libgphoto2 cdparanoia libxml2 libtool
+  buildNativeInputs = [ pkgconfig ];
-                  glib intltool GConf gnome_keyring libsoup ];
+  buildInputs =
+    [ dbus.libs samba libarchive fuse libgphoto2 cdparanoia libxml2 libtool
+      glib intltool GConf libgnome_keyring libsoup
+    ];
 }

pkgs/desktops/gnome-2/desktop/libsoup/default.nix

@@ -1,12 +1,24 @@
-{stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl, 
+{ stdenv, fetchurl, glib, libxml2, pkgconfig, xz
-  glib, GConf, gnome_keyring}:
+, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }:
+
+stdenv.mkDerivation {
+  name = "libsoup-2.36.1";
 
-stdenv.mkDerivation rec {
-  name = "libsoup-2.33.6";
   src = fetchurl {
-    url = "mirror://gnome/sources/libsoup/2.33/${name}.tar.bz2";
+    url = mirror://gnome/sources/libsoup/2.36/libsoup-2.36.1.tar.xz;
-    sha256 = "988f7897fe125a77a5946b2fd6d47d7374fd94a1406e810482cfff6a52a6a923";
+    sha256 = "0r8zkr0a328jkww4dv9z1q691rw59nh4lf5f5pzzr9szzw3j8wkk";
+  };
+
+
+  buildNativeInputs = [ pkgconfig xz ];
+  propagatedBuildInputs = [ glib libxml2 ]
+    ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
+  passthru.propagatedUserEnvPackages = [ glib_networking ];
+
+  # glib_networking is a runtime dependency, not a compile-time dependency
+  configureFlags = "--disable-tls-check";
+
+  meta = {
+    inherit (glib.meta) maintainers platforms;
   };
-  buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl 
-    glib GConf gnome_keyring ];
 }

pkgs/desktops/gnome-2/platform/GConf/default.nix

@@ -1,14 +1,15 @@
 { stdenv, fetchurl, pkgconfig, dbus_glib, glib, ORBit2, libxml2
-, polkit, intltool, dbus_libs }:
+, polkit, intltool, dbus_libs, xz }:
 
 stdenv.mkDerivation {
-  name = "GConf-2.28.1";
+  name = "GConf-2.32.4";
 
   src = fetchurl {
-    url = mirror://gnome/sources/GConf/2.28/GConf-2.28.1.tar.bz2;
+    url = mirror://gnome/sources/GConf/2.32/GConf-2.32.4.tar.xz;
-    sha256 = "001h9gngz31gnvs6mjyazdibhdqmw1wwk88n934b0mv013wpgi2k";
+    sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk";
   };
 
-  buildInputs = [ pkgconfig ORBit2 dbus_libs dbus_glib libxml2 polkit intltool ];
+  buildNativeInputs = [ pkgconfig xz ];
+  buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 polkit intltool ];
   propagatedBuildInputs = [ glib ];
 }

pkgs/desktops/gnome-2/platform/glib-networking/default.nix

@@ -1,24 +1,23 @@
 {stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls2, libproxy
-  , libgcrypt, libtasn1
+, gsettings_desktop_schemas, libgcrypt, libtasn1, xz }:
-  }:
 
 stdenv.mkDerivation {
-  name = "glib-networking-2.28.5";
+  name = "glib-networking-2.30.2";
-  
+
   src = fetchurl {
-    url = mirror://gnome/sources/glib-networking/2.28/glib-networking-2.28.5.tar.bz2;
+    url = mirror://gnome/sources/glib-networking/2.30/glib-networking-2.30.2.tar.xz;
-    sha256 = "959ffeb91fee17c1b0fb2aa82872c3daae0230de93708b2ebabeb92b747d7876";
+    sha256 = "1g2ran0rn37009fs3xl38m95i5w8sdf9ax0ady4jbjir15844xcz";
   };
 
-  configureFlags = [
+  configureFlags = "--with-ca-certificates=/etc/ca-bundle.crt";
-    "--without-ca-certificates"
-  ];
   
   preBuild = ''
     sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
   '';
 
-  buildInputs = [ pkgconfig ];
+  buildNativeInputs = [ pkgconfig xz ];
-  propagatedBuildInputs = [ glib libtool intltool gnutls2 libproxy libgcrypt 
+  propagatedBuildInputs =
-    libtasn1];
+    [ glib libtool intltool gnutls2 libproxy libgcrypt libtasn1
+      gsettings_desktop_schemas
+    ];
 }

pkgs/desktops/gnome-2/platform/intltool/default.nix

@@ -1,6 +1,6 @@
 {stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gettext}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "intltool-0.40.6";
 
   src = fetchurl {

pkgs/desktops/gnome-3/default.nix

@@ -14,8 +14,6 @@
 
   libsoup = callPackage ./platform/libsoup.nix { };
 
-  gsettings_desktop_schemas = callPackage ./platform/gsettings-desktop-schemas.nix {};
-
   GConf = callPackage ./platform/GConf.nix { };
 
   gnome_user_docs = callPackage ./platform/gnome-user-docs.nix { };

pkgs/development/libraries/gamin/debian-patches.nix

@@ -0,0 +1,10 @@
+# Generated by debian-patches.sh from debian-patches.txt
+let
+  prefix = "http://patch-tracker.debian.org/patch/series/dl/gamin/0.1.10-4";
+in
+[
+  {
+    url = "${prefix}/17_deprecated_const_return.patch";
+    sha256 = "0bssrqcmyivlpk2g0q71d1yavd4wv1lw34l8qipm0ndljjd6rbrk";
+  }
+]

pkgs/development/libraries/gamin/debian-patches.txt

@@ -0,0 +1,2 @@
+gamin/0.1.10-4
+17_deprecated_const_return.patch

pkgs/development/libraries/gamin/default.nix

@@ -8,9 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218";
   };
 
-  buildInputs = [ python pkgconfig glib ];
+  buildNativeInputs = [ pkgconfig ];
+
+  buildInputs = [ python glib ];
 
   # `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from
   # <sys/socket.h> with Glibc 2.9.
   configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE";
+
+  patches = map fetchurl (import ./debian-patches.nix);
 }

pkgs/development/libraries/glib/2.28.x.nix

@@ -1,45 +0,0 @@
-{ stdenv, fetchurl_gnome, pkgconfig, gettext, perl, libiconv, zlib, xz }:
-
-# TODO:
-# * Add gio-module-fam
-#     Problem: cyclic dependency on gamin
-#     Possible solution: build as a standalone module, set env. vars
-stdenv.mkDerivation rec {
-  name = src.pkgname;
-
-  src = fetchurl_gnome {
-    project = "glib";
-    major = "2"; minor = "28"; patchlevel = "8"; extension = "xz";
-    sha256 = "0lw3fjsffpnf0cc4j5lkxgllp95qvfq6bir8nh5gds78pmfsjz2d";
-  };
-
-  # configure script looks for d-bus but it is only needed for tests
-  buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
-  buildNativeInputs = [ perl pkgconfig gettext xz ];
-
-  propagatedBuildInputs = [ zlib ]
-    ++ stdenv.lib.optional (!stdenv.isLinux) gettext;
-
-  # glib buildsystem fails to find python, thus hardcodes python2.4 in #!
-  postInstall = ''
-    rm -rvf $out/share/gtk-doc
-    sed -e 's@python2\.[0-9]@python@' -i $out/bin/gtester-report'';
-
-  meta = {
-    description = "GLib, a C library of programming buildings blocks";
-
-    longDescription = ''
-      GLib provides the core application building blocks for libraries
-      and applications written in C.  It provides the core object
-      system used in GNOME, the main loop implementation, and a large
-      set of utility functions for strings and common data structures.
-    '';
-
-    homepage = http://www.gtk.org/;
-
-    license = "LGPLv2+";
-
-    maintainers = with stdenv.lib.maintainers; [raskin urkud];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}

pkgs/development/libraries/glib/2.30.x.nix

@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
   };
 
   # configure script looks for d-bus but it is only needed for tests
-  buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
   buildNativeInputs = [ perl pkgconfig gettext xz python ];
 
-  propagatedBuildInputs = [ zlib libffi ];
+  propagatedBuildInputs = [ zlib libffi ]
+    ++ stdenv.lib.optional (!stdenv.isLinux) [ libiconv gettext ];
 
   passthru.gioModuleDir = "lib/gio/modules";
 

pkgs/development/libraries/glibmm/2.28.x.nix

@@ -1,25 +0,0 @@
-{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx, xz }:
-
-stdenv.mkDerivation rec {
-  name = src.pkgname;
-
-  src = fetchurl_gnome {
-    project = "glibmm";
-    major = "2"; minor = "28"; patchlevel = "2"; extension = "xz";
-    sha256 = "1qyb8jb9avfzcdyhldxx7qljjhf30czwnh7c2r9p0x4nin2rjkpq";
-  };
-
-  buildNativeInputs = [pkgconfig xz];
-  propagatedBuildInputs = [glib libsigcxx];
-
-  meta = {
-    description = "C++ interface to the GLib library";
-
-    homepage = http://gtkmm.org/;
-
-    license = "LGPLv2+";
-
-    maintainers = with stdenv.lib.maintainers; [urkud raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}

pkgs/development/libraries/glibmm/2.30.x.nix

@@ -1,12 +1,11 @@
-{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx, xz }:
+{ stdenv, fetchurl, pkgconfig, glib, libsigcxx, xz }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
-  name = src.pkgname;
+  name = "glibmm-2.30.1";
 
-  src = fetchurl_gnome {
+  src = fetchurl {
-    project = "glibmm";
+    url = mirror://gnome/sources/glibmm/2.30/glibmm-2.30.1.tar.xz;
-    major = "2"; minor = "30"; patchlevel = "0"; extension = "xz";
+    sha256 = "15zqgx6rashyhxk89qjqq05p6m40akpgzyjk8bfb3jk68rc2nn39";
-    sha256 = "1d0dxq4iamch8igrnbvbfwkfpvcnjfzyr9iq2x8hi89b9k1kzbd7";
   };
 
   buildNativeInputs = [pkgconfig xz];

pkgs/development/libraries/gtk+/3.2.x.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl_gnome, pkgconfig, glib, atk, pango, cairo, perl, xlibs
+{ stdenv, fetchurl, pkgconfig, glib, atk, pango129, cairo, perl, xlibs
 , gdk_pixbuf, xz
 , xineramaSupport ? true
 , cupsSupport ? true, cups ? null
@@ -8,12 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "gtk+-3.2.3";
 
-  src = fetchurl_gnome {
+  src = fetchurl {
-    project = "gtk+";
+    url = mirror://gnome/sources/gtk+/3.2/gtk+-3.2.3.tar.xz;
-    major = "3"; minor = "2"; patchlevel = "0"; extension = "xz";
+    sha256 = "0g8x2kcqq17bccm4yszim837saj73zfk66ia2azcgfqfa7r21kz2";
-    sha256 = "0k6l5sw8njbnbapzm9v5jwlrrl7xv1b8c9lmqx97bzbapslw3qxw";
   };
 
   enableParallelBuilding = true;
@@ -21,14 +20,12 @@ stdenv.mkDerivation rec {
   buildNativeInputs = [ perl pkgconfig xz ];
 
   propagatedBuildInputs =
-    [ xlibs.xlibs glib atk pango gdk_pixbuf cairo
+    [ xlibs.xlibs glib atk pango129 gdk_pixbuf cairo
       xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
     ]
     ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
     ++ stdenv.lib.optionals cupsSupport [ cups ];
 
-  configureFlags = "--with-xinput=yes";
-
   postInstall = "rm -rf $out/share/gtk-doc";
 
   meta = {

pkgs/development/libraries/pango/1.29.x.nix

@@ -1,11 +1,10 @@
-{ stdenv, fetchurl_gnome, pkgconfig, gettext, x11, glib, cairo, libpng, xz }:
+{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, xz }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "pango-1.29.4";
 
-  src = fetchurl_gnome {
+  src = fetchurl {
-    project = "pango";
+    url = mirror://gnome/sources/pango/1.29/pango-1.29.4.tar.xz;
-    major = "1"; minor = "29"; patchlevel = "4"; extension = "xz";
     sha256 = "0zqjq6ccv6mbah74rcvb03ksq1jwan21z37mdmqa56307sax3s3s";
   };
 

pkgs/development/libraries/polkit/default.nix

@@ -15,11 +15,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "polkit-0.102";
+  name = "polkit-0.104";
 
   src = fetchurl {
     url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "0hc60nwqnmixavgg0alk4w0llwj5xmm4bw8qh915qvqwhkd76r8a";
+    sha256 = "1yf7307svs8qk76qdlgww1bhgdcia5cm92n16xz7njhy73c162kb";
   };
 
   buildInputs =

pkgs/top-level/all-packages.nix

@@ -3715,9 +3715,9 @@ let
       gtkmm;
   };
 
-  glib = callPackage ../development/libraries/glib/2.28.x.nix { };
+  glib = callPackage ../development/libraries/glib/2.30.x.nix { };
 
-  glibmm = callPackage ../development/libraries/glibmm/2.28.x.nix { };
+  glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { };
 
   atk = callPackage ../development/libraries/atk/2.2.x.nix { };
 
@@ -3731,32 +3731,15 @@ let
 
   gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { };
 
-  gtk = callPackage ../development/libraries/gtk+/2.24.x.nix { };
+  gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { };
+
+  gtk = pkgs.gtk2;
 
   gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { };
 
-  gtkLibs3x = let callPackage = newScope pkgs.gtkLibs3x; in {
+  pango129 = lowPrio (callPackage ../development/libraries/pango/1.29.x.nix { });
-    glib = callPackage ../development/libraries/glib/2.30.x.nix { };
 
-    glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { };
+  gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { });
-
-    gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { };
-
-    atk = callPackage ../development/libraries/atk/2.2.x.nix { };
-
-    atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { };
-
-    cairo = callPackage ../development/libraries/cairo { };
-
-    pango = callPackage ../development/libraries/pango/1.29.x.nix { };
-
-    gtk = callPackage ../development/libraries/gtk+/3.2.x.nix { };
-
-    gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { };
-
-    # Let hydra build gtk-3.x but do not show this to users yet
-    recurseForRelease = true;
-  };
 
   gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
     inherit (gnome) gtk;
@@ -6366,6 +6349,8 @@ let
 
   gentium = callPackage ../data/fonts/gentium {};
 
+  gsettings_desktop_schemas = callPackage ../data/misc/gsettings-desktop-schemas { };
+
   hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { };
 
   inconsolata = callPackage ../data/fonts/inconsolata {};