From 32dd8c0854f37eade7be7dbd0531b27f8adb3b16 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" <urkud.urkud@gmail.com> Date: Sun, 9 Oct 2011 08:38:34 +0000 Subject: [PATCH] gtkLibx3x update svn path=/nixpkgs/trunk/; revision=29726 --- pkgs/development/libraries/atk/{2.1.x.nix => 2.2.x.nix} | 4 ++-- pkgs/development/libraries/glib/{2.29.x.nix => 2.30.x.nix} | 4 ++-- pkgs/development/libraries/gtk+/{3.1.x.nix => 3.2.x.nix} | 4 ++-- pkgs/development/libraries/pango/1.29.x.nix | 4 ++-- pkgs/top-level/all-packages.nix | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) rename pkgs/development/libraries/atk/{2.1.x.nix => 2.2.x.nix} (87%) rename pkgs/development/libraries/glib/{2.29.x.nix => 2.30.x.nix} (91%) rename pkgs/development/libraries/gtk+/{3.1.x.nix => 3.2.x.nix} (91%) diff --git a/pkgs/development/libraries/atk/2.1.x.nix b/pkgs/development/libraries/atk/2.2.x.nix similarity index 87% rename from pkgs/development/libraries/atk/2.1.x.nix rename to pkgs/development/libraries/atk/2.2.x.nix index 28619a85c036..45737aad3190 100644 --- a/pkgs/development/libraries/atk/2.1.x.nix +++ b/pkgs/development/libraries/atk/2.2.x.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { src = fetchurl_gnome { project = "atk"; - major = "2"; minor = "1"; patchlevel = "5"; extension = "xz"; - sha256 = "005b9sq8p9ykp4f35b59si3mcbw4p9hyxps1ij4x73p07rrbf0z9"; + major = "2"; minor = "2"; patchlevel = "0"; extension = "xz"; + sha256 = "17bkqg89l9hxbkgc76cxlin1bwczk7m6ikbccx677lrxh3kz08lb"; }; buildNativeInputs = [ pkgconfig perl xz ]; diff --git a/pkgs/development/libraries/glib/2.29.x.nix b/pkgs/development/libraries/glib/2.30.x.nix similarity index 91% rename from pkgs/development/libraries/glib/2.29.x.nix rename to pkgs/development/libraries/glib/2.30.x.nix index 589ec625dcc2..f92b9cf4cca6 100644 --- a/pkgs/development/libraries/glib/2.29.x.nix +++ b/pkgs/development/libraries/glib/2.30.x.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { src = fetchurl_gnome { project = "glib"; - major = "2"; minor = "29"; patchlevel = "18"; extension = "xz"; - sha256 = "1hc198x625w1w8if1xlvqyjs9aazc27s0l374kqc4sr51wcpbxpy"; + major = "2"; minor = "30"; patchlevel = "0"; extension = "xz"; + sha256 = "1hfdnxf5hsfhkd54390lnc1b14m9n7y031fpma4vpsh96js00k6n"; }; # configure script looks for d-bus but it is only needed for tests diff --git a/pkgs/development/libraries/gtk+/3.1.x.nix b/pkgs/development/libraries/gtk+/3.2.x.nix similarity index 91% rename from pkgs/development/libraries/gtk+/3.1.x.nix rename to pkgs/development/libraries/gtk+/3.2.x.nix index 5b473d44e7ea..a72411d16367 100644 --- a/pkgs/development/libraries/gtk+/3.1.x.nix +++ b/pkgs/development/libraries/gtk+/3.2.x.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { src = fetchurl_gnome { project = "gtk+"; - major = "3"; minor = "1"; patchlevel = "16"; extension = "xz"; - sha256 = "15arbf75qpchr9wrawb3zkn52rzf5wm2qv4dq10zfzlflimrq2rg"; + major = "3"; minor = "2"; patchlevel = "0"; extension = "xz"; + sha256 = "0k6l5sw8njbnbapzm9v5jwlrrl7xv1b8c9lmqx97bzbapslw3qxw"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.29.x.nix index 14dd3d8c5a5e..b255f05dd23b 100644 --- a/pkgs/development/libraries/pango/1.29.x.nix +++ b/pkgs/development/libraries/pango/1.29.x.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { src = fetchurl_gnome { project = "pango"; - major = "1"; minor = "29"; patchlevel = "3"; extension = "xz"; - sha256 = "0vp88j3ghngkkc4dpya443qng0bb1g86g54bcwf4lf3zmk6r1nmh"; + major = "1"; minor = "29"; patchlevel = "4"; extension = "xz"; + sha256 = "0zqjq6ccv6mbah74rcvb03ksq1jwan21z37mdmqa56307sax3s3s"; }; buildInputs = stdenv.lib.optional stdenv.isDarwin gettext; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 476fa68b491e..63e5670fe22e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3576,17 +3576,17 @@ let }); gtkLibs3x = let callPackage = newScope pkgs.gtkLibs3x; in { - glib = callPackage ../development/libraries/glib/2.29.x.nix { }; + glib = callPackage ../development/libraries/glib/2.30.x.nix { }; gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { }; - atk = callPackage ../development/libraries/atk/2.1.x.nix { }; + atk = callPackage ../development/libraries/atk/2.2.x.nix { }; cairo = callPackage ../development/libraries/cairo { }; pango = callPackage ../development/libraries/pango/1.29.x.nix { }; - gtk = callPackage ../development/libraries/gtk+/3.1.x.nix { }; + gtk = callPackage ../development/libraries/gtk+/3.2.x.nix { }; # Let hydra build gtk-3.x but do not show this to users yet recurseForRelease = true;