From f84a08bac3bb93f05eaea9e63e9cc86296b9b0c6 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 5 Jan 2012 17:05:31 +0000
Subject: Upgrade libwpd and libwpg to latest versions

svn path=/nixpkgs/trunk/; revision=31313
---
 pkgs/development/libraries/libwpd/default.nix | 14 ++++++++------
 pkgs/development/libraries/libwpg/default.nix |  9 +++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix
index 78487a9f3237..dc3f8b5352de 100644
--- a/pkgs/development/libraries/libwpd/default.nix
+++ b/pkgs/development/libraries/libwpd/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }:
+{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, xz }:
 
-stdenv.mkDerivation {
-  name = "libwpd-0.8.14";
+stdenv.mkDerivation rec {
+  name = "libwpd-0.9.4";
   
   src = fetchurl {
-    url = mirror://sourceforge/libwpd/libwpd-0.8.14.tar.gz;
-    sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01";
+    url = "mirror://sourceforge/libwpd/${name}.tar.xz";
+    sha256 = "0qba429cqd72nwn1mzpj7llyi3kwykb2lplcfxffvq8svzxyzkxy";
   };
   
-  buildInputs = [ pkgconfig glib libgsf libxml2 bzip2 ];
+  buildInputs = [ glib libgsf libxml2 ];
+
+  buildNativeInputs = [ pkgconfig xz ];
 }
diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix
index 14c34eaf4199..d140b8b8a0cd 100644
--- a/pkgs/development/libraries/libwpg/default.nix
+++ b/pkgs/development/libraries/libwpg/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchurl, pkgconfig, libwpd }:
 
 stdenv.mkDerivation rec {
-  name = "libwpg-0.1.3";
+  name = "libwpg-0.2.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/libwpg/${name}.tar.bz2";
-    sha256 = "086mgy36mia76mpfa2qgn0q44b3aigvvng9snzrxh60v3v9wixa7";
+    url = "mirror://sourceforge/libwpg/${name}.tar.xz";
+    sha256 = "0d83nx4rxkrq2sbfbbqpddni56h1328dzmraxyl6vh9p4f19rh5d";
   };
 
-  buildInputs = [ pkgconfig libwpd ];
+  buildInputs = [ libwpd ];
+  buildNativeInputs = [ pkgconfig ];
 
   meta = {
     homepage = http://libwpg.sourceforge.net;
-- 
cgit 1.4.1


From f490ef82b8e66b6d2d531b71c10aae6dcc98c038 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 5 Jan 2012 18:05:18 +0000
Subject: Pass xz to libwpg

svn path=/nixpkgs/trunk/; revision=31316
---
 pkgs/development/libraries/libwpg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix
index d140b8b8a0cd..3da153c3dc5a 100644
--- a/pkgs/development/libraries/libwpg/default.nix
+++ b/pkgs/development/libraries/libwpg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libwpd }:
+{ stdenv, fetchurl, pkgconfig, libwpd, xz }:
 
 stdenv.mkDerivation rec {
   name = "libwpg-0.2.1";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libwpd ];
-  buildNativeInputs = [ pkgconfig ];
+  buildNativeInputs = [ pkgconfig xz ];
 
   meta = {
     homepage = http://libwpg.sourceforge.net;
-- 
cgit 1.4.1


From 2b20492775b52a2eda4a971a4901c06b68031a26 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 5 Jan 2012 23:15:54 +0000
Subject: libplist: use swig2

libplist compilation with swig1 fails in stdenv-updates

svn path=/nixpkgs/trunk/; revision=31324
---
 pkgs/development/libraries/libplist/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index 4c4abe0557f3..816269599387 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, cmake, libxml2, glib, swig, python }:
