Merging from trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=23072

pkgs/applications/misc/mupdf/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg
+, libX11, libXext }:
+stdenv.mkDerivation rec {
+  name = "mupdf-0.6";
+
+  src = fetchurl {
+    url = "http://mupdf.com/download/source/${name}.tar.gz";
+    sha256 = "01cn2kz4zx53qhqvbxy8xd7xqbh58kpid8ykvx5hz7pf2gqw91vg";
+  };
+
+  buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ];
+
+  preBuild = ''
+    export makeFlags="prefix=$out"
+  '';
+
+  meta = {
+    homepage = http://mupdf.com/;
+    description = "Lightweight PDF viewer and toolkit written in portable C";
+    license = "GPLv3+";
+    maintainers = with stdenv.lib.maintainers; [ viric ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pidgin} :
+
+stdenv.mkDerivation {
+  name = "pidgin-msn-pecan-0.1.0";
+  src = fetchurl {
+    url = http://msn-pecan.googlecode.com/files/msn-pecan-0.1.0.tar.bz2;
+    sha256 = "06cgkdlv2brv2g5hpx8g8p6j296cnvd29l8fap30i1k0mznbjxf4";
+  };
+
+  meta = {
+    description = "Alternative MSN protocol plug-in for Pidgin IM.";
+    homepage = http://code.google.com/p/msn-pecan/;
+  };
+
+  makeFlags = "PURPLE_LIBDIR=lib PURPLE_DATADIR=share/data DESTDIR=$$out";
+  preInstall = "ensureDir \$out/share";
+  postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-msn-pecan";
+
+  buildInputs = [pidgin];
+}

pkgs/applications/version-management/git-and-tools/git/default.nix

@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
        '')
 
    + ''# Install man pages and Info manual
-       make PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \
+       make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \
          -C Documentation ''
 
    + (if guiSupport then ''

pkgs/applications/version-management/veracity/default.nix

@@ -0,0 +1,49 @@
+x@{builderDefsPackage
+  , cmake, curl, patch, zlib, icu, sqlite, libuuid
+  , readline, openssl, spidermonkey_1_8_0rc1
+  , ...}:
+builderDefsPackage
+(a :  
+let 
+  s = import ./src-for-default.nix;
+  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
+    [];
+  buildInputs = map (n: builtins.getAttr n x)
+    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+    
+in
+rec {
+  src = a.fetchUrlFromSrcInfo s;
+
+  inherit (s) name;
+  inherit buildInputs;
+
+  phaseNames = ["prepareMakefiles" "doMake" "doDeploy"];
+
+  prepareMakefiles = a.fullDepEntry ''
+    find src -type f -exec sed -e 's@#include \([<"]\)sgbrings/js/js@#include \1js/js@g' -i '{}' ';'
+    cd ..
+    mkdir build
+    cd build
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lssl"
+    cmake -G "Unix Makefiles" -D SGBRINGS_JS_INCDIR="${spidermonkey_1_8_0rc1}/include" -D SGBRINGS_JS_LIB="${spidermonkey_1_8_0rc1}/lib/libjs.a" ../veracity*
+  '' ["minInit" "addInputs" "doUnpack"];
+
+  doDeploy = a.fullDepEntry ''
+    ensureDir "$out/bin" "$out/share/veracity/"
+    cp -r .. "$out/share/veracity/build-dir"
+    ln -s "$out/share/veracity/build-dir/build/src/cmd/vv" "$out/bin"
+    ln -s "$out/share/veracity/build-dir/build/src/script/vscript" "$out/bin"
+  '' ["doMake" "minInit" "defEnsureDir"];
+
+  meta = {
+    description = "A distributed version control system with template-based merging";
+    maintainers = with a.lib.maintainers;
+    [
+      raskin
+    ];
+    platforms = with a.lib.platforms;
+      linux ;
+  };
+}) x
+

pkgs/applications/version-management/veracity/src-for-default.nix

@@ -0,0 +1,8 @@
+rec {
+   version="0.3.0.10246";
+   name="veracity-0.3.0.10246";
+   hash="03wn6dzbjv5p50xmiznynza5c1nk38v95mzv6rk6km1ykqprnlw0";
+   url="http://download-us.sourcegear.com/Veracity/0.3.0.10246/veracity-source-${version}.tar.gz";
+   advertisedUrl="http://download-us.sourcegear.com/Veracity/0.3.0.10246/veracity-source-0.3.0.10246.tar.gz";
+  
+}

pkgs/applications/version-management/veracity/src-info-for-default.nix

@@ -0,0 +1,4 @@
+{
+  downloadPage = "http://sourcegear.com/veracity/downloads.html";
+  baseName = "veracity";
+}

pkgs/build-support/buildenv/builder.pl

@@ -17,7 +17,10 @@ sub isInPathsToLink {
     my $path = shift;
     $path = "/" if $path eq "";
     foreach my $elem (@pathsToLink) {
-        return 1 if substr($path, 0, length($elem)) eq $elem;
+        return 1 if
+            $elem eq "/" || 
+            (substr($path, 0, length($elem)) eq $elem
+             && (($path eq $elem) || (substr($path, length($elem), 1) eq "/")));
     }
     return 0;
 }

pkgs/data/misc/hicolor-icon-theme/default.nix

@@ -0,0 +1,15 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "hicolor-icon-theme-0.12";
+
+  src = fetchurl {
+    url = "http://icon-theme.freedesktop.org/releases/${name}.tar.gz";
+    sha256 = "0wzc7g4ldb2l8zc0x2785ck808c03i857jji942ikakyc68adp4y";
+  };
+
+  meta = {
+    description = "Default fallback theme used by implementations of the icon theme specification";
+    homepage = http://icon-theme.freedesktop.org/releases/;
+  };
+}

