Author: urkud
Date: Sun Apr 1 19:47:34 2012
New Revision: 33526
URL: https://nixos.org/websvn/nix/?rev=33526&sc=1
Log:
Upgrade many glib/gtk packages
Pass shared-mime-info to gdk-pixbuf and gtk+. Earlier "gio can sniff" test in
gdk-pixbuf were failing due to absence of known 'image/png' mime type.
Modified:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/atk/default.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gdk-pixbuf/default.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/default.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/2.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/3.x.nix
nixpkgs/branches/glib-2.32/pkgs/development/libraries/pango/default.nix
Modified: nixpkgs/branches/glib-2.32/pkgs/development/libraries/atk/default.nix
==============================================================================
--- nixpkgs/branches/glib-2.32/pkgs/development/libraries/atk/default.nix
Sun Apr 1 19:47:30 2012 (r33525)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/atk/default.nix
Sun Apr 1 19:47:34 2012 (r33526)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, perl, glib }:
stdenv.mkDerivation rec {
- name = "atk-2.2.0";
+ name = "atk-2.4.0";
src = fetchurl {
- url = mirror://gnome/sources/atk/2.2/atk-2.2.0.tar.xz;
- sha256 = "17bkqg89l9hxbkgc76cxlin1bwczk7m6ikbccx677lrxh3kz08lb";
+ url = mirror://gnome/sources/atk/2.4/atk-2.4.0.tar.xz;
+ sha256 = "13c87l4nghmj05f6v2z5vmngmdzzi71wjr7sv1ybryx9fplrq7h9";
};
buildNativeInputs = [ pkgconfig perl ];
Modified:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gdk-pixbuf/default.nix
==============================================================================
---
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gdk-pixbuf/default.nix
Sun Apr 1 19:47:30 2012 (r33525)
+++
nixpkgs/branches/glib-2.32/pkgs/development/libraries/gdk-pixbuf/default.nix
Sun Apr 1 19:47:34 2012 (r33526)
@@ -1,31 +1,29 @@
{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz
-, jasper }:
+, jasper, shared_mime_info }:
stdenv.mkDerivation {
- name = "gdk-pixbuf-2.24.1";
+ name = "gdk-pixbuf-2.26.0";
src = fetchurl {
- url = mirror://gnome/sources/gdk-pixbuf/2.24/gdk-pixbuf-2.24.1.tar.xz;
- sha256 = "1qdywh1r75lalb7z6s9pm6pmqx82chrrxqb8cdqi629nvc03yyns";
+ url = mirror://gnome/sources/gdk-pixbuf/2.26/gdk-pixbuf-2.26.0.tar.xz;
+ sha256 = "0k959w31wqkk4jsvbxyzczq3far5dqdmdg34c9nbn33i6cx8s0m5";
};
# !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
buildInputs = [ libX11 ];
- buildNativeInputs = [ pkgconfig ];
+ buildNativeInputs = [ pkgconfig shared_mime_info ];
propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
configureFlags = "--with-libjasper --with-x11";
- postInstall = "rm -rf $out/share/gtk-doc";
-
meta = {
description = "A library for image loading and manipulation";
homepage = http://library.gnome.org/devel/gdk-pixbuf/;
- maintainers = [ stdenv.lib.maintainers.eelco ];
+ maintainers = with stdenv.lib.maintainers; [ eelco urkud ];
platforms = stdenv.lib.platforms.linux;
};
}
Modified: nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/default.nix
==============================================================================
--- nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/default.nix
Sun Apr 1 19:47:30 2012 (r33525)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/glib/default.nix
Sun Apr 1 19:47:34 2012 (r33526)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, libffi
-, python, pcre }:
+, python, pcre, libelf }:
# TODO:
# * Add gio-module-fam
@@ -11,16 +11,16 @@
# Reminder: add 'sed -e 's@python2\.[0-9]@python@' -i
# $out/bin/gtester-report' to postInstall if this is solved
-stdenv.mkDerivation rec {
- name = "glib-2.30.3";
+stdenv.mkDerivation {
+ name = "glib-2.32.0";
src = fetchurl {
- url = mirror://gnome/sources/glib/2.30/glib-2.30.3.tar.xz;
- sha256 = "09yxfajynbw78kji48z384lylp67kihfi1g78qrrjif4f5yb5jz6";
+ url = mirror://gnome/sources/glib/2.32/glib-2.32.0.tar.xz;
+ sha256 = "1r0s4sxz3g2iz9vl8swk3x79fyckmnbkhckyajf0cj6nbvrdksfd";
};
# configure script looks for d-bus but it is only needed for tests
- buildInputs = [ pcre ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
+ buildInputs = [ pcre ] ++ (if stdenv.isLinux then [ libelf ] else [ libiconv
]);
buildNativeInputs = [ perl pkgconfig gettext python ];
propagatedBuildInputs = [ zlib libffi ];
Modified: nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/2.x.nix
==============================================================================
--- nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/2.x.nix Sun Apr
1 19:47:30 2012 (r33525)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/2.x.nix Sun Apr
1 19:47:34 2012 (r33526)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs
-, gdk_pixbuf, xz
+, gdk_pixbuf, xz, shared_mime_info
, xineramaSupport ? true
, cupsSupport ? true, cups ? null
}:
@@ -23,7 +23,7 @@
enableParallelBuilding = true;
- buildNativeInputs = [ perl pkgconfig ];
+ buildNativeInputs = [ perl pkgconfig shared_mime_info ];
propagatedBuildInputs =
[ xlibs.xlibs glib atk pango gdk_pixbuf cairo
Modified: nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/3.x.nix
==============================================================================
--- nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/3.x.nix Sun Apr
1 19:47:30 2012 (r33525)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/gtk+/3.x.nix Sun Apr
1 19:47:34 2012 (r33526)
@@ -7,12 +7,12 @@
assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null;
-stdenv.mkDerivation rec {
- name = "gtk+-3.2.3";
+stdenv.mkDerivation {
+ name = "gtk+-3.4.0";
src = fetchurl {
- url = mirror://gnome/sources/gtk+/3.2/gtk+-3.2.3.tar.xz;
- sha256 = "0g8x2kcqq17bccm4yszim837saj73zfk66ia2azcgfqfa7r21kz2";
+ url = mirror://gnome/sources/gtk+/3.4/gtk+-3.4.0.tar.xz;
+ sha256 = "1q7kh45k60fvmqzcnsjwrp2ww5n90dskwzpmm045wdb0pkl8pbq0";
};
enableParallelBuilding = true;
Modified:
nixpkgs/branches/glib-2.32/pkgs/development/libraries/pango/default.nix
==============================================================================
--- nixpkgs/branches/glib-2.32/pkgs/development/libraries/pango/default.nix
Sun Apr 1 19:47:30 2012 (r33525)
+++ nixpkgs/branches/glib-2.32/pkgs/development/libraries/pango/default.nix
Sun Apr 1 19:47:34 2012 (r33526)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
stdenv.mkDerivation rec {
- name = "pango-1.29.4";
+ name = "pango-1.30.0";
src = fetchurl {
- url = mirror://gnome/sources/pango/1.29/pango-1.29.4.tar.xz;
- sha256 = "0zqjq6ccv6mbah74rcvb03ksq1jwan21z37mdmqa56307sax3s3s";
+ url = mirror://gnome/sources/pango/1.30/pango-1.30.0.tar.xz;
+ sha256 = "1zrd23s8gls8ixl51z6r6rm9qpr332w7k4igjh7fvymg4jq2lvbw";
};
buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