+{ stdenv, fetchurl, cmake, libxml2, swig2, python, glib }:
 
 stdenv.mkDerivation rec {
   name = "libplist-1.3";
 
-  buildInputs = [ cmake swig ];
+  buildNativeInputs = [ cmake swig2 ];
 
   patches = [ ./swig.patch ];
 
   propagatedBuildInputs = [ libxml2 glib python ];
 
+  passthru.swig = swig2;
+
   src = fetchurl {
     url = "http://github.com/downloads/JonathanBeck/libplist/${name}.tar.bz2";
     sha256 = "1c5nwp9jbsp5kx8avmmsr5g7qdngnqlplh2sjbygmhydb6n8lb4q";
-- 
cgit 1.4.1


From 49c2aebc3d8928b78a522d82eef855218cb2d065 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 5 Jan 2012 23:16:00 +0000
Subject: libimobiledevice-1.0.6

disable swig version check
use libplist.swig

svn path=/nixpkgs/trunk/; revision=31325
---
 pkgs/development/libraries/libimobiledevice/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
index 8af6b2d611af..b4bb3b47a35e 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/pkgs/development/libraries/libimobiledevice/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchurl, python, swig, pkgconfig, usbmuxd, glib, gnutls, libgcrypt,
+{ stdenv, fetchurl, python, pkgconfig, usbmuxd, glib, gnutls, libgcrypt,
   libtasn1, libplist, readline }:
 
 stdenv.mkDerivation rec {
-  name = "libimobiledevice-1.0.2";
+  name = "libimobiledevice-1.0.6";
 
-  buildInputs = [ python swig pkgconfig readline ];
+  buildNativeInputs = [ python libplist.swig pkgconfig ];
+  buildInputs = [ readline ];
   propagatedBuildInputs = [ usbmuxd glib gnutls libgcrypt libtasn1 libplist ];
 
-  configureFlags = "--enable-dev-tools";
+  patchPhase = ''sed -e 's@1\.3\.21@@' -i configure'';
+  passthru.swig = libplist.swig;
 
   src = fetchurl {
     url = "${meta.homepage}/downloads/${name}.tar.bz2";
-    sha256 = "1wbx0hr0q1dhw1p7326qm3dvzacykhc4w005q5wp2gkxa68dnw5s";
+    sha256 = "0r5gjprrnwgad5zsidn41w01gihramagcpl8cwi540qiwq43svqi";
   };
 
   meta = {
-- 
cgit 1.4.1


From 18f1e5b5941f644d4ecb274696fa1198ffda827e Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 5 Jan 2012 23:16:06 +0000
Subject: libgpod-0.8.2

svn path=/nixpkgs/trunk/; revision=31326
---
 pkgs/development/libraries/libgpod/default.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index e0614d3bd393..e271e9661809 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -1,25 +1,28 @@
 {stdenv, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib,
-  libxml2, sqlite, libplist, libusb1, zlib, sg3_utils, gtk, taglib,
-  libimobiledevice, python, pygobject, mutagen, swig }:
+  libxml2, sqlite, libusb1, zlib, sg3_utils, gdk_pixbuf, taglib,
+  libimobiledevice, python, pygobject, mutagen }:
 
 stdenv.mkDerivation rec {
-  name = "libgpod-0.7.94";
+  name = "libgpod-0.8.2";
   src = fetchurl {
-    url = "mirror://sourceforge/gtkpod/${name}.tar.gz";
-    sha256 = "0bs6p5np8kbyhvkj4vza2dmq7qfsf48chx00hirkf3mqccp41xk4";
+    url = "mirror://sourceforge/gtkpod/${name}.tar.bz2";
+    sha256 = "14m0amy56q4riwvcjszv04a9zp7l2xk8nx0vvhy94yqd0sqfjm00";
   };
 
-  patchPhase = ''sed -e "s,udevdir=,&$out," -i configure'';
+  preConfigure = "configureFlagsArray=( --with-udev-dir=$out/lib/udev )";
   configureFlags = "--without-hal --enable-udev";
 
-  propagatedBuildInputs = [ glib libxml2 sqlite libplist libusb1 zlib sg3_utils
-    gtk taglib libimobiledevice python pygobject mutagen ];
+  propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils
+    gdk_pixbuf taglib libimobiledevice python pygobject mutagen ];
 
-  buildInputs = [ gettext perlXMLParser intltool pkgconfig perl swig ];
+  buildNativeInputs = [ gettext perlXMLParser intltool pkgconfig perl
+    libimobiledevice.swig ];
 
   meta = {
     homepage = http://gtkpod.sourceforge.net/;
     description = "Library used by gtkpod to access the contents of an ipod";
     license = "LGPL";
+    platforms = stdenv.lib.platforms.gnu;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }
-- 
cgit 1.4.1


From ce32f3b5dbc783f27dda2ff227917dfcf4584d28 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 5 Jan 2012 23:16:12 +0000
Subject: Add meta to qtscriptgenerator

svn path=/nixpkgs/trunk/; revision=31327
---
 pkgs/development/libraries/qtscriptgenerator/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix
index 8b257d299bf3..913f4acdc7dd 100644
--- a/pkgs/development/libraries/qtscriptgenerator/default.nix
+++ b/pkgs/development/libraries/qtscriptgenerator/default.nix
@@ -31,4 +31,11 @@ stdenv.mkDerivation {
     ensureDir $out/lib/qt4/plugins/script
     cp -av plugins/script/* $out/lib/qt4/plugins/script
   '';
+
+  meta = {
+    description = "QtScript bindings generator";
+    homepage = http://code.google.com/p/qtscriptgenerator/;
+    inherit (qt4.meta) platforms;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
 }
-- 
cgit 1.4.1


From ba80f4337f3d7310b89b9505d080b4e68bdfacd6 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 5 Jan 2012 23:43:22 +0000
Subject: taglib{,-extras}: use buildNativeInputs, meta

svn path=/nixpkgs/trunk/; revision=31329
---
 pkgs/development/libraries/taglib-extras/default.nix | 7 ++++---
 pkgs/development/libraries/taglib/default.nix        | 9 ++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/taglib-extras/default.nix b/pkgs/development/libraries/taglib-extras/default.nix
index f7833bd773c4..de0c7ba2b754 100644
--- a/pkgs/development/libraries/taglib-extras/default.nix
+++ b/pkgs/development/libraries/taglib-extras/default.nix
@@ -1,10 +1,11 @@
 {stdenv, fetchurl, cmake, taglib}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "taglib-extras-1.0.1";
   src = fetchurl {
-    url = http://www.kollide.net/~jefferai/taglib-extras-1.0.1.tar.gz;
+    url = "http://www.kollide.net/~jefferai/${name}.tar.gz";
     sha256 = "0cln49ws9svvvals5fzxjxlzqm0fzjfymn7yfp4jfcjz655nnm7y";
   };
-  buildInputs = [ cmake taglib ];
+  buildInputs = [ taglib ];
+  buildNativeInputs = [ cmake ];
 }
diff --git a/pkgs/development/libraries/taglib/default.nix b/pkgs/development/libraries/taglib/default.nix
index 39e2b88b85e9..d0ba30fff507 100644
--- a/pkgs/development/libraries/taglib/default.nix
+++ b/pkgs/development/libraries/taglib/default.nix
@@ -1,19 +1,22 @@
 {stdenv, fetchurl, zlib, cmake}:
 
 stdenv.mkDerivation rec {
-  name = "taglib-1.7.0";
+  name = "taglib-1.7";
   
   src = fetchurl {
-    url = "https://github.com/downloads/taglib/taglib/taglib-1.7.tar.gz";
+    url = "http://developer.kde.org/~wheeler/files/src/${name}.tar.gz";
     sha256 = "0gvpmfrrh4wgdpyc14zq9mk3hivp8kbmfdxjk8bi2nf3py6zpph9";
   };
   
   cmakeFlags = "-DWITH_ASF=ON -DWITH_MP4=ON";
 
-  buildInputs = [zlib cmake];
+  buildInputs = [zlib];
+  buildNativeInputs = [cmake];
 
   meta = {
     homepage = http://developer.kde.org/~wheeler/taglib.html;
     description = "A library for reading and editing the meta-data of several popular audio formats";
+    inherit (cmake.meta) platforms;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }
-- 
cgit 1.4.1


From 3d0f767b91798152f9c5c16dab81d39e1fc7b9a5 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 5 Jan 2012 23:46:17 +0000
Subject: OpenSSL: Fix compilation on GNU/Hurd.

svn path=/nixpkgs/trunk/; revision=31330
---
 .../libraries/openssl/cert-file-path-max.patch     | 34 ++++++++++++++++++++++
 pkgs/development/libraries/openssl/default.nix     |  8 ++++-
 pkgs/development/libraries/openssl/gnu.patch       | 25 ++++++++++++++++
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/openssl/cert-file-path-max.patch
 create mode 100644 pkgs/development/libraries/openssl/gnu.patch

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/openssl/cert-file-path-max.patch b/pkgs/development/libraries/openssl/cert-file-path-max.patch
new file mode 100644
index 000000000000..50621c5cb820
--- /dev/null
+++ b/pkgs/development/libraries/openssl/cert-file-path-max.patch
@@ -0,0 +1,34 @@
+This patch, to be applied after `cert-file.patch', fixes compilation
+on GNU/Hurd where `PATH_MAX' is not defined.
+
+diff -ubB --show-c-function openssl-1.0.0e/crypto/x509/x509_def.c.orig openssl-1.0.0e/crypto/x509/x509_def.c
+--- openssl-1.0.0e/crypto/x509/x509_def.c.orig	2012-01-06 00:08:48.000000000 +0100
++++ openssl-1.0.0e/crypto/x509/x509_def.c	2012-01-06 00:11:29.000000000 +0100
+@@ -58,6 +58,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <limits.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+@@ -76,14 +77,16 @@ const char *X509_get_default_cert_dir(vo
+ 
+ const char *X509_get_default_cert_file(void)
+ 	{
+-	static char buf[PATH_MAX] = X509_CERT_FILE;
++	static char *buf;
+ 	static int init = 0;
+ 	if (!init) {
+ 	    init = 1;
+ 	    char * s = getenv("OPENSSL_X509_CERT_FILE");
+ 	    if (s && getuid() == geteuid()) {
+-		strncpy(buf, s, sizeof(buf));
+-		buf[sizeof(buf) - 1] = 0;
++	         buf = strdup(s);
++	    }
++	    if (!s) {
++	         buf = strdup(X509_CERT_FILE);
+ 	    }
+ 	}
+ 	return buf;
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index dd5e03c33f92..4b34c3500ec8 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -26,7 +26,13 @@ stdenv.mkDerivation {
       # environment variable is ignored for setuid binaries.
       ./cert-file.patch
     ]
-    ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
+
+    ++ (stdenv.lib.optionals (stdenv ? cross && opensslCrossSystem == "hurd-x86")
+         [ ./cert-file-path-max.patch # merge with `cert-file.patch' eventually
+           ./gnu.patch                # submitted upstream
+         ])
+
+    ++ (stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch);
 
   buildNativeInputs = [ perl ];
 
diff --git a/pkgs/development/libraries/openssl/gnu.patch b/pkgs/development/libraries/openssl/gnu.patch
new file mode 100644
index 000000000000..b82496cf8786
--- /dev/null
+++ b/pkgs/development/libraries/openssl/gnu.patch
@@ -0,0 +1,25 @@
+Patch to fix compilation on GNU/Hurd and GNU/kFreeBSD.
+
+--- openssl-1.0.0e/Configure	2012-01-06 00:39:49.000000000 +0100
++++ openssl-1.0.0e/Configure	2012-01-06 00:39:51.000000000 +0100
+@@ -563,7 +563,7 @@ my %table=(
+ "newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",
+ 
+ ##### GNU Hurd
+-"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
++"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so",
+ 
+ ##### OS/2 EMX
+ "OS2-EMX", "gcc::::::::",
+
+--- openssl-1.0.0e/crypto/dso/dso_dlfcn.c	2012-01-06 00:05:47.000000000 +0100
++++ openssl-1.0.0e/crypto/dso/dso_dlfcn.c	2012-01-06 00:21:05.000000000 +0100
+@@ -60,7 +60,7 @@
+    that handle _GNU_SOURCE and other similar macros.  Defining it later
+    is simply too late, because those headers are protected from re-
+    inclusion.  */
+-#ifdef __linux
++#if defined __linux || defined __GNU__ || defined __GLIBC__
+ # ifndef _GNU_SOURCE
+ #  define _GNU_SOURCE	/* make sure dladdr is declared */
+ # endif
-- 
cgit 1.4.1


From 53d922475d53d28066df47f2f3b963b178d206e0 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 6 Jan 2012 00:55:42 +0000
Subject: gtkLibs3x.glib: 2.30.2

svn path=/nixpkgs/trunk/; revision=31335
---
 pkgs/development/libraries/glib/2.30.x.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/glib/2.30.x.nix b/pkgs/development/libraries/glib/2.30.x.nix
index 25f8abfeb0a5..a0d8ac0eff7b 100644
--- a/pkgs/development/libraries/glib/2.30.x.nix
+++ b/pkgs/development/libraries/glib/2.30.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl_gnome, pkgconfig, gettext, perl, libiconv, zlib, xz, libffi
+{ stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, xz, libffi
 , python }:
 
 # TODO:
@@ -12,12 +12,11 @@
 #       $out/bin/gtester-report' to postInstall if this is solved
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "glib-2.30.2";
 
-  src = fetchurl_gnome {
-    project = "glib";
-    major = "2"; minor = "30"; patchlevel = "0"; extension = "xz";
-    sha256 = "1hfdnxf5hsfhkd54390lnc1b14m9n7y031fpma4vpsh96js00k6n";
+  src = fetchurl {
+    url = mirror://gnome/sources/glib/2.30/glib-2.30.2.tar.xz;
+    sha256 = "10lfzxwc45lh5vfnd33l4m9z1mf3arpwdd8jz94dn79j6diixsgh";
   };
 
   # configure script looks for d-bus but it is only needed for tests
-- 
cgit 1.4.1


From dc9bf79b545d97216739e37aa2e02025d2f80019 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 6 Jan 2012 00:55:48 +0000
Subject: attica-0.3.0

svn path=/nixpkgs/trunk/; revision=31336
---
 pkgs/development/libraries/attica/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/attica/default.nix b/pkgs/development/libraries/attica/default.nix
index 95de0834f292..6d53ff303beb 100644
--- a/pkgs/development/libraries/attica/default.nix
+++ b/pkgs/development/libraries/attica/default.nix
@@ -1,19 +1,20 @@
 { stdenv, fetchurl, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "attica-0.2.0";
+  name = "attica-0.3.0";
   
   src = fetchurl {
     url = "mirror://kde/stable/attica/${name}.tar.bz2";
-    sha256 = "0g2la91fgdr185ah15vc91plvdwvbm6kpsyz0vk0da7ggiyg3y9a";
+    sha256 = "1wfd37mvskn77ppzjdh3x6cb5p9na81ibh05ardfvbwqqn523gd0";
   };
   
-  buildInputs = [ cmake qt4 ];
+  buildInputs = [ qt4 ];
+  buildNativeInputs = [ cmake ];
   
   meta = with stdenv.lib; {
     description = "A library to access Open Collaboration Service providers";
     license = "LGPL";
     maintainers = [ maintainers.sander maintainers.urkud ];
-    platforms = qt4.meta.platforms;
+    inherit (qt4.meta) platforms;
   };
 }
-- 
cgit 1.4.1


From e840fafaf76cd621fde1e8772eaf8d610a8be625 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jan 2012 13:29:50 +0000
Subject: haskell-conduit: updated to version 0.0.1

svn path=/nixpkgs/trunk/; revision=31341
---
 pkgs/development/libraries/haskell/conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index 752894593854..f7dd889c6735 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "0.0.0.2";
-  sha256 = "1fngrlly5q2l0j3fil4cx3zj2h4sxnh20i0r84l4qhl8s0x5ba5z";
+  version = "0.0.1";
+  sha256 = "1klbwiqic6qgvzsxgb9x4hrfn0d3y679ml4f2qjdgx6p33gsyzns";
   buildDepends = [
     liftedBase monadControl text transformers transformersBase
   ];
-- 
cgit 1.4.1


From 3dafbad90f31db5fe920e302c3765038a8b8a95c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jan 2012 13:29:53 +0000
Subject: haskell-http-conduit: updated to version 1.1.0.1

svn path=/nixpkgs/trunk/; revision=31342
---
 pkgs/development/libraries/haskell/http-conduit/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix
index 9a2ac22721c7..105c7803c448 100644
--- a/pkgs/development/libraries/haskell/http-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/http-conduit/default.nix
@@ -2,24 +2,21 @@
 , blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate
 , conduit, cprngAes, dataDefault, failure, httpTypes, liftedBase
 , monadControl, network, text, tls, tlsExtra, transformers
-, transformersBase, utf8String, zlibConduit, zlibEnum
+, transformersBase, utf8String, zlibConduit
 }:
 
 cabal.mkDerivation (self: {
   pname = "http-conduit";
-  version = "1.0.0.1";
-  sha256 = "0yag65ariakvbvsrr3kd16bags4caw8n3qlcwpzrblprgjrv06vm";
-  isLibrary = true;
-  isExecutable = true;
+  version = "1.1.0.1";
+  sha256 = "0jlj727rs8f1yxy6ms2gi3ryj4di5la0pgn2hw5flglflacj8wb6";
   buildDepends = [
     asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
     blazeBuilderConduit caseInsensitive certificate conduit cprngAes
     dataDefault failure httpTypes liftedBase monadControl network text
     tls tlsExtra transformers transformersBase utf8String zlibConduit
-    zlibEnum
   ];
   meta = {
-    homepage = "http://github.com/snoyberg/http-enumerator";
+    homepage = "http://www.yesodweb.com/book/http-conduit";
     description = "HTTP client package with conduit interface and HTTPS support";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-- 
cgit 1.4.1


From 5667c155bfb5dd2727b52099e95d605ed4baa878 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jan 2012 13:29:57 +0000
Subject: haskell-http-enumerator: updated to version 0.7.2.3

svn path=/nixpkgs/trunk/; revision=31343
---
 pkgs/development/libraries/haskell/http-enumerator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix
index c29489e1d9fe..4e60042dc306 100644
--- a/pkgs/development/libraries/haskell/http-enumerator/default.nix
+++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix
@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "http-enumerator";
-  version = "0.7.2.2";
-  sha256 = "0s0mjws2sgpbydx4cv9waz71lpylgbbyk0wmvypyjvfhxd9d01hf";
+  version = "0.7.2.3";
+  sha256 = "1f66dnqm67qzg76w47kqvpv7ssandmf8md838mdzrsg88x54dar7";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
cgit 1.4.1


From 25995d5fb687acc58160b1f3abfc47abc055fc3d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jan 2012 13:29:59 +0000
Subject: haskell-iteratee: updated to version 0.8.7.6

svn path=/nixpkgs/trunk/; revision=31344
---
 pkgs/development/libraries/haskell/iteratee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/haskell/iteratee/default.nix b/pkgs/development/libraries/haskell/iteratee/default.nix
index 148cf3474b1c..07b2d52e17c5 100644
--- a/pkgs/development/libraries/haskell/iteratee/default.nix
+++ b/pkgs/development/libraries/haskell/iteratee/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "iteratee";
-  version = "0.8.7.5";
-  sha256 = "182bxdnj7k4dkmrbnkzy93axq8hwpq3xdbkyf93hbzzp4vhdvjnl";
+  version = "0.8.7.6";
+  sha256 = "05zhw44zycwllvyrkxz1mkn5mkylrdz9ynh27k17gsm9mjml3cab";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-- 
cgit 1.4.1


From 671455b8be02226c57baaab91806408baec17161 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jan 2012 13:30:02 +0000
Subject: haskell-maude: updated to version 0.3.0

svn path=/nixpkgs/trunk/; revision=31345
---
 pkgs/development/libraries/haskell/maude/default.nix | 10 +++++-----
 pkgs/top-level/haskell-packages.nix                  |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/haskell/maude/default.nix b/pkgs/development/libraries/haskell/maude/default.nix
index f9d7f68eaf63..1344f7759af6 100644
--- a/pkgs/development/libraries/haskell/maude/default.nix
+++ b/pkgs/development/libraries/haskell/maude/default.nix
@@ -1,12 +1,12 @@
-{ cabal, text }:
+{ cabal, parsec, text }:
 
 cabal.mkDerivation (self: {
   pname = "maude";
-  version = "0.2.1";
-  sha256 = "10igixljxfrpns2ffvk4g5dsv2pr8p1f7hc65z5x91n6x8zd01vi";
-  buildDepends = [ text ];
+  version = "0.3.0";
+  sha256 = "1z9bk4fzkbfiqqx4mv4cdlckchvcli2gcp40d04ravvj7x6yaghg";
+  buildDepends = [ parsec text ];
   meta = {
-    homepage = "https://code.google.com/p/maude-hs/";
+    homepage = "https://github.com/davidlazar/maude-hs";
     description = "An interface to the Maude rewriting system";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b4fdbe463297..e467afb26f17 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -915,7 +915,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   logfloat = callPackage ../development/libraries/haskell/logfloat {};
 
-  maude = callPackage ../development/libraries/haskell/maude {};
+  maude = callPackage ../development/libraries/haskell/maude {
+    parsec = self.parsec3;
+  };
 
   MaybeT = callPackage ../development/libraries/haskell/MaybeT {};
 
-- 
cgit 1.4.1


From e40df7466568ef343208ba8b2206fac18dd0852b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jan 2012 13:30:05 +0000
Subject: haskell-yesod-core: updated to version 0.9.4.1

svn path=/nixpkgs/trunk/; revision=31346
---
 pkgs/development/libraries/haskell/yesod-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix
index 4e81d54979b4..b747179b0f37 100644
--- a/pkgs/development/libraries/haskell/yesod-core/default.nix
+++ b/pkgs/development/libraries/haskell/yesod-core/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-core";
-  version = "0.9.4";
-  sha256 = "1m9cxm3pngg4pq7j3p1sh7lrjp5gslnn6zcimc5ln8yldxx01c6g";
+  version = "0.9.4.1";
+  sha256 = "048xc8dshwpaxirz8wvk3ra0qs99wx1i145nfj7n3i6kw8qkfnz6";
   buildDepends = [
     aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
     cookie dataObject dataObjectYaml enumerator failure fastLogger
-- 
cgit 1.4.1


From d88a86d8ee6daf5ec06068a0cccceab809d0b152 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 6 Jan 2012 13:30:08 +0000
Subject: haskell-unix-compat: updated to version 0.3.0.1

svn path=/nixpkgs/trunk/; revision=31347
---
 .../libraries/haskell/unix-compat/0.2.2.1.nix           | 17 -----------------
 pkgs/development/libraries/haskell/unix-compat/0.3.nix  | 17 -----------------
 .../libraries/haskell/unix-compat/default.nix           | 17 +++++++++++++++++
 pkgs/top-level/haskell-packages.nix                     |  4 +---
 4 files changed, 18 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/unix-compat/0.2.2.1.nix
 delete mode 100644 pkgs/development/libraries/haskell/unix-compat/0.3.nix
 create mode 100644 pkgs/development/libraries/haskell/unix-compat/default.nix

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/haskell/unix-compat/0.2.2.1.nix b/pkgs/development/libraries/haskell/unix-compat/0.2.2.1.nix
deleted file mode 100644
index 34cbd4072f6e..000000000000
--- a/pkgs/development/libraries/haskell/unix-compat/0.2.2.1.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "unix-compat";
-  version = "0.2.2.1";
-  sha256 = "009dg6mxjmdkcmr2d1qq9r3f4qfx4d362lyxj9vvgwrzcdnsgzqi";
-  meta = {
-    homepage = "http://github.com/jystic/unix-compat";
-    description = "Portable POSIX-compatibility layer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unix-compat/0.3.nix b/pkgs/development/libraries/haskell/unix-compat/0.3.nix
deleted file mode 100644
index da13c9313ac2..000000000000
--- a/pkgs/development/libraries/haskell/unix-compat/0.3.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "unix-compat";
-  version = "0.3";
-  sha256 = "0zgz9s5z2kca37sgnf4dyfdw90435h20bznx485y1ggvh377jan7";
-  meta = {
-    homepage = "http://github.com/jystic/unix-compat";
-    description = "Portable POSIX-compatibility layer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/unix-compat/default.nix b/pkgs/development/libraries/haskell/unix-compat/default.nix
new file mode 100644
index 000000000000..83b670ee2c27
--- /dev/null
+++ b/pkgs/development/libraries/haskell/unix-compat/default.nix
@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "unix-compat";
+  version = "0.3.0.1";
+  sha256 = "09y2iih741l4jpi83c15zap94phfms4mavzg04r9rjgbav0ns2c4";
+  meta = {
+    homepage = "http://github.com/jystic/unix-compat";
+    description = "Portable POSIX-compatibility layer";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e467afb26f17..f123b1193401 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1317,9 +1317,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   uniqueid = callPackage ../development/libraries/haskell/uniqueid {};
 
-  unixCompat_0_2_2_1 = callPackage ../development/libraries/haskell/unix-compat/0.2.2.1.nix {};
-  unixCompat_0_3 = callPackage ../development/libraries/haskell/unix-compat/0.3.nix {};
-  unixCompat = self.unixCompat_0_2_2_1;
+  unixCompat = callPackage ../development/libraries/haskell/unix-compat {};
 
   unorderedContainers = callPackage ../development/libraries/haskell/unordered-containers {};
 
-- 
cgit 1.4.1


From 7232a1e33ad9584f517ac85680e0eb726755a5be Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Fri, 6 Jan 2012 14:07:02 +0000
Subject: OpenSSL: Further fix `Configure' for GNU builds.

svn path=/nixpkgs/trunk/; revision=31348
---
 pkgs/development/libraries/openssl/gnu.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/openssl/gnu.patch b/pkgs/development/libraries/openssl/gnu.patch
index b82496cf8786..3cc6d049c944 100644
--- a/pkgs/development/libraries/openssl/gnu.patch
+++ b/pkgs/development/libraries/openssl/gnu.patch
@@ -7,7 +7,7 @@ Patch to fix compilation on GNU/Hurd and GNU/kFreeBSD.
  
  ##### GNU Hurd
 -"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC",
-+"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so",
++"hurd-x86",  "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
  
  ##### OS/2 EMX
  "OS2-EMX", "gcc::::::::",
-- 
cgit 1.4.1


From cae619da08cd663f05d905cbbd3b47f7d56aaa0b Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Fri, 6 Jan 2012 16:45:14 +0000
Subject: Updating elfutils/perf to cross-build. I tested this for the
 nanonote.

I add newt, checking that it cross-builds too.

I update perf to have newt support, and now it's also finding python, whatever
that means. I've not tested if 'python' as buildInputs is enough.


svn path=/nixpkgs/trunk/; revision=31353
---
 pkgs/development/libraries/newt/default.nix      | 29 ++++++++++++++
 pkgs/development/tools/misc/elfutils/default.nix | 51 ++++++++++++++++++++++--
 pkgs/os-specific/linux/kernel/perf.nix           | 17 ++++++--
 pkgs/top-level/all-packages.nix                  |  2 +
 4 files changed, 93 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/newt/default.nix

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix
new file mode 100644
index 000000000000..743314d18154
--- /dev/null
+++ b/pkgs/development/libraries/newt/default.nix
@@ -0,0 +1,29 @@
+{ fetchurl, stdenv, slang, popt }:
+
+stdenv.mkDerivation rec {
+  name = "newt-0.52.14";
+
+  src = fetchurl {
+    url = "https://fedorahosted.org/releases/n/e/newt/${name}.tar.gz";
+    sha256 = "13lp815zwldbw917wxmjy90gp608n3zlk4p3ybfqh0x6p9c4y3zp";
+  };
+
+  patchPhase = ''
+    sed -i -e s,/usr/bin/install,install, -e s,-I/usr/include/slang,, Makefile.in po/Makefile
+  '';
+
+  buildInputs = [ slang popt ];
+
+  crossAttrs = {
+    makeFlags = "CROSS_COMPILE=${stdenv.cross.config}-";
+  };
+
+  meta = {
+    homepage = https://fedorahosted.org/newt/;
+    description = "Library for color text mode, widget based user interfaces";
+
+    license = "LGPLv2";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.viric ];
+  };
+}
diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix
index 79ba4a3732c6..980ead100842 100644
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, zlib, bzip2, xz, m4}:
+{stdenv, fetchurl, m4, zlib, bzip2, xz, bison, flex, gettext}:
 
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
@@ -13,9 +13,54 @@ stdenv.mkDerivation rec {
     sha256 = "19mlgxyzcwiv64ynj2cibgkiw4qkm3n37kizvy6555dsmlaqfybq";
   };
 
-  buildInputs = [ zlib bzip2 xz ];
+  patches = [
+    (fetchurl {
+      url = https://fedorahosted.org/releases/e/l/elfutils/0.152/elfutils-portability.patch;
+      sha256 = "0q318w4cvvqv9ps4xcwphapj1gl31isgjyya4y9sm72qj68n61p0";
+    }) ];
 
-  buildNativeInputs = [m4];
+  # We need bzip2 in NativeInputs because otherwise we can't unpack the src,
+  # as the host-bzip2 will be in the path.
+  buildNativeInputs = [m4 bison flex gettext bzip2];
+  buildInputs = [zlib bzip2 xz];
+
+  crossAttrs = {
+
+    /* Having bzip2 will harm, because anything using elfutils 
+       as buildInput cross-building, will not be able to run 'bzip2' */
+    propagatedBuildInputs = [ zlib.hostDrv ];
+
+    # This program does not cross-build fine. So I only cross-build some parts
+    # I need for the linux perf tool.
+    # On the awful cross-building:
+    # http://comments.gmane.org/gmane.comp.sysutils.elfutils.devel/2005
+    #
+    # I wrote this testing for the nanonote.
+    buildPhase = ''
+      pushd libebl
+      make
+      popd
+      pushd libelf
+      make
+      popd
+      pushd libdwfl
+      make
+      popd
+      pushd libdw
+      make
+      popd
+    '';
+
+    installPhase = ''
+      pushd libelf
+      make install
+      popd
+      pushd libdw
+      make install
+      popd
+      cp version.h $out/include
+    '';
+  };
   
   dontAddDisableDepTrack = true;
 
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index 4b8583dcc952..e45a15150d78 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -1,4 +1,4 @@
-{ stdenv, kernel, elfutils }:
+{ stdenv, kernel, elfutils, python, perl, newt }:
 
 stdenv.mkDerivation {
   name = "perf-linux-${kernel.version}";
@@ -7,10 +7,21 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     cd tools/perf
-    export makeFlags="DESTDIR=$out"
+    sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile
+    export makeFlags="DESTDIR=$out $makeFlags"
   '';
 
-  buildInputs = [ elfutils ];
+  buildInputs = [ elfutils python perl newt ];
+
+  inherit elfutils;
+
+  crossAttrs = {
+    /* I don't want cross-python or cross-perl -
+       I don't know if cross-python even works */
+    propagatedBuildInputs = [ elfutils.hostDrv newt.hostDrv ];
+    makeFlags = "CROSS_COMPILE=${stdenv.cross.config}-";
+    elfutils = elfutils.hostDrv;
+  };
 
   meta = {
     homepage = https://perf.wiki.kernel.org/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 41d1ba587430..d0d13f84b886 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4318,6 +4318,8 @@ let
 
   nettle = callPackage ../development/libraries/nettle { };
 
+  newt = callPackage ../development/libraries/newt { };
+
   nspr = callPackage ../development/libraries/nspr { };
 
   nss = callPackage ../development/libraries/nss { };
-- 
cgit 1.4.1


From 5a4b9fc92b574195748fe48d0f05f9b7ed829447 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 6 Jan 2012 18:13:00 +0000
Subject: gtk-2.x: use atk-2.2.x

svn path=/nixpkgs/trunk/; revision=31357
---
 pkgs/development/libraries/atk/2.2.x.nix | 9 ++++-----
 pkgs/top-level/all-packages.nix          | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/atk/2.2.x.nix b/pkgs/development/libraries/atk/2.2.x.nix
index 45737aad3190..8f49532c025e 100644
--- a/pkgs/development/libraries/atk/2.2.x.nix
+++ b/pkgs/development/libraries/atk/2.2.x.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchurl_gnome, pkgconfig, perl, glib, xz }:
+{ stdenv, fetchurl, pkgconfig, perl, glib, xz }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "atk-2.2.0";
 
-  src = fetchurl_gnome {
-    project = "atk";
-    major = "2"; minor = "2"; patchlevel = "0"; extension = "xz";
+  src = fetchurl {
+    url = mirror://gnome/sources/atk/2.2/atk-2.2.0.tar.xz;
     sha256 = "17bkqg89l9hxbkgc76cxlin1bwczk7m6ikbccx677lrxh3kz08lb";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0d13f84b886..c56683a9f8d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3643,7 +3643,7 @@ let
 
     glibmm = callPackage ../development/libraries/glibmm/2.28.x.nix { };
 
-    atk = callPackage ../development/libraries/atk/1.32.x.nix { };
+    atk = callPackage ../development/libraries/atk/2.2.x.nix { };
 
     atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { };
 
-- 
cgit 1.4.1


From 69f2dfe7da4777ceaf0ed9968fe96c3b2f32fd40 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 6 Jan 2012 18:13:43 +0000
Subject: cogl-1.8.2

svn path=/nixpkgs/trunk/; revision=31362
---
 pkgs/development/libraries/cogl/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index e7ee38162106..6b517b918102 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -1,14 +1,13 @@
-{ stdenv, fetchurl_gnome, pkgconfig, mesa, glib, gdk_pixbuf
+{ stdenv, fetchurl, pkgconfig, mesa, glib, gdk_pixbuf
 , pangoSupport ? true, pango, cairo
 , libXfixes, libXcomposite, libXdamage, xz }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "cogl-1.8.2";
 
-  src = fetchurl_gnome {
-    project = "cogl";
-    major = "1"; minor = "8"; patchlevel = "0"; extension = "xz";
-    sha256 = "0b0arg0sjky5y4ypgh8dpznd9f1azhi1d5rhf4zbcw2mkl91qmdi";
+  src = fetchurl {
+    url = mirror://gnome/sources/cogl/1.8/cogl-1.8.2.tar.xz;
+    sha256 = "1ix87hz3qxqysqwx58wbc46lzchlmfs08fjzbf3l6mmsqj8gs9pc";
   };
 
   buildNativeInputs = [ xz pkgconfig ];
-- 
cgit 1.4.1


From 206d17c17fd98264e419da0ef819be4efbbdf0b2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 6 Jan 2012 19:01:56 +0000
Subject: Remove wxGTK-2.6

svn path=/nixpkgs/trunk/; revision=31369
---
 pkgs/development/libraries/wxGTK-2.6/default.nix | 44 ------------------------
 pkgs/top-level/all-packages.nix                  |  4 ---
 2 files changed, 48 deletions(-)
 delete mode 100644 pkgs/development/libraries/wxGTK-2.6/default.nix

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/wxGTK-2.6/default.nix b/pkgs/development/libraries/wxGTK-2.6/default.nix
deleted file mode 100644
index 710400ab0941..000000000000
--- a/pkgs/development/libraries/wxGTK-2.6/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
-, compat22 ? false, compat24 ? true, unicode ? true
-}:
-
-stdenv.mkDerivation {
-  name = "wxGTK-2.6.4";
-
-  src = fetchurl {
-    url = mirror://sourceforge/wxwindows/wxGTK-2.6.4.tar.gz;
-    sha256 = "1yilzg9qxvdpqhhd3sby1w9pj00k7jqw0ikmwyhh5jmaqnnnrb2x";
-  };
-
-  buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto ];
-
-  buildNativeInputs = [ pkgconfig ];
-
-  configureFlags = [
-    "--enable-gtk2"
-    (if compat22 then "--enable-compat22" else "--disable-compat22")
-    (if compat24 then "--enable-compat24" else "--disable-compat24")
-    "--disable-precomp-headers"
-    (if unicode then "--enable-unicode" else "")
-  ];
-
-  # This variable is used by configure to find some dependencies.
-  SEARCH_INCLUDE =
-    "${libXinerama}/include ${libSM}/include ${libXxf86vm}/include";
-
-  # Work around a bug in configure.
-  NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1";
-
-  preConfigure = "
-    substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
-    substituteInPlace configure --replace /usr /no-such-path
-  ";
-
-  postBuild = "(cd contrib/src && make)";
-  postInstall = "
-    (cd contrib/src && make install)
-    (cd $out/include && ln -s wx-*/* .)
-  ";
-
-  passthru = {inherit gtk compat22 compat24 unicode;};
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01a00b7d04d6..8b8709114611 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4691,10 +4691,6 @@ let
 
   wxGTK = wxGTK28;
 
-  wxGTK26 = callPackage ../development/libraries/wxGTK-2.6 {
-    inherit (gtkLibs216) gtk;
-  };
-
   wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 {
     inherit (gtkLibs) gtk;
   };
-- 
cgit 1.4.1


From cee470de5a00410b0c4d9da2f5222f5e1cf3ecb2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 6 Jan 2012 19:02:07 +0000
Subject: Remove gtk+-2.16

svn path=/nixpkgs/trunk/; revision=31370
---
 pkgs/development/libraries/atk/1.24.x.nix   | 31 -----------------------
 pkgs/development/libraries/glib/2.20.x.nix  | 33 ------------------------
 pkgs/development/libraries/gtk+/2.16.x.nix  | 39 -----------------------------
 pkgs/development/libraries/pango/1.24.x.nix | 29 ---------------------
 pkgs/top-level/all-packages.nix             | 14 -----------
 5 files changed, 146 deletions(-)
 delete mode 100644 pkgs/development/libraries/atk/1.24.x.nix
 delete mode 100644 pkgs/development/libraries/glib/2.20.x.nix
 delete mode 100644 pkgs/development/libraries/gtk+/2.16.x.nix
 delete mode 100644 pkgs/development/libraries/pango/1.24.x.nix

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/atk/1.24.x.nix b/pkgs/development/libraries/atk/1.24.x.nix
deleted file mode 100644
index 213c3ef72a45..000000000000
--- a/pkgs/development/libraries/atk/1.24.x.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, perl, glib }:
-
-stdenv.mkDerivation rec {
-  name = "atk-1.24.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/atk/1.24/${name}.tar.bz2";
-    sha256 = "0mjxliarzcy7iksh6v1npxsqdpc9sjj3q4wcl567asbdzdpbd803";
-  };
-
-  buildNativeInputs = [perl];
-  buildInputs = [pkgconfig];
-  propagatedBuildInputs = [glib];
-
-  meta = {
-    description = "ATK, the accessibility toolkit";
-
-    longDescription = ''
-      ATK is the Accessibility Toolkit.  It provides a set of generic
-      interfaces allowing accessibility technologies such as screen
-      readers to interact with a graphical user interface.  Using the
-      ATK interfaces, accessibility tools have full access to view and
-      control running applications.
-    '';
-
-    homepage = http://library.gnome.org/devel/atk/;
-
-    license = "LGPLv2+";
-  };
-
-}
diff --git a/pkgs/development/libraries/glib/2.20.x.nix b/pkgs/development/libraries/glib/2.20.x.nix
deleted file mode 100644
index c7a92a00b42c..000000000000
--- a/pkgs/development/libraries/glib/2.20.x.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gettext, perl }:
-
-stdenv.mkDerivation rec {
-  name = "glib-2.20.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/glib/2.20/${name}.tar.bz2";
-    sha256 = "0ndgshcqzpj3piwmag3vrsv3rg4pnr12y70knl7z0k2i03cy5bav";
-  };
-
-  buildNativeInputs = [perl];
-  buildInputs = [pkgconfig gettext];
-
-  # The nbd package depends on a static version of this library; hence
-  # the default configure flag --disable-static is switched off.
-  dontDisableStatic = true;
-  configureFlags = "--enable-static --enable-shared";
-
-  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+";
-  };
-}
diff --git a/pkgs/development/libraries/gtk+/2.16.x.nix b/pkgs/development/libraries/gtk+/2.16.x.nix
deleted file mode 100644
index 2c81ecc84e02..000000000000
--- a/pkgs/development/libraries/gtk+/2.16.x.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, perl, jasper, x11, glib, atk, pango
-, libtiff, libjpeg, libpng, cairo, xlibs
-, xineramaSupport ? true
-}:
-
-stdenv.mkDerivation rec {
-  name = "gtk+-2.16.2";
-  
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtk+/2.16/${name}.tar.bz2";
-    sha256 = "07gdsl3ialpwfcd0z3w108r60dn0agj12s21fpkpcx44lzknnbm3";
-  };
-  
-  buildNativeInputs = [ perl ];
-  buildInputs = [ pkgconfig jasper ];
-  
-  propagatedBuildInputs = [
-    x11 glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr
-  ] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama;
-    
-  meta = {
-    description = "A multi-platform toolkit for creating graphical user interfaces";
-
-    longDescription = ''
-      GTK+ is a highly usable, feature rich toolkit for creating
-      graphical user interfaces which boasts cross platform
-      compatibility and an easy to use API.  GTK+ it is written in C,
-      but has bindings to many other popular programming languages
-      such as C++, Python and C# among others.  GTK+ is licensed
-      under the GNU LGPL 2.1 allowing development of both free and
-      proprietary software with GTK+ without any license fees or
-      royalties.
-    '';
-
-    homepage = http://www.gtk.org/;
-
-    license = "LGPLv2+";
-  };
-}
diff --git a/pkgs/development/libraries/pango/1.24.x.nix b/pkgs/development/libraries/pango/1.24.x.nix
deleted file mode 100644
index b2e61e6cae4e..000000000000
--- a/pkgs/development/libraries/pango/1.24.x.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
-
-stdenv.mkDerivation rec {
-  name = "pango-1.24.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/pango/1.24/${name}.tar.bz2";
-    sha256 = "1cls9cbk6sx81101gh2pkiri8v14shqpvy37cydbh8scs4yk8370";
-  };
-
-  buildInputs = [pkgconfig] ++ (if stdenv.system == "i686-darwin" then [gettext] else []);
-
-  propagatedBuildInputs = [x11 glib cairo libpng];
-
-  meta = {
-    description = "A library for laying out and rendering of text, with an emphasis on internationalization";
-
-    longDescription = ''
-      Pango is a library for laying out and rendering of text, with an
-      emphasis on internationalization.  Pango can be used anywhere
-      that text layout is needed, though most of the work on Pango so
-      far has been done in the context of the GTK+ widget toolkit.
-      Pango forms the core of text and font handling for GTK+-2.x.
-    '';
-
-    homepage = http://www.pango.org/;
-    license = "LGPLv2+";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b8709114611..635094400d76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3623,20 +3623,6 @@ let
 
   });
 
-  gtkLibs216 = recurseIntoAttrs (let callPackage = newScope pkgs.gtkLibs216; in {
-
-    glib = callPackage ../development/libraries/glib/2.20.x.nix { };
-
-    atk = callPackage ../development/libraries/atk/1.24.x.nix { };
-
-    cairo = callPackage ../development/libraries/cairo { };
-
-    pango = callPackage ../development/libraries/pango/1.24.x.nix { };
-
-    gtk = callPackage ../development/libraries/gtk+/2.16.x.nix { };
-
-  });
-
   gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope pkgs.gtkLibs224; in {
 
     glib = callPackage ../development/libraries/glib/2.28.x.nix { };
-- 
cgit 1.4.1


From b2aac0e831159e2dd3d4d490b8295bf1e4a47f1f Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 6 Jan 2012 20:10:15 +0000
Subject: libgsf-1.14.22

svn path=/nixpkgs/trunk/; revision=31374
---
 pkgs/development/libraries/libgsf/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index a417f63cdd9f..3f6de4cfb1d7 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -1,18 +1,19 @@
 { fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2
-, glib, gettext, intltool, bzip2
+, glib, gettext, intltool, bzip2, xz
 , gnome_vfs, libbonobo, python }:
 
 
 stdenv.mkDerivation rec {
-  name = "libgsf-1.14.16";
+  name = "libgsf-1.14.22";
 
   src = fetchurl {
-    url = "http://ftp.gnome.org/pub/gnome/sources/libgsf/1.14/${name}.tar.bz2";
-    sha256 = "0249n2hgrcnzphinaxng0cpn7afchg84l4ka4wka9kyv3g58zz8i";
+    url = mirror://gnome/sources/libgsf/1.14/libgsf-1.14.22.tar.xz;
+    sha256 = "0gvq1gbbcl078s3kgdc508jp7p3a3ps34fj4pf8vsamprbikpwm5";
   };
 
+  buildNativeInputs = [ xz intltool pkgconfig ];
   buildInputs =
-    [ perl perlXMLParser pkgconfig gettext bzip2 gnome_vfs python intltool ];
+    [ perl perlXMLParser gettext bzip2 gnome_vfs python ];
 
   propagatedBuildInputs = [ glib libxml2 libbonobo ];
 
-- 
cgit 1.4.1


From 11f55d273ba35301ed25228ec4388a920a35fbd2 Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@vicerveza.homeunix.net>
Date: Fri, 6 Jan 2012 21:31:29 +0000
Subject: I found that instantiating xbursttools brought to the openssl
 evaluation throwing an exception about an undefined platform.openssl.system.

That was introduced by r31330, which made openssl for the build system to
evaluate the platform.openssl.system, that should only be needed for the host
system.

I also revert supplying openssl.system for xbursttools.


svn path=/nixpkgs/trunk/; revision=31379
---
 pkgs/development/libraries/openssl/default.nix | 27 +++++++++++++++-----------
 pkgs/top-level/all-packages.nix                |  1 -
 2 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 4b34c3500ec8..633e43ac6a68 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -6,17 +6,8 @@ let
   opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ]
     (throw "openssl needs its platform name cross building" null)
     stdenv.cross;
-in
-
-stdenv.mkDerivation {
-  inherit name;
-
-  src = fetchurl {
-    url = "http://www.openssl.org/source/${name}.tar.gz";
-    sha256 = "1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3";
-  };
 
-  patches =
+  patchesCross = isCross:
     [ # Allow the location of the X509 certificate file (the CA
       # bundle) to be set through the environment variable
       # ‘OPENSSL_X509_CERT_FILE’.  This is necessary because the
@@ -27,12 +18,24 @@ stdenv.mkDerivation {
       ./cert-file.patch
     ]
 
-    ++ (stdenv.lib.optionals (stdenv ? cross && opensslCrossSystem == "hurd-x86")
+    ++ (stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86")
          [ ./cert-file-path-max.patch # merge with `cert-file.patch' eventually
            ./gnu.patch                # submitted upstream
          ])
 
     ++ (stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch);
+  
+in
+
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "http://www.openssl.org/source/${name}.tar.gz";
+    sha256 = "1xw0ffzmr4wbnb0glywgks375dvq8x87pgxmwx6vhgvkflkxqqg3";
+  };
+
+  patches = patchesCross false;
 
   buildNativeInputs = [ perl ];
 
@@ -55,6 +58,8 @@ stdenv.mkDerivation {
     ''; # */
 
   crossAttrs = {
+    patches = patchesCross true;
+
     preConfigure=''
       # It's configure does not like --build or --host
       export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa1bea3da0e4..2ea39af70662 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1586,7 +1586,6 @@ let
             gcc = {
               arch = "mips32";
             };
-            openssl.system = "linux-generic32";
           };
         };
       in
-- 
cgit 1.4.1


From 8ba7a53129ff16671c1abc90c6852dfb9ebda418 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 6 Jan 2012 23:03:37 +0000
Subject: gtk-2.x libs patchlevel upgrades

svn path=/nixpkgs/trunk/; revision=31383
---
 pkgs/development/libraries/atkmm/2.22.x.nix      | 11 +++++------
 pkgs/development/libraries/gdk-pixbuf/2.24.x.nix | 15 +++++++--------
 pkgs/development/libraries/gtk+/2.24.x.nix       | 15 +++++++--------
 pkgs/development/libraries/pangomm/2.28.x.nix    | 11 +++++------
 4 files changed, 24 insertions(+), 28 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/atkmm/2.22.x.nix b/pkgs/development/libraries/atkmm/2.22.x.nix
index 348edb226326..66237c4c7b99 100644
--- a/pkgs/development/libraries/atkmm/2.22.x.nix
+++ b/pkgs/development/libraries/atkmm/2.22.x.nix
@@ -1,12 +1,11 @@
-{ stdenv, fetchurl_gnome, atk, glibmm, pkgconfig }:
+{ stdenv, fetchurl, atk, glibmm, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "atkmm-2.22.6";
 
-  src = fetchurl_gnome {
-    project = "atkmm";
-    major = "2"; minor = "22"; patchlevel = "5";
-    sha256 = "0v5ynws5pc4qdgrr8hrl8wajl3xxh3kgljchj7cqyb4mcxg3xq31";
+  src = fetchurl {
+    url = mirror://gnome/sources/atkmm/2.22/atkmm-2.22.6.tar.xz;
+    sha256 = "1dmf72i7jv2a2gavjiah2722bf5qk3hb97hn5dasxqxr0r8jjx0a";
   };
 
   propagatedBuildInputs = [ atk glibmm ];
diff --git a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
index d6483ba36dec..596e645c686c 100644
--- a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchurl_gnome, pkgconfig, glib, libtiff, libjpeg, libpng, xlibs
-, xz, jasper }:
+{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, xlibs, xz
+, jasper }:
 
-stdenv.mkDerivation rec {
-  name = src.pkgname;
+stdenv.mkDerivation {
+  name = "gdk-pixbuf-2.24.1";
 
-  src = fetchurl_gnome {
-    project = "gdk-pixbuf";
-    major = "2"; minor = "24"; patchlevel = "0"; extension = "xz";
-    sha256 = "19r89nxqlpmd0ykmklz2z99dvad9svr5ndiclk7c2h84lhx1vhb7";
+  src = fetchurl {
+    url = mirror://gnome/sources/gdk-pixbuf/2.24/gdk-pixbuf-2.24.1.tar.xz;
+    sha256 = "1qdywh1r75lalb7z6s9pm6pmqx82chrrxqb8cdqi629nvc03yyns";
   };
 
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix
index b52031d4ac69..e3908b2ba371 100644
--- a/pkgs/development/libraries/gtk+/2.24.x.nix
+++ b/pkgs/development/libraries/gtk+/2.24.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl_gnome, pkgconfig, glib, atk, pango, cairo, perl, xlibs
+{ stdenv, fetchurl, pkgconfig, glib, atk, pango, cairo, perl, xlibs
 , gdk_pixbuf, xz
 , xineramaSupport ? true
 , cupsSupport ? true, cups ? null
@@ -7,13 +7,12 @@
 assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
-stdenv.mkDerivation rec {
-  name = src.pkgname;
-  
-  src = fetchurl_gnome {
-    project = "gtk+";
-    major = "2"; minor = "24"; patchlevel = "6"; extension = "xz";
-    sha256 = "1jpgxycxgz1g5yd7spxyc2i8zvn8swm275dkd4d0ryn1bma6n0la";
+stdenv.mkDerivation {
+  name = "gtk+-2.24.8";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gtk+/2.24/gtk+-2.24.8.tar.xz;
+    sha256 = "0g5rj25qrgkwrnvpb76a8c2cinryf9kb1drdx8pgag4kczv2jfwa";
   };
 
   patches =
diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix
index 59b6eca64d37..5cd4744fed38 100644
--- a/pkgs/development/libraries/pangomm/2.28.x.nix
+++ b/pkgs/development/libraries/pangomm/2.28.x.nix
@@ -1,12 +1,11 @@
-{ stdenv, fetchurl_gnome, pkgconfig, pango, glibmm, cairomm, libpng }:
+{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "pangomm-2.28.4";
 
-  src = fetchurl_gnome {
-    project = "pangomm";
-    major = "2"; minor = "28"; patchlevel = "2";
-    sha256 = "13yq5zwxzliiss4ladaa7di2b3s965p3zbz7s0ccz9ddbqj9f7gc";
+  src = fetchurl {
+    url = mirror://gnome/sources/pangomm/2.28/pangomm-2.28.4.tar.xz;
+    sha256 = "10kcdpg080m393f1vz0km41kd3483fkyabprm59gvjwklxkcp3bp";
   };
 
   buildNativeInputs = [ pkgconfig ];
-- 
cgit 1.4.1