pkgs/desktops/gnome-2.28/desktop/vte/cursor.patch

@@ -0,0 +1,33 @@
+Fix invisible cursor in xfce's terminal.
+
+http://bugzilla.xfce.org/show_bug.cgi?id=6423
+http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/vte/current/SOURCES/vte-0.25.1-cursor.patch?view=markup&pathrev=565638
+
+diff -p -up vte-0.25.1/src/vte.c.cursor vte-0.25.1/src/vte.c
+--- vte-0.25.1/src/vte.c.cursor	2010-05-03 05:28:46.000000000 -0300
++++ vte-0.25.1/src/vte.c	2010-08-03 14:06:29.000000000 -0300
+@@ -8752,6 +8752,10 @@ vte_terminal_determine_colors(VteTermina
+ 	if (highlight && !cursor && terminal->pvt->highlight_color_set) {
+ 		*fore = cell ? cell->attr.fore : VTE_DEF_FG;
+ 		*back = VTE_DEF_HL;
++	} else
++	if (reverse ^ ((cell != NULL) && (cell->attr.reverse))) {
++		*fore = cell ? cell->attr.back : VTE_DEF_BG;
++		*back = cell ? cell->attr.fore : VTE_DEF_FG;
+ 	} else {
+ 		*fore = cell ? cell->attr.fore : VTE_DEF_FG;
+ 		*back = cell ? cell->attr.back : VTE_DEF_BG;
+@@ -8782,13 +8786,6 @@ vte_terminal_determine_colors(VteTermina
+ 		}
+ 	}
+ 
+-	if (reverse ^ ((cell != NULL) && (cell->attr.reverse))) {
+-	  int tmp;
+-	  tmp = *fore;
+-	  *fore = *back;
+-	  *back = tmp;
+-	}
+-
+ 	if (!cursor && cell && cell->attr.invisible) {
+ 		*fore = *back;
+ 	}

pkgs/desktops/gnome-2.28/desktop/vte/default.nix

@@ -1,16 +1,23 @@
-{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk, ncurses,
-  pythonSupport ? false, python}:
+{ stdenv, fetchurl, intltool, pkgconfig, glib, gtk, ncurses
+, pythonSupport ? false, python}:
+
 stdenv.mkDerivation rec {
   name = "vte-0.25.1";
+  
   src = fetchurl {
     url = "http://ftp.gnome.org/pub/gnome/sources/vte/0.25/${name}.tar.bz2";
     sha256 = "105f5ifyg09nh5p6fw2w7c0n9wd8vw9cvwlh6zg49ibsar893qi5";
   };
+
+  patches = [ ./cursor.patch ];
+  
   buildInputs = [ intltool pkgconfig glib gtk ncurses ] ++
                 stdenv.lib.optional pythonSupport python;
+                
   configureFlags = ''
     ${if pythonSupport then "--enable-python" else "--disable-python"}
   '';
+  
   meta = {
     homepage = http://www.gnome.org/;
     description = "A library implementing a terminal emulator widget for GTK+";

pkgs/desktops/xfce-4/applications/mousepad.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, libxfcegui4, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "mousepad-0.2.16";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/src/apps/mousepad/0.2/${name}.tar.bz2";
+    sha1 = "4e63033e0a71578f3ec9a0d2e6a505efd0424ef9";
+  };
+
+  buildInputs = [ pkgconfig intltool libxfce4util libxfcegui4 gtk ];
+
+  meta = {
+    homepage = http://www.xfce.org/projects/mousepad/;
+    description = "A simple text editor for Xfce";
+    license = "GPLv2+";
+  };
+}

pkgs/desktops/xfce-4/applications/ristretto.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libexif, gtk, thunar
+, exo, dbus_glib, libxfce4util, libxfcegui4, xfconf }:
+
+stdenv.mkDerivation rec {
+  name = "ristretto-0.0.22";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/src/apps/ristretto/0.0/${name}.tar.gz";
+    sha1 = "bddbc8618ba67699ccf5ee4ea0b538b1be7fdb0a";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool libexif gtk thunar exo dbus_glib
+      libxfce4util libxfcegui4 xfconf
+    ];
+
+  NIX_LDFLAGS = "-lX11";
+
+  meta = {
+    homepage = http://goodies.xfce.org/projects/applications/ristretto;
+    description = "A fast and lightweight picture-viewer for the Xfce desktop environment";
+    license = "GPLv2+";
+  };
+}

