From 6331d3226746a5da189b2c8d8c5a944066ccbe11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 29 Jan 2013 16:11:34 +0100
Subject: [PATCH] rename the expressions of some gtk-related libraries

now the default (and usually only) version is called default
---
 .../libraries/atk/{2.6.x.nix => default.nix}           |  0
 .../libraries/gdk-pixbuf/{2.26.x.nix => default.nix}   |  3 ++-
 .../libraries/glib/{2.34.x.nix => default.nix}         |  0
 .../development/libraries/gtk+/{2.24.x.nix => 2.x.nix} |  0
 .../libraries/pango/{1.30.x.nix => default.nix}        | 10 +++++-----
 pkgs/top-level/all-packages.nix                        | 10 +++++-----
 6 files changed, 12 insertions(+), 11 deletions(-)
 rename pkgs/development/libraries/atk/{2.6.x.nix => default.nix} (100%)
 rename pkgs/development/libraries/gdk-pixbuf/{2.26.x.nix => default.nix} (97%)
 rename pkgs/development/libraries/glib/{2.34.x.nix => default.nix} (100%)
 rename pkgs/development/libraries/gtk+/{2.24.x.nix => 2.x.nix} (100%)
 rename pkgs/development/libraries/pango/{1.30.x.nix => default.nix} (78%)

diff --git a/pkgs/development/libraries/atk/2.6.x.nix b/pkgs/development/libraries/atk/default.nix
similarity index 100%
rename from pkgs/development/libraries/atk/2.6.x.nix
rename to pkgs/development/libraries/atk/default.nix
diff --git a/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
similarity index 97%
rename from pkgs/development/libraries/gdk-pixbuf/2.26.x.nix
rename to pkgs/development/libraries/gdk-pixbuf/default.nix
index 33dcfa7d7fab..56ef0f708748 100644
--- a/pkgs/development/libraries/gdk-pixbuf/2.26.x.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz, jasper }:
+{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz
+, jasper }:
 
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-2.26.5";
diff --git a/pkgs/development/libraries/glib/2.34.x.nix b/pkgs/development/libraries/glib/default.nix
similarity index 100%
rename from pkgs/development/libraries/glib/2.34.x.nix
rename to pkgs/development/libraries/glib/default.nix
diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
similarity index 100%
rename from pkgs/development/libraries/gtk+/2.24.x.nix
rename to pkgs/development/libraries/gtk+/2.x.nix
diff --git a/pkgs/development/libraries/pango/1.30.x.nix b/pkgs/development/libraries/pango/default.nix
similarity index 78%
rename from pkgs/development/libraries/pango/1.30.x.nix
rename to pkgs/development/libraries/pango/default.nix
index 7168c1b6c9d6..4d429bfd7fb1 100644
--- a/pkgs/development/libraries/pango/1.30.x.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
+{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng, harfbuzz }:
 
 stdenv.mkDerivation rec {
-  name = "pango-1.30.1";
+  name = "pango-1.32.5"; #.6 needs a not-yet-stable fontconfig
 
   src = fetchurl {
-    url = "mirror://gnome/sources/pango/1.30/${name}.tar.xz";
-    sha256 = "3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe";
+    url = "mirror://gnome/sources/pango/1.32/${name}.tar.xz";
+    sha256 = "08aqis6j8nd1lb4f2h4h9d9kjvp54iwf8zvqzss0qn4v7nfcjyvx";
   };
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
 
   buildNativeInputs = [ pkgconfig ];
 
-  propagatedBuildInputs = [ x11 glib cairo libpng ];
+  propagatedBuildInputs = [ x11 glib cairo libpng harfbuzz ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f78b3d8669ee..b872f6098894 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3934,25 +3934,25 @@ let
       gtkmm;
   };
 
-  glib = callPackage ../development/libraries/glib/2.34.x.nix { };
+  glib = callPackage ../development/libraries/glib { };
 
   glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { };
 
   glib_networking = callPackage ../development/libraries/glib-networking {};
 
-  atk = callPackage ../development/libraries/atk/2.6.x.nix { };
+  atk = callPackage ../development/libraries/atk { };
 
   atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { };
 
   cairo = callPackage ../development/libraries/cairo { };
 
-  pango = callPackage ../development/libraries/pango/1.30.x.nix { };
+  pango = callPackage ../development/libraries/pango { };
 
   pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { };
 
-  gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.26.x.nix { };
+  gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
 
-  gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { };
+  gtk2 = callPackage ../development/libraries/gtk+/2.x.nix { };
 
   gtk = pkgs.gtk2;