all-packages.nix changes for all those updates

svn path=/nixpkgs/trunk/; revision=12119

1 files changed, 21 insertions, 12 deletions

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90a45aa7c41b..04ec6b9d1dad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -593,8 +593,9 @@ let pkgs = rec {
       inherit fetchurl stdenv;
     });
 
-  gdmapFun = lib.sumArgs (selectVersion ../tools/system/gdmap "0.7.5") {
-    inherit stdenv fetchurl builderDefs pkgconfig libxml2 intltool;
+  gdmapFun = lib.sumArgs (selectVersion ../tools/system/gdmap "0.8.1") {
+    inherit stdenv fetchurl builderDefs pkgconfig libxml2 intltool
+      gettext;
     inherit (gtkLibs) gtk;
   };
 
@@ -1932,11 +1933,16 @@ let pkgs = rec {
   };
 
   autoconf = autoconf261;
+  autoconfLatest = autoconf262;
 
   autoconf261 = import ../development/tools/misc/autoconf {
     inherit fetchurl stdenv perl m4;
   };
 
+  autoconf262 = import ../development/tools/misc/autoconf/2.62.nix {
+    inherit fetchurl stdenv perl m4 lzma;
+  };
+
   automake = automake19x;
 
   automake17x = import ../development/tools/misc/automake/automake-1.7.x.nix {
@@ -5501,6 +5507,18 @@ let pkgs = rec {
     inherit fetchurl stdenv ncurses;
   };
 
+  carrier = builderDefsPackage (selectVersion ../applications/networking/instant-messengers/carrier "2.4.2") {
+    inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
+      gtkspell aspell gettext ncurses avahi dbus dbus_glib python
+      libtool automake;
+    GStreamer = gst_all.gstreamer;
+    inherit (gtkLibs) gtk glib;
+    inherit (gnome) startupnotification GConf ;
+    inherit (xlibs) libXScrnSaver scrnsaverproto libX11 xproto kbproto;
+    autoconf = autoconfLatest;
+  } null;
+  funpidgin = carrier;
+
   cddiscid = import ../applications/audio/cd-discid {
     inherit fetchurl stdenv;
   };
@@ -5804,15 +5822,6 @@ let pkgs = rec {
     gtksharp = gtksharp1;
   };
 
-  funpidgin = builderDefsPackage (selectVersion ../applications/networking/instant-messengers/funpidgin "2.4.1") {
-    inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
-      gtkspell aspell gettext ncurses;
-    GStreamer = gst_all.gstreamer;
-    inherit (gtkLibs) gtk;
-    inherit (gnome) startupnotification;
-    inherit (xlibs) libXScrnSaver scrnsaverproto libX11 xproto kbproto;
-  } null;
-
   gimp = import ../applications/graphics/gimp {
     inherit fetchurl stdenv pkgconfig freetype fontconfig
       libtiff libjpeg libpng libexif zlib perl perlXMLParser
@@ -6580,7 +6589,7 @@ let pkgs = rec {
     pyrex = pyrex095;
   };
 
-  xscreensaverFun = lib.sumArgs (selectVersion ../applications/graphics/xscreensaver "5.04") {
+  xscreensaverFun = lib.sumArgs (selectVersion ../applications/graphics/xscreensaver "5.05") {
     inherit stdenv fetchurl builderDefs lib pkgconfig bc perl intltool;
     inherit (xlibs) libX11 libXmu;
   };