pkgs/desktops/xfce-4/applications/terminal.nix

@@ -1,20 +1,19 @@
 { stdenv, fetchurl
 , pkgconfig, ncurses
 , intltool, vte
-, libexo, libxfce4util
+, exo, libxfce4util
 , gtk
 }:
 
 stdenv.mkDerivation {
   name = "xfce-terminal-0.4.5";
+  
   src = fetchurl {
     url = http://archive.xfce.org/src/apps/terminal/0.4/Terminal-0.4.5.tar.bz2;
     sha256 = "14w8mhmyrq6dd9574zfvq0pymknljckq6qgcv1r6c1r22jydrzcj";
   };
 
-  buildInputs = [ pkgconfig intltool libexo gtk vte libxfce4util ncurses ];
-
-  CPPFLAGS = "-I${libexo}/include/exo-0.3 -I{libxfce4util}/include/xfce4";
+  buildInputs = [ pkgconfig intltool exo gtk vte libxfce4util ncurses ];
 
   meta = {
     homepage = http://www.xfce.org/projects/terminal;

pkgs/desktops/xfce-4/art/xfce4-icon-theme.nix

@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "xfce4-icon-theme-4.4.3";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/src/art/xfce4-icon-theme/4.4/${name}.tar.bz2";
+    sha1 = "0c0d0c45cd4a7f609310db8e9d17c1c4a131a6e7";
+  };
+
+  buildInputs = [ pkgconfig intltool gtk ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Icons for Xfce";
+  };
+}

pkgs/desktops/xfce-4/core/exo.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4util
+, enableHAL ? true, hal, dbus_glib }:
+
+stdenv.mkDerivation rec {
+  name = "exo-0.3.107";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha256 = "18z2xmdl577r60ln2waai10dd7i384k0bxrmf7gchrxd9c9aq4ha";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool URI glib gtk libxfce4util ] ++
+    stdenv.lib.optionals enableHAL [ hal dbus_glib ];
+
+  meta = {
+    homepage = http://www.xfce.org/projects/exo;
+    description = "Application library for the Xfce desktop environment";
+    license = "GPLv2+";
+  };
+}

pkgs/desktops/xfce-4/core/gtk-xfce-engine.nix

@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "gtk-xfce-engine-2.6.0";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "a7be2f330833d150c5fb37f68a4c2138348b5446";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool gtk ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "GTK+ theme engine for Xfce";
+    license = "GPLv2+";
+  };
+}

pkgs/desktops/xfce-4/core/libexo/default.nix

@@ -1,23 +0,0 @@
-{ stdenv, fetchurl
-, pkgconfig
-, intltool
-, URI
-, glib, gtk
-, libxfce4util
-}:
-
-stdenv.mkDerivation {
-  name = "libexo-0.3.106";
-  src = fetchurl {
-    url = http://archive.xfce.org/src/xfce/exo/0.3/exo-0.3.106.tar.bz2;
-    sha256 = "1n823ipqdz47kxq6fwry3zza3j9ap7gikwm4s8169297xcjqd6qb";
-  };
-
-  buildInputs = [ pkgconfig intltool URI glib gtk libxfce4util ];
-
-  meta = {
-    homepage = http://www.xfce.org/projects/exo;
-    description = "Application library for the Xfce desktop environment";
-    license = "GPLv2+";
-  };
-}

pkgs/desktops/xfce-4/core/libxfce4menu.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, glib, intltool, gtk, libxfce4util }:
+
+stdenv.mkDerivation rec {
+  name = "libxfce4menu-4.6.2";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce-4.6.2/src/${name}.tar.bz2";
+    sha1 = "32a85c1ad31360347d5a2f240c4ddc08b444d124";
+  };
+
+  buildInputs = [ pkgconfig glib intltool gtk libxfce4util ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Xfce menu support library";
+    license = "LGPLv2+";
+  };
+}

pkgs/desktops/xfce-4/core/libxfce4util.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, glib, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "libxfce4util-4.6.2";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce-4.6.2/src/${name}.tar.bz2";
+    sha256 = "10wcw7r8cjb0farffic037pcjr5bwrjrm8s3jrcb7c0b038pwbmf";
+  };
+
+  buildInputs = [ pkgconfig glib intltool ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Basic utility non-GUI functions for Xfce";
+    license = "bsd";
+  };
+}

pkgs/desktops/xfce-4/core/libxfce4util/default.nix

@@ -1,20 +0,0 @@
-{ stdenv, fetchurl
-, pkgconfig
-, glib
-}:
-
-stdenv.mkDerivation {
-  name = "libxfce4util-4.6.1";
-  src = fetchurl {
-    url = http://www.xfce.org/archive/xfce-4.6.1/src/libxfce4util-4.6.1.tar.bz2;
-    sha256 = "0sy1222s0cq8zy2ankrp1747b6fg5jjahxrddih4gxc97iyxrv6f";
-  };
-
-  buildInputs = [ pkgconfig glib ];
-
-  meta = {
-    homepage = http://www.xfce.org/;
-    description = "Basic utility non-GUI functions for Xfce";
-    license = "GPLv2";
-  };
-}

pkgs/desktops/xfce-4/core/libxfcegui4.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf
+, libglade, libstartup_notification }:
+
+stdenv.mkDerivation rec {
+  name = "libxfcegui4-4.6.4";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce-4.6.2/src/${name}.tar.bz2";
+    sha1 = "a12c79f8fa14c5d1fc0fca5615a451b7d23f8695";
+  };
+
+  # By default, libxfcegui4 tries to install into libglade's prefix.
+  # Install into our own prefix instead.
+  preConfigure =
+    ''
+      configureFlags="--with-libglade-module-path=$out/lib/libglade/2.0"
+    '';
+
+  buildInputs =
+    [ pkgconfig intltool gtk libxfce4util xfconf libglade
+      libstartup_notification
+    ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Basic GUI library for Xfce";
+    license = "LGPLv2+";
+  };
+}

pkgs/desktops/xfce-4/core/thunar.nix

@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util
+, dbus_glib, libstartup_notification, xfconf, hal, xfce4panel
+, gamin }:
+
+stdenv.mkDerivation rec {
+  name = "thunar-1.0.2";
+  
+  src = fetchurl {
+    url = http://www.xfce.org/archive/xfce/4.6.2/src/Thunar-1.0.2.tar.bz2;
+    sha1 = "f7ae00c32402e4bc502aba15477b78e2c558c7c3";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool exo gtk libxfce4util
+      dbus_glib libstartup_notification xfconf xfce4panel gamin
+    ];
+
+  propagatedBuildInputs = [ hal ];
+
+  meta = {
+    homepage = http://thunar.xfce.org/;
+    description = "Xfce file manager";
+    license = "GPLv2+";
+  };
+}

pkgs/desktops/xfce-4/core/xfce-utils.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4 }:
+
+stdenv.mkDerivation rec {
+  name = "xfce-utils-4.6.2";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "6373886c3d70e576859741bde747a235567ffd8e";
+  };
+
+  configureFlags = "--with-xsession-prefix=$(out)/share/xsessions";
+
+  buildInputs = [ pkgconfig intltool gtk libxfce4util libxfcegui4 ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Utilities and scripts for Xfce";
+    license = "GPLv2+";
+  };
+}

pkgs/desktops/xfce-4/core/xfce4-panel.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4
+, libwnck, exo, libstartup_notification }:
+
+stdenv.mkDerivation rec {
+  name = "xfce4-panel-4.6.4";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "d2b310c036be84ed9886c06ae35b7a1a8eabfcb8";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool gtk libxfce4util exo libwnck
+      libstartup_notification
+    ];
+
+  propagatedBuildInputs = [ libxfcegui4 ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Xfce panel";
+    license = "GPLv2+";
+  };
+}

pkgs/desktops/xfce-4/core/xfce4-session.nix

@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4
+, libwnck, dbus_glib, xfconf, libglade, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "xfce4-session-4.6.2";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "2a5778a1543f97845f118a186e2dbb8a8ea3ff4b";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool gtk libxfce4util libxfcegui4 libwnck dbus_glib
+      xfconf libglade xorg.iceauth
+    ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Session manager for Xfce";
+    license = "GPLv2+";
+  };
+}

pkgs/desktops/xfce-4/core/xfce4-settings.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfcegui4
+, libglade, xfconf, xorg, libwnck, libnotify }:
+
+stdenv.mkDerivation rec {
+  name = "xfce4-settings-4.6.5";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "c036cc2f3100a46b2649e678dff7c0106b219263";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool exo gtk libxfce4util libxfcegui4 libglade
+      xfconf xorg.libXi xorg.libXcursor libwnck libnotify
+    #gtk libxfce4util libxfcegui4 libwnck dbus_glib
+      #xfconf libglade xorg.iceauth
+    ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Settings manager for Xfce";
+    license = "GPLv2+";
+  };
+}

pkgs/desktops/xfce-4/core/xfconf.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }:
+
+stdenv.mkDerivation rec {
+  name = "xfconf-4.6.2";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "2b9656a1b7f323d2600ddc929191afb50c8018f8";
+  };
+
+  buildInputs = [ pkgconfig intltool glib libxfce4util ];
+
+  propagatedBuildInputs = [ dbus_glib ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Simple client-server configuration storage and query system for Xfce";
+    license = "GPLv2";
+  };
+}

pkgs/desktops/xfce-4/core/xfdesktop.nix

@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfcegui4
+, libwnck, xfconf, libglade, libxfce4menu, xfce4panel, thunar, exo }:
+
+stdenv.mkDerivation rec {
+  name = "xfdesktop-4.6.2";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha1 = "cefcd1c1386d34386d4e900cbf88b7c24ef3bafb";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool gtk libxfce4util libxfcegui4 libwnck xfconf
+      libglade libxfce4menu xfce4panel thunar exo
+    ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Xfce desktop manager";
+    license = "GPLv2+";
+  };
+}

pkgs/desktops/xfce-4/core/xfwm4.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, gtk, intltool, libglade, libxfce4util
+, libxfcegui4, xfconf, libwnck, libstartup_notification, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "xfwm4-4.6.2";
+  
+  src = fetchurl {
+    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    sha256 = "0a2q2pr5mzp6hsrd0llr90i9wii2qj2054shkpvkain20gp1ja11";
+  };
+
+  buildInputs =
+    [ pkgconfig intltool gtk libglade libxfce4util libxfcegui4 xfconf
+      libwnck libstartup_notification
+      xorg.libXcomposite xorg.libXfixes xorg.libXdamage
+    ];
+
+  meta = {
+    homepage = http://www.xfce.org/;
+    description = "Window manager for Xfce";
+    license = "GPLv2+";
+  };
+}

pkgs/desktops/xfce-4/default.nix

@@ -1,28 +1,62 @@
-pkgs:
+{ callPackage, pkgs }:
+
 rec {
-  inherit (pkgs.gtkLibs) gtk;
+  inherit (pkgs.gtkLibs) gtk glib;
 
   #### CORE
 
-  libexo = import ./core/libexo {
-    inherit (pkgs) stdenv fetchurl pkgconfig;
-    inherit (pkgs.gnome) intltool;
+  exo = callPackage ./core/exo.nix {
     inherit (pkgs.perlPackages) URI;
-    inherit (pkgs.gtkLibs) glib gtk;
-    inherit libxfce4util;
   };
 
-  libxfce4util = import ./core/libxfce4util {
-    inherit (pkgs) stdenv fetchurl pkgconfig;
-    inherit (pkgs.gtkLibs) glib;
+  libxfce4util = callPackage ./core/libxfce4util.nix { };
+
+  libxfcegui4 = callPackage ./core/libxfcegui4.nix {
+    inherit (pkgs.gnome) libglade;
   };
 
+  libxfce4menu = callPackage ./core/libxfce4menu.nix { };
+
+  xfconf = callPackage ./core/xfconf.nix { };
+
+  xfwm4 = callPackage ./core/xfwm4.nix {
+    inherit (pkgs.gnome) libglade libwnck;
+  };
+
+  xfceutils = callPackage ./core/xfce-utils.nix { };
+
+  xfce4session = callPackage ./core/xfce4-session.nix {
+    inherit (pkgs.gnome) libglade libwnck;
+  };
+
+  xfce4settings = callPackage ./core/xfce4-settings.nix {
+    inherit (pkgs.gnome) libglade libwnck;
+  };
+
+  xfce4panel = callPackage ./core/xfce4-panel.nix {
+    inherit (pkgs.gnome) libwnck;
+  };
+
+  xfdesktop = callPackage ./core/xfdesktop.nix {
+    inherit (pkgs.gnome) libwnck libglade;
+  };
+
+  thunar = callPackage ./core/thunar.nix { };
+
+  gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { };
+
   #### APPLICATIONS
-  terminal = import ./applications/terminal {
-    inherit (pkgs) stdenv fetchurl pkgconfig ncurses;
-    inherit (pkgs.gnome) intltool vte;
-    inherit (pkgs.gtkLibs) gtk;
-    inherit libexo libxfce4util;
+  
+  terminal = callPackage ./applications/terminal.nix {
+    inherit (pkgs.gnome) vte;
   };
 
+  mousepad = callPackage ./applications/mousepad.nix { };
+
+  ristretto = callPackage ./applications/ristretto.nix { };
+
+  #### ART
+
+  xfce4icontheme = callPackage ./art/xfce4-icon-theme.nix { };
+  
 }

pkgs/development/interpreters/lua-5/default.nix

@@ -9,5 +9,10 @@ stdenv.mkDerivation {
   makeFlags = [ "CFLAGS=-fPIC" ];
   buildFlags = "linux"; # TODO: support for non-linux systems
   installFlags = "install INSTALL_TOP=\${out}";
+  postInstall = ''
+    sed -i -e "s@/usr/local@$out@" etc/lua.pc
+    sed -i -e "s@-llua -lm@-llua -lm -ldl@" etc/lua.pc
+    install -D -m 644 etc/lua.pc $out/lib/pkgconfig/lua.pc
+  '';
   buildInputs = [ ncurses readline ];
 }

pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, readline }:
+
+stdenv.mkDerivation rec {
+  version = "1.8.0-rc1";
+  name = "spidermonkey-${version}";
+  
+  src = fetchurl {
+    url = "http://ftp.mozilla.org/pub/mozilla.org/js/js-${version}.tar.gz";
+    sha256 = "374398699ac3fd802d98d642486cf6b0edc082a119c9c9c499945a0bc73e3413";
+  };
+
+  buildInputs = [ readline ];
+
+  postUnpack = "sourceRoot=\${sourceRoot}/src";
+
+  makefileExtra = ./Makefile.extra;
+  makefile = "Makefile.ref";
+  
+  patchPhase =
+    ''
+      cat ${makefileExtra} >> ${makefile}
+      sed -e 's/ -ltermcap/ -lncurses/' -i ${makefile}
+    '';
+
+  makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1";
+}

pkgs/development/interpreters/spidermonkey/Makefile.extra

@@ -4,4 +4,7 @@ install: $(PROGRAM) $(SHARED_LIBRARY)
 	cp -v $(PROGRAM) $(DIST)/bin
 	cp -v $(SHARED_LIBRARY) $(LIBRARY) $(DIST)/lib
 	cp -v $(JS_HFILES) $(API_HFILES) $(OTHER_HFILES) $(DIST)/include
+	mkdir -pv $(DIST)/include/js
+	find . -name '*.h' -exec cp '{}' $(DIST)/include/js ';'
+	find . -name '*.msg' -exec cp '{}' $(DIST)/include/js ';'
 

pkgs/development/libraries/apr/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "apr-1.3.9";
+  name = "apr-1.4.2";
 
   src = fetchurl {
     url = "mirror://apache/apr/${name}.tar.bz2";
-    sha256 = "1qicxnk62d9mjza8vch2wxy4xlq8sa76chwi5cp6bs4cyj9s61ap";
+    sha256 = "14akizp9aq8c2qk8bj5a6n3s8hsy356prp911cmrvl4l0rqcl5r0";
   };
 
   configureFlags =

pkgs/development/libraries/jbig2dec/default.nix

@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }: 
+
+stdenv.mkDerivation {
+  name = "jbig2dec-0.11";
+  
+  src = fetchurl {
+    url = http://ghostscript.com/~giles/jbig2/jbig2dec/jbig2dec-0.11.tar.gz;
+    sha256 = "1ffhgmf2fqzk0h4k736pp06z7q5y4x41fg844bd6a9vgncq86bby";
+  };
+  
+  meta = {
+    homepage = http://jbig2dec.sourceforge.net/;
+    description = "Decoder implementation of the JBIG2 image compression format";
+    license = "GPLv2+";
+  };
+}

pkgs/development/libraries/openjpeg/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }: 
+
+stdenv.mkDerivation {
+  name = "openjpeg-1.2";
+  
+  src = fetchurl {
+    url = http://www.openjpeg.org/openjpeg_v1_2.tar.gz;
+    sha256 = "1i72i0hhssgg6vfkaw3gpwf5ld65g9s77ay8pxd4any1xy54qa90";
+  };
+
+  patchPhase = ''
+    sed -i -e 's/-o root -g [^ ]\+//' Makefile Makefile.osx
+  '';
+
+  preInstall = ''
+    export installFlags="PREFIX=$out"
+  '';
+  
+  meta = {
+    homepage = http://www.openjpeg.org/;
+    description = "Open-source JPEG 2000 codec written in C language";
+    license = "BSD";
+  };
+}

pkgs/development/tools/misc/elfutils/default.nix

@@ -1,11 +1,14 @@
 {stdenv, fetchurl, m4}:
 
 stdenv.mkDerivation rec {
-  name = "elfutils-0.143";
+  name = "elfutils-0.148";
   
   src = fetchurl {
-    url = "https://fedorahosted.org/releases/e/l/elfutils/${name}.tar.bz2";
-    sha256 = "1zrqs93m6frg7j70a96xdhdb4mnzmqgh91f9bbm39jnmgs50qp23";
+    urls = [
+      "https://fedorahosted.org/releases/e/l/elfutils/${name}.tar.bz2"
+      "mirror://gentoo/distfiles/${name}.tar.bz2"
+      ];
+    sha256 = "1nl7x2gidd2i048yjlvyzhpbca9793z435cw8bsircjxfi5gmswa";
   };
 
   buildInputs = [m4];

pkgs/servers/http/apache-httpd/default.nix

@@ -6,12 +6,12 @@
 assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
-  version = "2.2.15";
+  version = "2.2.16";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "5f0e973839ed2e38a4d03adba109ef5ce3381bc2";
+    sha1 = "ef92f5b3124fe5e9ba6121ea7f4bab8c014068f9";
   };
 
   #inherit sslSupport;

pkgs/tools/misc/pal/default.nix

@@ -0,0 +1,28 @@
+{stdenv, fetchurl, ncurses, glib, gettext, readline, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "pal-0.4.2";
+  src = fetchurl {
+    url = "mirror://sourceforge/palcal/${name}.tgz";
+    sha256 = "1601nsspxscm7bp9g9bkia0ij0mx2lpskl2fqhs5r0smp92121nx";
+  };
+
+  patchPhase = ''
+    sed -i -e 's/-o root//' -e 's,ESTDIR}/etc,ESTDIR}'$out/etc, src/Makefile
+    sed -i -e 's,/etc/pal\.conf,'$out/etc/pal.conf, src/input.c
+  '';
+
+  preBuild = ''
+    export makeFlags="prefix=$out"
+  '';
+
+  buildInputs = [ glib gettext readline pkgconfig ];
+
+  meta = {
+    homepage = http://palcal.sourceforge.net/;
+    description = "Command-line calendar program that can keep track of events";
+    license = "BSD";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -945,6 +945,10 @@ let
 
   p7zip = callPackage ../tools/archivers/p7zip { };
 
+  pal = callPackage ../tools/misc/pal {
+    inherit (gtkLibs) glib;
+  };
+
   panomatic = callPackage ../tools/graphics/panomatic { };
 
   par2cmdline = callPackage ../tools/networking/par2cmdline { };
@@ -2163,6 +2167,7 @@ let
   scsh = callPackage ../development/interpreters/scsh { };
 
   spidermonkey = callPackage ../development/interpreters/spidermonkey { };
+  spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { };
 
   sysPerl = callPackage ../development/interpreters/sys-perl { };
 
@@ -3089,6 +3094,8 @@ let
 
   jasper = callPackage ../development/libraries/jasper { };
 
+  jbig2dec = callPackage ../development/libraries/jbig2dec { };
+
   jetty_gwt = callPackage ../development/libraries/java/jetty-gwt { };
 
   jetty_util = callPackage ../development/libraries/java/jetty-util { };
@@ -3542,6 +3549,8 @@ let
     opensc = opensc_0_11_7;
   };
 
+  openjpeg = callPackage ../development/libraries/openjpeg { };
+
   openssl = callPackage ../development/libraries/openssl {
     fetchurl = fetchurlBoot;
   };
@@ -4946,10 +4955,12 @@ let
 
   docbook_xsl_ns = callPackage ../data/sgml+xml/stylesheets/xslt/docbook-xsl-ns { };
 
-  junicode = callPackage ../data/fonts/junicode { };
-
   freefont_ttf = callPackage ../data/fonts/freefont-ttf { };
 
+  hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { };
+  
+  junicode = callPackage ../data/fonts/junicode { };
+
   liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { };
 
   libertine = builderDefsPackage (import ../data/fonts/libertine/2.7.nix) {
@@ -5831,6 +5842,9 @@ let
 
   msmtp = callPackage ../applications/networking/msmtp { };
 
+  mupdf = callPackage ../applications/misc/mupdf {
+  };
+
   mythtv = callPackage ../applications/video/mythtv {
     qt3 = qt3mysql;
   };
@@ -5913,6 +5927,8 @@ let
       inherit (gtkLibs) glib gtk;
     };
 
+  pidginmsnpecan = callPackage ../applications/networking/instant-messengers/pidgin-plugins/msn-pecan { };
+
   pidginotr = callPackage ../applications/networking/instant-messengers/pidgin-plugins/otr { };
 
   pidginsipe = callPackage ../applications/networking/instant-messengers/pidgin-plugins/sipe { };
@@ -6129,6 +6145,8 @@ let
     qt = qt3;
   };
 
+  veracity = callPackage ../applications/version-management/veracity {};
+
   viewMtn = builderDefsPackage (import ../applications/version-management/viewmtn/0.10.nix)
   {
     inherit monotone flup cheetahTemplate highlight ctags
@@ -6582,7 +6600,10 @@ let
   };
 
   xfce = xfce4;
-  xfce4 = recurseIntoAttrs (import ../desktops/xfce-4 pkgs);
+  
+  xfce4 = recurseIntoAttrs
+    (let callPackage = newScope pkgs.xfce4; in
+     import ../desktops/xfce-4 { inherit callPackage pkgs; });
 
   
   ### SCIENCE

pkgs/top-level/perl-packages.nix

@@ -714,6 +714,14 @@ rec {
     };
   };
 
+  CommonSense = buildPerlPackage {
+    name = "common-sense-3.3";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.3.tar.gz;
+      sha256 = "04j0lf5lwc70x33dfxxhqhylgikyb6p43mpc3daydx601wblscbj";
+    };
+  };
+
   CookieXS = buildPerlPackage rec {
     name = "Cookie-XS-0.11";
     src = fetchurl {
@@ -1093,10 +1101,10 @@ rec {
   };
 
   Encode = buildPerlPackage {
-    name = "Encode-2.25";
+    name = "Encode-2.39";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.25.tar.gz;
-      sha256 = "0prwmbg3xh1lqskianwrfrgasdfmz4kjm3qpdm27ay110jkk25ak";
+      url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-2.39.tar.gz;
+      sha256 = "0d9gzgxl9z5x2zq34m6gbx672b599h0fay4q0pfgv3va8mrm1wdz";
     };
   };
 
@@ -1580,10 +1588,10 @@ rec {
   };
 
   JSON = buildPerlPackage rec {
-    name = "JSON-2.15";
+    name = "JSON-2.21";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MA/MAKAMAKA/${name}.tar.gz";
-      sha256 = "0dijqv5b6gnkmdnysx23229kvfg6mwvrxyjrvzn2j9r4m2hmsgvn";
+      sha256 = "1dz00922yq7pz8hb9bbk8pqkwh0brf595lklsind62lf5f247vj7";
     };
     propagatedBuildInputs = [JSONXS];
   };
@@ -1598,11 +1606,12 @@ rec {
   };
 
   JSONXS = buildPerlPackage rec {
-    name = "JSON-XS-2.24";
+    name = "JSON-XS-2.29";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz";
-      sha256 = "0ir0v87w2fwalcwi2fd49mqzjna7cixn3ri0ai6ysdwnsdvbhyny";
+      sha256 = "1gl8x2rc3krpj6cs1dg0g28iqqfbn9zyq4nz9mbngv0lccc0y5vy";
     };
+    buildInputs = [CommonSense];
   };
 
   libxml_perl = buildPerlPackage rec {
@@ -1923,14 +1932,15 @@ rec {
   };
 
   NetTwitterLite = buildPerlPackage {
-    name = "Net-Twitter-Lite-0.08003";
+    name = "Net-Twitter-Lite-0.10003";
 
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-Lite-0.08003.tar.gz;
-      sha256 = "11p8w650cpfplwcrnk3qrz3l5235i37dwgrji8xpgccix4vsrfpl";
+      url = mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-Lite-0.10003.tar.gz;
+      sha256 = "1qh5bw68ad4fqiqbqwhgj859kq35asjmp0fsmrqhlbqy195pwi1i";
     };
+    doCheck = false;
 
-    propagatedBuildInputs = [JSONAny Encode LWP];
+    propagatedBuildInputs = [JSONAny Encode LWP CryptSSLeay];
   };
 
   ObjectSignature = buildPerlPackage {
@@ -2206,10 +2216,10 @@ rec {
   };
 
   ScopeUpper = buildPerlPackage rec {
-    name = "Scope-Upper-0.10";
+    name = "Scope-Upper-0.12";
     src = fetchurl {
       url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz";
-      sha256 = "0llscmwyw657pzid2lpc3q8zz3jj28aa66bdpmldv6gfa2a5ny1v";
+      sha256 = "1yrjx22hlsv2qdgicnz589j9iipyxl56y6pnks2cfg6icpp97v5w";
     };
   };
 
@@ -2760,6 +2770,15 @@ rec {
     };
   };
 
+  UriGoogleChart = buildPerlPackage rec {
+    name = "URI-GoogleChart-1.02";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
+      sha256 = "00hq5cpsk7sa04n0wg52qhpqf9i2849yyvw2zk83ayh1qqpc50js";
+    };
+    buildInputs = [URI TestMore];
+  };
+
   VariableMagic = buildPerlPackage rec {
     name = "Variable-Magic-0.36";
     src = fetchurl {