* Sync with the trunk.

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

maintainers/scripts/gnu/gnupdate

@@ -441,6 +441,8 @@ the file at URL."
     (define validsig-rx
       (make-regexp
        "^\\[GNUPG:\\] VALIDSIG ([[:xdigit:]]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+) .*$"))
+    (define expkeysig-rx                    ; good signature, but expired key
+      (make-regexp "^\\[GNUPG:\\] EXPKEYSIG ([[:xdigit:]]+) (.*)$"))
     (define errsig-rx
       (make-regexp
        "^\\[GNUPG:\\] ERRSIG ([[:xdigit:]]+) ([^ ]+) ([^ ]+) ([^ ]+) ([[:digit:]]+) ([[:digit:]]+)"))
@@ -450,20 +452,25 @@ the file at URL."
            (lambda (match)
              `(signature-id ,(match:substring match 1) ; sig id
                             ,(match:substring match 2) ; date
-                            ,(string->number      ; timestamp
+                            ,(string->number           ; timestamp
                               (match:substring match 3)))))
           ((regexp-exec goodsig-rx line)
            =>
            (lambda (match)
-             `(good-signature ,(match:substring match 1) ; key id
+             `(good-signature ,(match:substring match 1)    ; key id
                               ,(match:substring match 2)))) ; user name
           ((regexp-exec validsig-rx line)
            =>
            (lambda (match)
              `(valid-signature ,(match:substring match 1) ; fingerprint
                                ,(match:substring match 2) ; sig creation date
-                               ,(string->number   ; timestamp
+                               ,(string->number           ; timestamp
                                  (match:substring match 3)))))
+          ((regexp-exec expkeysig-rx line)
+           =>
+           (lambda (match)
+             `(expired-key-signature ,(match:substring match 1) ; fingerprint
+                                     ,(match:substring match 2)))) ; user name
           ((regexp-exec errsig-rx line)
            =>
            (lambda (match)
@@ -471,7 +478,7 @@ the file at URL."
                                ,(match:substring match 2) ; pubkey algo
                                ,(match:substring match 3) ; hash algo
                                ,(match:substring match 4) ; sig class
-                               ,(string->number   ; timestamp
+                               ,(string->number           ; timestamp
                                  (match:substring match 5))
                                ,(let ((rc
                                        (string->number ; return code
@@ -504,7 +511,7 @@ the file at URL."
 a key-id/user pair; return #f otherwise."
   (any (lambda (sexp)
          (match sexp
-           (('good-signature key-id user)
+           (((or 'good-signature 'expired-key-signature) key-id user)
             (cons key-id user))
            (_ #f)))
        status))
@@ -774,7 +781,6 @@ Return #t if the signature was good, #f otherwise."
       ("freefont-ttf" "ftp.gnu.org"   "/gnu/freefont" #f)
       ("gnupg"        "ftp.gnupg.org" "/gcrypt" #t)
       ("gnu-ghostscript" "ftp.gnu.org"  "/gnu/ghostscript" #f)
-      ("GNUnet"       "ftp.gnu.org" "/gnu/gnunet" #f)
       ("mit-scheme"   "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg" #f)
       ("icecat"       "ftp.gnu.org" "/gnu/gnuzilla" #f)
       ("source-highlight" "ftp.gnu.org" "/gnu/src-highlite" #f)
@@ -798,7 +804,6 @@ Return #t if the signature was good, #f otherwise."
       ("gnumake"     . "make")
       ("gnused"      . "sed")
       ("gnutar"      . "tar")
-      ("gnunet"      . "GNUnet") ;; ftp.gnu.org/gnu/gnunet/GNUnet-x.y.tar.gz
       ("mitscheme"   . "mit-scheme")
       ("texmacs"     . "TeXmacs")))
 

pkgs/applications/audio/ncmpcpp/default.nix

@@ -0,0 +1,21 @@
+{stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig}:
+
+stdenv.mkDerivation rec {
+  version = "0.5.8";
+  name = "ncmpcpp-${version}";
+
+  src = fetchurl {
+    url = "http://unkart.ovh.org/ncmpcpp/ncmpcpp-${version}.tar.bz2";
+    sha256 = "1kbkngs4fhf9z53awskqiwdl94i5slvxmjiajkrayi99373fallx";
+  };
+
+  buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig ];
+
+  meta = {
+    description = "Curses-based interface for MPD (music player daemon)";
+    homepage = http://unkart.ovh.org/ncmpcpp/;
+    license = "GPLv2+";
+    maintainers = [ stdenv.lib.maintainers.mornfall ];
+  };
+}
+

pkgs/applications/editors/zile/default.nix

@@ -8,13 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0ia91c18fyssnhabfb22npmidjkx32rqfkjgxxjibvdwfja25d3k";
   };
 
-  buildInputs = [ ncurses boehmgc perl ];
+  buildInputs = [ ncurses boehmgc ];
-  buildNativeInputs = [ help2man ];
+  buildNativeInputs = [ help2man perl ];
 
   # Tests can't be run because most of them rely on the ability to
   # fiddle with the terminal.
   doCheck = false;
 
+  # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro.
+  preConfigure = "export gl_cv_func_fstatat_zero_flag=yes";
+
   meta = {
     description = "GNU Zile, a lightweight Emacs clone";
 

pkgs/applications/graphics/giv/default.nix

@@ -2,11 +2,11 @@
   pcre, cfitsio, perl, gob2, vala, libtiff }:
 
 stdenv.mkDerivation rec {
-  name = "giv-0.9.19";
+  name = "giv-0.9.20";
 
   src = fetchurl {
     url = "mirror://sourceforge/giv/${name}.tar.gz";
-    sha256 = "07sgpp4k27417ymavcvil4waq6ac2mj08g42g1l52l435xm5mnh7";
+    sha256 = "09s659vvv26nw9vaw3a766al8yq6np7p0xb4iw907921j6nbqp7z";
   };
 
   # It built code to be put in a shared object without -fPIC
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sed -i s,/usr/local,$out, SConstruct 
   '';
 
-  patches = [ ./build.patch ./union.patch ];
+  patches = [ ./build.patch ];
 
   buildPhase = "scons";
 

pkgs/applications/graphics/giv/union.patch

@@ -1,38 +0,0 @@
-Already reported uptream
-
-diff --git a/src/giv-data.h b/src/giv-data.h
-index 64e7696..d34bfe4 100644
---- a/src/giv-data.h
-+++ b/src/giv-data.h
-@@ -88,7 +88,7 @@ typedef struct
- typedef struct
- {
-   gint op;
--  union
-+  struct
-   {
-     struct
-     {
-diff --git a/src/giv_types.h b/src/giv_types.h
-index 02abebe..c3cfb78 100644
---- a/src/giv_types.h
-+++ b/src/giv_types.h
-@@ -11,13 +11,11 @@ typedef struct {
- 
- typedef struct {
-   gint op;
--  union {
--    struct {
--      gdouble x,y;
--    } point;
--    double arc_dev;
--    text_mark_t *text_object;
--  } data;
-+  struct {
-+    gdouble x,y;
-+  } point;
-+  double arc_dev;
-+  text_mark_t *text_object;
- } point_t;
- 
- typedef struct {

pkgs/applications/misc/adobe-reader/default.nix

@@ -28,5 +28,6 @@ stdenv.mkDerivation {
   meta = {
     description = "Adobe Reader, a viewer for PDF documents";
     homepage = http://www.adobe.com/products/reader;
+    license = "unfree";
   };
 }

pkgs/applications/misc/bitcoin/default.nix

@@ -1,32 +1,30 @@
-{ fetchurl, stdenv, openssl, db4, boost, zlib, glib, libSM, gtk, wxGTK, miniupnpc }:
+{ fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.24";
+  version = "0.5.0";
   name = "bitcoin-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/bitcoin/Bitcoin/${name}/${name}-src.tar.gz";
+    url = " https://github.com/bitcoin/bitcoin/tarball/v${version}";
-    sha256 = "18n8i37c478b275m2x82411i1fsw8l34qm1k65ynnw38fpaj4h3r";
+    sha256 = "1i9wnbjf9yrs9rq5jnh9pk1x5j982qh3xpjm05z8dgd3nympgyy8";
   };
 
-  buildInputs = [ openssl db4 boost zlib glib libSM gtk wxGTK miniupnpc ];
+  buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ];
 
-  preConfigure = ''
+  unpackCmd = "tar xvf $curSrc";
+
+  buildPhase = ''
+    qmake
+    make
     cd src
-    substituteInPlace makefile.unix \
+    make -f makefile.unix
-      --replace "-Wl,-Bstatic" "" \
+    cd ..
-      --replace "-Wl,-Bdynamic" "" \
-      --replace "DEBUGFLAGS=-g -D__WXDEBUG__" "DEBUGFLAGS=" \
   '';
 
-  makefile = "makefile.unix";
-
-  buildFlags = "bitcoin bitcoind";
-
   installPhase = ''
     ensureDir $out/bin
-    cp bitcoin $out/bin
+    cp bitcoin-qt $out/bin
-    cp bitcoind $out/bin
+    cp src/bitcoind $out/bin
   '';
 
   meta = { 

pkgs/applications/misc/eaglemode/default.nix

@@ -1,16 +1,16 @@
 { stdenv, fetchurl, perl, libX11, xineLib, libjpeg, libpng, libtiff, pkgconfig,
-librsvg, glib, gtk, libXext, libXxf86vm }:
+librsvg, glib, gtk, libXext, libXxf86vm, poppler }:
 
 stdenv.mkDerivation {
-  name = "eaglemode-0.79.0";
+  name = "eaglemode-0.83.0";
  
   src = fetchurl {
-    url = mirror://sourceforge/eaglemode/eaglemode-0.79.0.tar.bz2;
+    url = mirror://sourceforge/eaglemode/eaglemode-0.83.0.tar.bz2;
-    sha256 = "115jydig35dqkrwl3x7fv564bks13nw89vfb46bb5rlr3l4a084s";
+    sha256 = "0rlvi9ljf3ml2l4ydkcgjjja8wk9c7h5qlpdr4x4ghh6sqq0q2x3";
   };
  
   buildInputs = [ perl libX11 xineLib libjpeg libpng libtiff pkgconfig 
-    librsvg glib gtk libXxf86vm libXext ];
+    librsvg glib gtk libXxf86vm libXext poppler ];
  
   # The program tries to dlopen both Xxf86vm and Xext, so we use the
   # trick on NIX_LDFLAGS and dontPatchELF to make it find them.

pkgs/applications/misc/gosmore/default.nix

@@ -17,7 +17,11 @@ rec {
   configureFlags = [];
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
+  phaseNames = ["fixCurlIncludes" "doConfigure" "doMakeInstall"];
+
+  fixCurlIncludes = a.fullDepEntry ''
+    sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp}
+  '' ["minInit" "doUnpack"];
       
   name = "gosmore-r21657";
   meta = {

pkgs/applications/misc/gv/default.nix

@@ -1,11 +1,14 @@
 { stdenv, fetchurl, Xaw3d, ghostscriptX, perl }:
 
-stdenv.mkDerivation rec {
+let
-  name = "gv-3.7.2";
+  name = "gv-3.7.3";
+in
+stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "mirror://gnu/gv/${name}.tar.gz";
-    sha256 = "1cj03rb7xs0l3krax4z2llwnldh876p1h3p5vql4gygcxki8vhk2";
+    sha256 = "ee01ba96e3a5c319eb4658357372a118dbb0e231891b360edecbdebd449d1c2b";
   };
 
   buildInputs = [ Xaw3d ghostscriptX perl ];

pkgs/applications/misc/ikiwiki/default.nix

@@ -13,14 +13,14 @@ assert monotoneSupport -> (monotone != null);
 
 let
   name = "ikiwiki";
-  version = "3.20110715";
+  version = "3.20111107";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "ef9cbe5ddf484e6b75de05cc6a5b51dfdff1f5920b1c4c66309b1409266df9c7";
+    sha256 = "5b14370ec9c31138d4937eca4ba9c1f1a74515edd34071cefd0cefa37395565c";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate

pkgs/applications/misc/xfontsel/default.nix

@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [libX11 pkgconfig libXaw];
 
+  # Without this, it gets Xmu as a dependency, but without rpath entry
+  NIX_LDFLAGS = "-lXmu";
+
   # This will not make xfontsel find its app-defaults, but at least the $out
   # directory will contain them.
   # hack: Copying the XFontSel app-defaults file to $HOME makes xfontsel work.

pkgs/applications/misc/xmobar/default.nix

@@ -1,12 +1,14 @@
-{ cabal, mtl, parsec, stm, time, utf8String, X11, X11Xft }:
+{ cabal, libXrandr, mtl, parsec, stm, time, utf8String, X11, X11Xft
+}:
 
 cabal.mkDerivation (self: {
   pname = "xmobar";
-  version = "0.13";
+  version = "0.14";
-  sha256 = "0ijava0vn2dmc6v57i6x663rvxz3ryb2gqks18qk1qli4k0m3hf7";
+  sha256 = "1y26b2a5v9hxv1zmjcb4m8j9qkqdn74mqc3q58vgp5cav45rphvh";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ mtl parsec stm time utf8String X11 X11Xft ];
+  extraLibraries = [ libXrandr ];
   configureFlags = "-fwith_xft";
   meta = {
     homepage = "http://projects.haskell.org/xmobar/";

pkgs/applications/misc/xpdf/default.nix

@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     if test -n \"${base14Fonts}\"; then
       substituteInPlace $out/etc/xpdfrc \\
         --replace /usr/local/share/ghostscript/fonts ${base14Fonts} \\
-        --replace '#displayFontT1' displayFontT2
+        --replace '#fontFile' fontFile
     fi
   ";
 

pkgs/applications/misc/xterm/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, xorg, ncurses, freetype, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "xterm-268";
+  name = "xterm-276";
   
   src = fetchurl {
     url = "ftp://invisible-island.net/xterm/${name}.tgz";
-    sha256 = "1hr886mgr74k146fjppnq1pmg6f95l00v88cfwac3rms5lx7ckap";
+    sha256 = "1k3k025z3vl91sc8i7f5lmnsb1rsblpbijri9vnxgpynw4wgrc7b";
   };
   
   buildInputs =

pkgs/applications/networking/browsers/chromium/default.nix

@@ -1,5 +1,5 @@
 { GConf, alsaLib, bzip2, cairo, cups, dbus, dbus_glib, expat
-, fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11
+, fetchurl, ffmpeg, fontconfig, freetype, gtkLibs, libX11, libXfixes
 , libXScrnSaver, libXdamage, libXext, libXrender, libXt, libXtst
 , libgcrypt, libjpeg, libpng, makeWrapper, nspr, nss, patchelf
 , stdenv, unzip, zlib, pam, pcre }:
@@ -7,23 +7,23 @@
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" ;
 
 stdenv.mkDerivation rec {
-  name = "chromium-16.0.879.0-pre${version}";
+  name = "chromium-17.0.943.0-pre${version}";
 
   # To determine the latest revision, get
   # ‘http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/LAST_CHANGE’.
   # For the version number, see ‘about:config’.
-  version = "100626";
+  version = "110566";
   
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux_x64/${version}/chrome-linux.zip";
-        sha256 = "1dymz7h9v5hkivn6qn26bnj1waw60z3mngh8g46yvvc5xn4npc3l";
+        sha256 = "0pi2qbcvqy9gn2s0bfqlam3mj5ghnnnkrbxrrjl63737377an7ha";
       }
     else if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://commondatastorage.googleapis.com/chromium-browser-continuous/Linux/${version}/chrome-linux.zip";
-        sha256 = "0zqaj90lfzdddbs6sjygmyxlh8nw3xfr9xw450g9cabg6a2sh7ca";
+        sha256 = "0mk8ikgz97i69qy1cy3cqw4a2ff2ixjzyw5i86fmrq7m1f156yva";
       }
     else throw "Chromium is not supported on this platform.";
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   libPath =
     stdenv.lib.makeLibraryPath
        [ GConf alsaLib bzip2 cairo cups dbus dbus_glib expat
-         ffmpeg fontconfig freetype libX11 libXScrnSaver
+         ffmpeg fontconfig freetype libX11 libXScrnSaver libXfixes
          libXdamage libXext libXrender libXt libXtst libgcrypt libjpeg
          libpng nspr stdenv.gcc.gcc zlib stdenv.gcc.libc
          gtkLibs.glib gtkLibs.gtk gtkLibs.gdk_pixbuf gtkLibs.pango

pkgs/applications/networking/browsers/firefox/6.0-install-sdk-bin.patch

@@ -1,35 +0,0 @@
-
-# HG changeset patch
-# User Chris Coulson <chrisccoulson@ubuntu.com>
-# Date 1306390403 -7200
-# Node ID 99672871e93003520189cfe3a684ebbea151cb4b
-# Parent  831f8e040f381ed58441d8bf413f9845f26ce08e
-Bug 639554 - Install sdk/bin with make install. r=bsmedberg
-
-diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
---- a/toolkit/mozapps/installer/packager.mk
-+++ b/toolkit/mozapps/installer/packager.mk
-@@ -704,20 +704,22 @@ ifdef INSTALL_SDK # Here comes the hard 
- 	$(NSINSTALL) -D $(DESTDIR)$(includedir)
- 	(cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \
- 	  (cd $(DESTDIR)$(includedir) && tar -xf -)
- 	$(NSINSTALL) -D $(DESTDIR)$(idldir)
- 	(cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \
- 	  (cd $(DESTDIR)$(idldir) && tar -xf -)
- # SDK directory is the libs + a bunch of symlinks
- 	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib
-+	$(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin
- 	if test -f $(DIST)/include/xpcom-config.h; then \
- 	  $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \
- 	fi
- 	(cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -)
-+	(cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -)
- 	$(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl
- 	ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib
- 	ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin
- 	ln -s $(includedir) $(DESTDIR)$(sdkdir)/include
- 	ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl
- endif # INSTALL_SDK
- 
- make-sdk:
-

pkgs/applications/networking/browsers/firefox/8.0.nix

@@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "8.0b1";
+  firefoxVersion = "8.0.1";
   
-  xulVersion = "8.0"; # this attribute is used by other packages
+  xulVersion = "8.0.1"; # this attribute is used by other packages
 
   
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";
+    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha256 = "1sdahpawgngvjh4cap2vdg00ngiwji5nkb40dh5kd393wa6c8mpm";
+    sha1 = "0dd207c5cee9d53114c55aa23eeca36b754bc128";
   };
   
   commonConfigureFlags =
@@ -161,7 +161,7 @@ rec {
             file $i;
             if file $i | grep executable &>/dev/null; then 
 	        rm "$out/bin/$(basename "$i")"
-                echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
+                echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
                 chmod a+x "$out/bin/$(basename "$i")"
             fi;
         done;

pkgs/applications/networking/browsers/firefox/9.0.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL
 , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs
 , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, yasm, mesa, sqlite
+, yasm, mesa, sqlite, unzip
 
 , # If you want the resulting program to call itself "Firefox" instead
   # of "Shiretoko" or whatever, enable this option.  However, those
@@ -15,17 +15,16 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "6.0.2";
+  firefoxVersion = "9.0b1";
   
-  xulVersion = "6.0.2"; # this attribute is used by other packages
+  xulVersion = "9.0"; # this attribute is used by other packages
 
   
   src = fetchurl {
-    url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/${firefoxVersion}-candidates/build1/source/firefox-${firefoxVersion}.source.tar.bz2";
-    sha1 = "074eb9c1df4de0fe0a4bb9226ca3c2822c334cd6";
+    sha256 = "0mvm0bjzghqywh54fnk5qhz7fjm5d8y952sf59ypq64bhs5dh009";
   };
   
-  
   commonConfigureFlags =
     [ "--enable-optimize"
       "--disable-debug"
@@ -51,15 +50,13 @@ rec {
     
     inherit src;
 
-    patches = [ ./6.0-install-sdk-bin.patch ];
-
     buildInputs =
       [ pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2
         python dbus dbus_glib pango freetype fontconfig xlibs.libXi
         xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
         alsaLib nspr /* nss */ libnotify xlibs.pixman yasm mesa
-	xlibs.libXScrnSaver xlibs.scrnsaverproto
+        xlibs.libXScrnSaver xlibs.scrnsaverproto
-	xlibs.libXext xlibs.xextproto sqlite
+        xlibs.libXext xlibs.xextproto sqlite unzip
       ];
 
     configureFlags =
@@ -76,12 +73,13 @@ rec {
           stdenv.lib.concatStringsSep ":" 
             (map (s : s + "/lib") (buildInputs ++ [stdenv.gcc.libc]))
         }' ';'
+
+        export NIX_LDFLAGS="$NIX_LDFLAGS -L$out/lib/xulrunner-${xulVersion}"
       '';
 
-    # !!! Temporary hacks.
+    # !!! Temporary hack.
     preBuild =
       ''
-        ln -s Linux2.6.mk security/coreconf/Linux3.0.mk
         export NIX_ENFORCE_PURITY=
       '';
 
@@ -103,15 +101,19 @@ rec {
       for i in $out/lib/$libDir/*; do 
           file $i;
           if file $i | grep executable &>/dev/null; then 
-              ln -s $i $out/bin
+              echo -e '#! /bin/sh\n"'"$i"'" "$@"' > "$out/bin/$(basename "$i")";
+              chmod a+x "$out/bin/$(basename "$i")";
           fi;
       done;
+      for i in $out/lib/$libDir/{xpcshell,plugin-container,*.so}; do
+              patchelf --set-rpath "$(patchelf --print-rpath "$i"):$out/lib/$libDir" $i || true
+      done;
       rm -f $out/bin/run-mozilla.sh
     ''; # */
 
     meta = {
       description = "Mozilla Firefox XUL runner";
-      homepage = http://www.mozilla.org/firefox/;
+      homepage = http://www.mozilla.com/en-US/firefox/;
     };
 
     passthru = { inherit gtk; version = xulVersion; };
@@ -128,7 +130,7 @@ rec {
     buildInputs =
       [ pkgconfig gtk perl zip libIDL libjpeg zlib cairo bzip2 python
         dbus dbus_glib pango freetype fontconfig alsaLib nspr libnotify
-        xlibs.pixman yasm mesa sqlite
+        xlibs.pixman yasm mesa sqlite file unzip
       ];
 
     propagatedBuildInputs = [xulrunner];
@@ -137,6 +139,7 @@ rec {
       [ "--enable-application=browser"
         "--with-libxul-sdk=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"
         "--enable-chrome-format=jar"
+	"--disable-elf-hack"
       ]
       ++ commonConfigureFlags
       ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
@@ -153,11 +156,20 @@ rec {
     postInstall =
       ''
         ln -s ${xulrunner}/lib/xulrunner-${xulrunner.version} $(echo $out/lib/firefox-*)/xulrunner
+        for j in $out/bin/*; do 
+	    i="$(readlink "$j")";
+            file $i;
+            if file $i | grep executable &>/dev/null; then 
+	        rm "$out/bin/$(basename "$i")"
+                echo -e '#! /bin/sh\nexec "'"$i"'" "$@"' > "$out/bin/$(basename "$i")"
+                chmod a+x "$out/bin/$(basename "$i")"
+            fi;
+        done;
       ''; # */
 
     meta = {
       description = "Mozilla Firefox - the browser, reloaded";
-      homepage = http://www.mozilla.org/firefox/;
+      homepage = http://www.mozilla.com/en-US/firefox/;
     };
 
     passthru = {

pkgs/applications/networking/browsers/icecat-4/default.nix

@@ -1,118 +0,0 @@
-{ fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
-, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib
-, libnotify, gnome_vfs, libgnomeui
-, freetype, fontconfig, wirelesstools ? null, pixman
-, application ? "browser" }:
-
-# Build the WiFi stuff on Linux-based systems.
-# FIXME: Disable for now until it can actually be built:
-# http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 .
-#assert stdenv.isLinux -> (wirelesstools != null);
-
-let version = "4.0.1.1"; in
-stdenv.mkDerivation {
-  name = "icecat-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.xz";
-    sha256 = "1f1y1834pv8f5fmfb5d4d5gj2v7bxsk3k9b9g832bwq0h5203yvg";
-  };
-
-  buildInputs =
-    [ xz libgnomeui libnotify gnome_vfs alsaLib
-      pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman
-      python ply dbus dbus_glib pango freetype fontconfig
-      xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt
-    ]
-    ++ (stdenv.lib.optional false /* stdenv.isLinux */ wirelesstools);
-
-  patches = [
-    ./skip-gre-registration.patch ./rpath-link.patch
-  ];
-
-  configureFlags =
-    [ "--enable-application=${application}"
-      "--enable-libxul"
-      "--disable-javaxpcom"
-
-      "--enable-optimize"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-system-jpeg"
-      "--with-system-zlib"
-      "--with-system-bz2"
-      # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support"
-      "--enable-system-cairo"
-      #"--enable-system-sqlite" # <-- this seems to be discouraged
-      "--disable-crashreporter"
-    ]
-    ++ (stdenv.lib.optional true /* (!stdenv.isLinux) */ "--disable-necko-wifi");
-
-  postInstall = ''
-    export dontPatchELF=1;
-
-    # Strip some more stuff
-    strip -S "$out/lib/"*"/"* || true
-
-    # This fixes starting IceCat when there already is a running
-    # instance.  The `icecat' wrapper script actually expects to be
-    # in the same directory as `run-mozilla.sh', apparently.
-    libDir=$(cd $out/lib && ls -d icecat-[0-9]*)
-    test -n "$libDir"
-
-    if [ -f "$out/bin/icecat" ]
-    then
-        # Fix references to /bin paths in the IceCat shell script.
-        substituteInPlace $out/bin/icecat		\
-            --replace /bin/pwd "$(type -tP pwd)"	\
-            --replace /bin/ls "$(type -tP ls)"
-
-        cd $out/bin
-        mv icecat ../lib/$libDir/
-        ln -s ../lib/$libDir/icecat .
-
-        # Register extensions etc.
-        echo "running \`icecat -register'..."
-        (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./icecat-bin -register) || false
-    fi
-
-    if [ -f "$out/lib/$libDir/xpidl" ]
-    then
-        # XulRunner's IDL compiler.
-        echo "linking \`xpidl'..."
-        ln -s "$out/lib/$libDir/xpidl" "$out/bin"
-    fi
-
-    # Put the GNU IceCat icon in the right place.
-    ensureDir "$out/lib/$libDir/chrome/icons/default"
-    ln -s ../../../icons/default.xpm  "$out/lib/$libDir/chrome/icons/default/"
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "GNU IceCat, a free web browser based on Mozilla Firefox";
-
-    longDescription = ''
-      Gnuzilla is the GNU version of the Mozilla suite, and GNU IceCat
-      is the GNU version of the Firefox browser.  Its main advantage
-      is an ethical one: it is entirely free software.  While the
-      source code from the Mozilla project is free software, the
-      binaries that they release include additional non-free software.
-      Also, they distribute and recommend non-free software as
-      plug-ins.  In addition, GNU IceCat includes some privacy
-      protection features.
-    '';
-
-    homepage = http://www.gnu.org/software/gnuzilla/;
-    licenses = [ "GPLv2+" "LGPLv2+" "MPLv1+" ];
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.gnu;
-  };
-
-  passthru = {
-    inherit gtk version;
-    isFirefox3Like = true;
-  };
-}

pkgs/applications/networking/browsers/icecat-4/rpath-link.patch

@@ -1,14 +0,0 @@
-Without this patch, IceCat ends up linking with
-`-Wl,-rpath-link=/bin -Wl-,-rpath-link=/lib'.
-
---- icecat-3.5/js/src/configure	2009-07-04 18:03:01.000000000 +0200
-+++ icecat-3.5/js/src/configure	2009-07-13 18:34:30.000000000 +0200
-@@ -4775,7 +4775,6 @@ HOST_AR='$(AR)'
- HOST_AR_FLAGS='$(AR_FLAGS)'
- 
- MOZ_JS_LIBS='-L$(libdir) -lmozjs'
--MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib'
- 
- MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)'
- MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
-

pkgs/applications/networking/browsers/icecat-4/skip-gre-registration.patch

@@ -1,12 +0,0 @@
-Skip "GRE" registration since that assumes write access to `/etc'.
-
---- icecat-3.0.1-g1/xulrunner/installer/Makefile.in	2008-07-27 12:52:16.000000000 +0200
-+++ icecat-3.0.1-g1/xulrunner/installer/Makefile.in	2008-09-08 17:19:17.000000000 +0200
-@@ -71,6 +71,7 @@ $(MOZILLA_VERSION).system.conf: $(topsrc
- 	printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \
- 	  $(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@
- 
-+SKIP_GRE_REGISTRATION = yes
- ifndef SKIP_GRE_REGISTRATION
- # to register xulrunner per-user, override this with $HOME/.gre.d
- regdir = /etc/gre.d

pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh

@@ -0,0 +1,23 @@
+source $stdenv/setup
+
+dontStrip=1
+dontPatchELF=1
+sourceRoot=$TMPDIR
+
+unpackPhase() {
+    tar xvzf $src;
+    for a in *; do
+	if [ -d $a ]; then
+		cd $a
+		break
+	fi
+    done
+}
+
+installPhase() {
+    ensureDir $out/lib/mozilla/plugins
+    cp -pv libflashplayer.so $out/lib/mozilla/plugins
+    patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
+}
+
+genericBuild

pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix

@@ -0,0 +1,88 @@
+{ stdenv
+, fetchurl
+, zlib
+, alsaLib
+, curl
+, nss
+, nspr
+, fontconfig
+, freetype
+, expat
+, libX11
+, libXext
+, libXrender
+, libXt
+, gtk 
+, glib
+, pango
+, cairo
+, atk
+, gdk_pixbuf
+, debug ? false
+
+/* you have to add ~/mm.cfg :
+
+    TraceOutputFileEnable=1
+    ErrorReportingEnable=1
+    MaxWarnings=1
+
+  in order to read the flash trace at ~/.macromedia/Flash_Player/Logs/flashlog.txt
+  Then FlashBug (a FireFox plugin) shows the log as well
+*/
+
+}:
+
+let
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      if debug then
+        # no plans to provide a x86_64 version:
+        # http://labs.adobe.com/technologies/flashplayer10/faq.html
+        throw "no x86_64 debugging version available"
+      else {
+        # -> http://labs.adobe.com/downloads/flashplayer10.html
+        version = "11.1.102.55";
+        url = http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.x86_64.tar.gz;
+        sha256 = "09swldv174z23pnixy9fxkw084qkl3bbrxfpf159fbjdgvwihn1l";
+      }
+    else if stdenv.system == "i686-linux" then
+      if debug then {
+        # The debug version also contains a player
+        version = "11.1";
+        url = http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz;
+        sha256 = "1z3649lv9sh7jnwl8d90a293nkaswagj2ynhsr4xmwiy7c0jz2lk";
+      } else {
+        version = "11.1.102.55";
+        url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/11.1.102.55/install_flash_player_11_linux.i386.tar.gz";
+        sha256 = "08zdnl06lqyk2k3yq4lgphqd3ci2267448mghlv1p0hjrdq253k7";
+      }
+    else throw "Flash Player is not supported on this platform";
+
+in
+
+stdenv.mkDerivation {
+  name = "flashplayer-${src.version}";
+
+  builder = ./builder.sh;
+  
+  src = fetchurl { inherit (src) url sha256; };
+
+  inherit zlib alsaLib;
+
+  passthru = {
+    mozillaPlugin = "/lib/mozilla/plugins";
+  };
+
+  rpath = stdenv.lib.makeLibraryPath
+    [ zlib alsaLib curl nss nspr fontconfig freetype expat libX11
+      libXext libXrender libXt gtk glib pango atk cairo gdk_pixbuf
+    ];
+
+  buildPhase = ":";
+
+  meta = {
+    description = "Adobe Flash Player browser plugin";
+    homepage = http://www.adobe.com/products/flashplayer/;
+  };
+}

pkgs/applications/networking/instant-messengers/amsn/builder.sh

@@ -1,11 +0,0 @@
-source $stdenv/setup
-
-echo $libstdcpp
-echo "-L$libstdcpp/lib"
-LDFLAGS="-L$libstdcpp/lib"
-CPPFLAGS="-L$libstdcpp/include"
-CFLAGS="-lm"
-
-configureFlags="--with-tcl=$tcl/lib --with-tk=$tk/lib --enable-static"
-
-genericBuild

pkgs/applications/networking/instant-messengers/amsn/default.nix

@@ -1,15 +1,19 @@
-{stdenv, fetchurl, which, tcl, tk, x11, libstdcpp }:
+{stdenv, fetchurl, which, tcl, tk, x11, libpng, libjpeg, makeWrapper}:
 
 stdenv.mkDerivation {
-  name = "amsn-0.96";
+  name = "amsn-0.98.4";
-  builder = ./builder.sh;
   src = fetchurl {
-    url = mirror://sourceforge/amsn/amsn-0.96.tar.bz2;
+    url = mirror://sourceforge/amsn/amsn-0.98.4-src.tar.gz;
-    md5 = "3df6b0d34ef1997a47c0b8af29b2547a";
+    sha256 = "1kcn1hc6bvgy4svf5l3j5psdrvsmy0p3r33fn7gzcinqdf3xfgqx";
   };
 
-  inherit tcl tk libstdcpp;
+  configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static";
-  buildInputs = [which tcl tk x11 ];
+
+  buildInputs = [which tcl tk x11 libpng libjpeg makeWrapper];
+
+  postInstall = ''
+    wrapProgram $out/bin/amsn --prefix PATH : ${tk}/bin
+  '';
 
   meta = {
     homepage = http://amsn-project.net;

pkgs/applications/networking/instant-messengers/kadu/default.nix

@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation {
 
-  name = "kadu-0.10.0";
+  name = "kadu-0.10.1";
 
   src = fetchurl {
-    url = http://www.kadu.net/download/stable/kadu-0.10.0.tar.bz2;
+    url = http://download.kadu.im/stable/kadu-0.10.1.tar.bz2;
-    sha256 = "039dx8y6vzqmv86prk1srmi7fvxlrbisyd6rcfs0gv497bfi1995";
+    sha256 = "0j88pyp2nqpc57j38zr135ypfiv4v329gfgiz9rdbqi8j26cyp7g";
   };
 
   buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   '';
 
   # because I was not able to get those working
-  patches = [ ./disable_encryption_plugins.patch ];
+  patches = [ ./disable_some_plugins.patch ];
 
   NIX_LDFLAGS="-lX11";
 

pkgs/applications/networking/instant-messengers/kadu/disable_encryption_plugins.patch

@@ -1,16 +0,0 @@
-diff --git a/Plugins.cmake b/Plugins.cmake
-index c6906ce..b1284d6 100644
---- a/Plugins.cmake
-+++ b/Plugins.cmake
-@@ -30,9 +30,9 @@ set (COMPILE_PLUGINS
- 
- # encryption
- 	# Encrypted chat support
--	encryption_ng
-+	# encryption_ng
- 	# OpenSSL encrypted chat support
--	encryption_ng_simlite
-+	# encryption_ng_simlite
- 
- # docking
- 	# Tray icon support (common part of all docking modules)

pkgs/applications/networking/instant-messengers/kadu/disable_some_plugins.patch

@@ -0,0 +1,28 @@
+diff --git a/Plugins.cmake b/Plugins.cmake
+index ad63f20..c14a781 100644
+--- a/Plugins.cmake
++++ b/Plugins.cmake
+@@ -30,9 +30,9 @@ set (COMPILE_PLUGINS
+ 
+ # encryption
+ 	# Encrypted chat support
+-	encryption_ng
++        # encryption_ng
+ 	# OpenSSL encrypted chat support
+-	encryption_ng_simlite
++        # encryption_ng_simlite
+ 
+ # docking
+ 	# Tray icon support (common part of all docking modules)
+@@ -104,9 +104,9 @@ if (UNIX)
+ 
+ 	# mediaplayer
+ 		# MPD mediaplayer support
+-		mpd_mediaplayer
++		# mpd_mediaplayer
+ 		# MPRIS Media Players support
+-		mprisplayer_mediaplayer
++                # mprisplayer_mediaplayer
+ 	)
+ endif (UNIX)
+ 

pkgs/applications/networking/instant-messengers/torchat/default.nix

@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, python, unzip, wxPython, wrapPython, tor }:
+stdenv.mkDerivation rec {
+
+  name = "torchat-${version}";
+  version = "0.9.9.550";
+
+  src = fetchurl {
+    url = "http://torchat.googlecode.com/files/torchat-source-${version}.zip";
+    sha256 = "01z0vrmflcmb146m04b66zihkd22aqnxz2vr4x23z1q5mlwylmq2";
+  };
+
+  buildInputs = [ python unzip wxPython wrapPython ];
+  pythonPath = [ wxPython ];
+
+  preConfigure = "rm portable.txt";
+  preUnpack = "sourceRoot=`pwd`/src";
+
+  installPhase = ''
+    substituteInPlace "Tor/tor.sh" --replace "tor -f" "${tor}/bin/tor -f"
+
+    wrapPythonPrograms
+
+    ensureDir $out/lib/torchat
+    cp -rf * $out/lib/torchat
+    makeWrapper ${python}/bin/python $out/bin/torchat \
+        --set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \
+        --run "cd $out/lib/torchat" \
+        --add-flags "-O $out/lib/torchat/torchat.py"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://code.google.com/p/torchat/;
+    description = "instant messaging application on top of the Tor network and it's location hidden services";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.unix;
+  };
+}

pkgs/applications/networking/mailreaders/notmuch/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv, bash, emacs, gdb, git, glib, gmime, gnupg1, pkgconfig, talloc, xapian }:
 
 stdenv.mkDerivation rec {
-  name = "notmuch-0.8";
+  name = "notmuch-0.9";
 
   src = fetchurl {
     url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "f40bcdc6447cae9f76d5b4e70ab70d87e4a813cd123b524c1dc3155a3371a949";
+    sha256 = "e6f1046941d2894d143cb7c19d4810f97946f98742f6d9b8a7208ddb858c57e4";
   };
 
   buildInputs = [ bash emacs gdb git glib gmime gnupg1 pkgconfig talloc xapian ];
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
   patchPhase = ''
     (cd test && for prg in \
         aggregate-results.sh \
+        atomicity \
         author-order \
         basic \
         crypto \
@@ -52,11 +53,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Notmuch -- The mail indexer";
-
     longDescription = "";
-
+    license = stdenv.lib.licenses.gpl3;
-    license = "GPLv3";
-
     maintainers = [ stdenv.lib.maintainers.chaoflow ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };

pkgs/applications/networking/p2p/gnunet/0.8.nix

@@ -1,30 +1,25 @@
-{ stdenv, fetchsvn, libextractor, libmicrohttpd, libgcrypt
+{ stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt
-, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
+, zlib, gmp, curl, libtool, guile, adns, sqlite, pkgconfig
 , libxml2, ncurses, gettext, findutils
-, autoconf, automake
 , gtkSupport ? false, gtk ? null, libglade ? null
 , makeWrapper }:
 
 assert gtkSupport -> (gtk != null) && (libglade != null);
 
-let
+let version = "0.8.1b";
-  rev = "17000";
-  version = "0.9-svn-${rev}";
 in
   stdenv.mkDerivation {
     name = "gnunet-${version}";
 
-    src = fetchsvn {
+    src = fetchurl {
-      url = "https://gnunet.org/svn/gnunet";
+      url = "mirror://gnu/gnunet/GNUnet-${version}.tar.gz";
-      sha256 = "17nkvykg3xb5m1y86i9lahgsic9jpj6h0nr73ywzpxpp7ql45cm4";
+      sha256 = "0k6nrsxz5s52z6hlahb7d3sj1z0gidm79n04pf9j2ngfylp4v1bw";
-      inherit rev;
     };
 
     buildInputs = [
       libextractor libmicrohttpd libgcrypt gmp curl libtool
-      zlib adns sqlite libxml2 ncurses
+      zlib guile adns sqlite libxml2 ncurses
       pkgconfig gettext findutils
-      autoconf automake
       makeWrapper
     ] ++ (if gtkSupport then [ gtk libglade ] else []);
 
@@ -47,8 +42,19 @@ in
         echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
         substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
       done
+    '';
 
-      autoreconf -vfi
+    doCheck = false;
+
+    # 1. Run tests have once GNUnet is installed.
+    # 2. Help programs find the numerous modules that sit under
+    #    `$out/lib/GNUnet'.
+
+    # FIXME: `src/transports/test_udp' hangs forever.
+    postInstall = ''
+      #GNUNET_PREFIX="$out" make check
+      wrapProgram "$out/bin/gnunetd" \
+        --prefix LTDL_LIBRARY_PATH ":" "$out/lib/GNUnet"
     '';
 
     meta = {

pkgs/applications/networking/p2p/gnunet/default.nix

@@ -1,85 +1,72 @@
 { stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt
-, zlib, gmp, curl, libtool, guile, adns, sqlite, pkgconfig
+, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
-, libxml2, ncurses, gettext, findutils
+, libxml2, ncurses, gettext
 , gtkSupport ? false, gtk ? null, libglade ? null
 , makeWrapper }:
 
 assert gtkSupport -> (gtk != null) && (libglade != null);
 
-let version = "0.8.1b";
+stdenv.mkDerivation rec {
-in
+  name = "gnunet-0.9.0";
-  stdenv.mkDerivation {
-    name = "gnunet-${version}";
 
-    src = fetchurl {
+  src = fetchurl {
-      url = "mirror://gnu/gnunet/GNUnet-${version}.tar.gz";
+    url = "mirror://gnu/gnunet/${name}.tar.gz";
-      sha256 = "0k6nrsxz5s52z6hlahb7d3sj1z0gidm79n04pf9j2ngfylp4v1bw";
+    sha256 = "1a0faq2j20dxhpdq0lpi8mjhddwmscbaa1bsxk460p5mj8n55i3p";
-    };
+  };
 
-    buildInputs = [
+  buildInputs = [
-      libextractor libmicrohttpd libgcrypt gmp curl libtool
+    libextractor libmicrohttpd libgcrypt gmp curl libtool
-      zlib guile adns sqlite libxml2 ncurses
+    zlib adns sqlite libxml2 ncurses
-      pkgconfig gettext findutils
+    pkgconfig gettext makeWrapper
-      makeWrapper
+  ] ++ (if gtkSupport then [ gtk libglade ] else []);
-    ] ++ (if gtkSupport then [ gtk libglade ] else []);
 
-    preConfigure = ''
+  preConfigure = ''
-      # Brute force: since nix-worker chroots don't provide
+    # Brute force: since nix-worker chroots don't provide
-      # /etc/{resolv.conf,hosts}, replace all references to `localhost'
+    # /etc/{resolv.conf,hosts}, replace all references to `localhost'
-      # by their IPv4 equivalent.
+    # by their IPv4 equivalent.
-      for i in $(find . \( -name \*.c -or -name \*.conf \) \
+    for i in $(find . \( -name \*.c -or -name \*.conf \) \
-                      -exec grep -l localhost {} \;)
+                    -exec grep -l '\<localhost\>' {} \;)
-      do
+    do
-        echo "$i: substituting \`127.0.0.1' to \`localhost'..."
+      echo "$i: substituting \`127.0.0.1' to \`localhost'..."
-        substituteInPlace "$i" --replace "localhost" "127.0.0.1"
+      sed -i "$i" -e's/\<localhost\>/127.0.0.1/g'
-      done
+    done
 
-      # Make sure the tests don't rely on `/tmp', for the sake of chroot
+    # Make sure the tests don't rely on `/tmp', for the sake of chroot
-      # builds.
+    # builds.
-      for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \
+    for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \
-                      -exec grep -l /tmp {} \;)
+                    -exec grep -l /tmp {} \;)
-      do
+    do
-        echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
+      echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
-        substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
+      substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
-      done
+    done
+  '';
+
+  # XXX: There are several test failures, forwarded to bug-gnunet@gnu.org.
+  doCheck = false;
+
+  meta = {
+    description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework";
+
+    longDescription = ''
+      GNUnet is a framework for secure peer-to-peer networking that
+      does not use any centralized or otherwise trusted services.  A
+      first service implemented on top of the networking layer
+      allows anonymous censorship-resistant file-sharing.  Anonymity
+      is provided by making messages originating from a peer
+      indistinguishable from messages that the peer is routing.  All
+      peers act as routers and use link-encrypted connections with
+      stable bandwidth utilization to communicate with each other.
+      GNUnet uses a simple, excess-based economic model to allocate
+      resources.  Peers in GNUnet monitor each others behavior with
+      respect to resource usage; peers that contribute to the
+      network are rewarded with better service.
     '';
 
-    doCheck = false;
+    homepage = http://gnunet.org/;
 
-    # 1. Run tests have once GNUnet is installed.
+    license = "GPLv2+";
-    # 2. Help programs find the numerous modules that sit under
-    #    `$out/lib/GNUnet'.
 
-    # FIXME: `src/transports/test_udp' hangs forever.
+    maintainers = [ stdenv.lib.maintainers.ludo ];
-    postInstall = ''
+    platforms = stdenv.lib.platforms.gnu;
-      #GNUNET_PREFIX="$out" make check
+  };
-      wrapProgram "$out/bin/gnunetd" \
+}
-        --prefix LTDL_LIBRARY_PATH ":" "$out/lib/GNUnet"
-    '';
-
-    meta = {
-      description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework";
-
-      longDescription = ''
-        GNUnet is a framework for secure peer-to-peer networking that
-        does not use any centralized or otherwise trusted services.  A
-        first service implemented on top of the networking layer
-        allows anonymous censorship-resistant file-sharing.  Anonymity
-        is provided by making messages originating from a peer
-        indistinguishable from messages that the peer is routing.  All
-        peers act as routers and use link-encrypted connections with
-        stable bandwidth utilization to communicate with each other.
-        GNUnet uses a simple, excess-based economic model to allocate
-        resources.  Peers in GNUnet monitor each others behavior with
-        respect to resource usage; peers that contribute to the
-        network are rewarded with better service.
-      '';
-
-      homepage = http://gnunet.org/;
-
-      license = "GPLv2+";
-
-      maintainers = [ stdenv.lib.maintainers.ludo ];
-      platforms = stdenv.lib.platforms.gnu;
-    };
-  }

pkgs/applications/networking/sniffers/wireshark/default.nix

@@ -1,12 +1,37 @@
-{stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison}:
+{ stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison
+, gnutls, libgcrypt, glib, zlib, libxml2, libxslt, adns, geoip
+, heimdal, python, lynx, lua5
+}:
 
-stdenv.mkDerivation rec {
+let
-  version = "1.4.2";
+  version = "1.6.2";
+in
+stdenv.mkDerivation {
   name = "wireshark-${version}";
+
   src = fetchurl {
-    url = "http://www.wireshark.org/download/src/${name}.tar.bz2";
+    url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2";
-    sha256 = "1cj9n3yhahj6pabx1h1gas6b6dhwsljjz2w3ngky3a4g6bnf3ij4";
+    sha256 = "0zqy8ws05xz36y49azf5lrwzgfz26h7f8d27xjc89hlqrqagahsk";
+  };
+
+  buildInputs = [perl pkgconfig gtk libpcap flex bison gnutls libgcrypt
+    glib zlib libxml2 libxslt adns geoip heimdal python lynx lua5
+  ];
+
+  configureFlags = "--disable-usr-local --with-ssl --enable-threads --enable-packet-editor";
+
+  meta = {
+    homepage = "http://sourceforge.net/projects/wireshark/";
+    description = "a powerful network protocol analyzer";
+    license = stdenv.lib.licenses.gpl2;
+
+    longDescription = ''
+      Wireshark (formerly known as "Etherreal") is a powerful network
+      protocol analyzer developed by an international team of networking
+      experts. It runs on UNIX, OS X and Windows.
+    '';
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
-  configureFlags = "--with-pcap=${libpcap}";
-  buildInputs = [perl pkgconfig gtk libpcap flex bison];
 }

pkgs/applications/networking/sync/rsync/default.nix

@@ -5,11 +5,11 @@
 assert enableACLs -> acl != null;
 
 stdenv.mkDerivation {
-  name = "rsync-3.0.7";
+  name = "rsync-3.0.9";
 
   src = fetchurl {
-    url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.7.tar.gz;
+    url = http://rsync.samba.org/ftp/rsync/src/rsync-3.0.9.tar.gz;
-    sha256 = "1j77vwz6q3dvgr8w6wvigd5v4m5952czaqdvihr8di13q0b0vq4y";
+    sha256 = "01bw4klqsrlhh3i9lazd485sd9qx5djvnwa21lj2h3a9sn6hzw9h";
   };
 
   buildInputs = stdenv.lib.optional enableACLs acl;
@@ -18,5 +18,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://samba.anu.edu.au/rsync/;
     description = "A fast incremental file transfer utility";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }

pkgs/applications/office/gnucash/default.nix

@@ -9,14 +9,14 @@
  */
 
 let
-  name = "gnucash-2.4.7";
+  name = "gnucash-2.4.8";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
-    sha256 = "eeb3b17f9081a544f8705db735df88ab3f468642a1d01552ea4e36bcb5b0730e";
+    sha256 = "06gfgw4sq1b8c9qzinyd3wmcy3i0jyprngr259l0aldv8rvix8aa";
   };
 
   buildInputs = [

pkgs/applications/science/electronics/gtkwave/default.nix

@@ -1,10 +1,10 @@
 {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, xz, tcl, tk, judy} :
 stdenv.mkDerivation rec {
-  name = "gtkwave-3.3.20";
+  name = "gtkwave-3.3.28";
 
   src = fetchurl {
     url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "0r2yh8a5rrxjzvykdmqlb098wws5c9k255saf2bsdchnigs8il3n";
+    sha256 = "0y3dmx39xwc3m23fwjkxvp9gqxpckk8s5814nhs8fnxa384z5cz0";
   };
 
   buildInputs = [ gtk gperf pkgconfig bzip2 xz tcl tk judy];

pkgs/applications/science/logic/hol_light/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchsvn, writeScript, ocaml, findlib, camlp5}:
 
 stdenv.mkDerivation rec {
-  name = "hol_light-20110813";
+  name = "hol_light-20111106";
   src = fetchsvn {
     url = http://hol-light.googlecode.com/svn/trunk;
-    rev = "102";
+    rev = "112";
-    sha256 = "5b972672db6aa1838dc5d130accd9ab6a62030c6b0c1dc4b69e42088b1ae86c9";
+    sha256 = "6c7b39ea024b2e8042c1a22a01f778caedaaf82189c9f2c1cfa8c08707151129";
   };
 
   buildInputs = [ ocaml findlib camlp5 ];

pkgs/applications/science/logic/isabelle/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   inherit name theories;
 
   src = fetchurl {
-    url = "http://www.cl.cam.ac.uk/research/hvg/${pname}/dist/${name}.tar.gz";
+    url = http://isabelle.in.tum.de/website-Isabelle2011/dist/Isabelle2011.tar.gz;
     sha256 = "ea85eb2a859891be387f020b2e45f8c9a0bd1d8bbc3902f28a429e9c61cb0b6a";
   };
 

pkgs/applications/science/logic/matita/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, camlp5, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet, ulex08, camlzip, ocaml_pcre }:
+{stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet, ulex08, camlzip, ocaml_pcre }:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     sha256 = "04sxklfak71khy1f07ks5c6163jbpxv6fmaw03fx8gwwlvpmzglh";
   };
 
-  buildInputs = [ocaml camlp5 findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre ];
+  buildInputs = [ocaml findlib gdome2 ocaml_expat gmetadom ocaml_http lablgtk lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet ulex08 camlzip ocaml_pcre ];
 
   postPatch = ''
     BASH=$(type -tp bash)

pkgs/applications/science/math/maxima/default.nix

@@ -2,7 +2,7 @@
 
 let
   name    = "maxima";
-  version = "5.25.0";
+  version = "5.25.1";
 
   searchPath =
     stdenv.lib.makeSearchPath "bin"
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz";
-    sha256 = "49c90fb809f5027787600050503476193db3620fd9517f620b82ad492ba30c0a";
+    sha256 = "8e98ad742151e52edb56337bd62c8a9749f7b598cb6ed4e991980e0e6f89706a";
   };
 
   buildInputs = [sbcl texinfo perl makeWrapper];

pkgs/applications/science/math/wxmaxima/default.nix

@@ -2,14 +2,14 @@
 
 let
   name    = "wxmaxima";
-  version = "11.04.0";
+  version = "11.08.0";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${name}/wxMaxima-${version}.tar.gz";
-    sha256 = "1dfwh5ka125wr6wxzyiwz16lk8kaf09rb6lldzryjwh8zi7yw8dm";
+    sha256 = "dfa25cc15de52829a93da624d42344213cc979351b5fcd3dff2afed6738832df";
   };
 
   buildInputs = [wxGTK maxima makeWrapper];

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

@@ -48,8 +48,9 @@ rec {
   gitAnnex = lib.makeOverridable (import ./git-annex) {
     inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which;
     inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
-      HTTP testpack monadControl hS3 mtl network hslogger hxt json;
+      HTTP testpack hS3 mtl network hslogger hxt json;
     QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1;
+    monadControl = haskellPackages.monadControl_OBSOLETE;
   };
 
   qgit = import ./qgit {
@@ -100,7 +101,8 @@ rec {
   };
 
   svn2git = import ./svn2git {
-    inherit stdenv fetchgit qt47 subversion apr;
+    inherit stdenv fetchgit ruby makeWrapper;
+    git = gitSVN;
   };
 
   gitSubtree = import ./git-subtree {

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

@@ -4,14 +4,14 @@
 }:
 
 let
-  version = "3.20111025";
+  version = "3.20111203";
 in
 stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";
-    sha256 = "1ae0fd9551d3397d1b7e5bc1eba9aab47b803bac680c3d019ba6ef7cefe96d27";
+    sha256 = "236a8fa537be1738a16afcab8a7438dc567dce75a6b71b62780d31048428f74b";
   };
 
   buildInputs = [

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

@@ -8,7 +8,7 @@
 }:
 
 let
-  version = "1.7.7";
+  version = "1.7.8";
   svn = subversionClient.override { perlBindings = true; };
 in
 stdenv.mkDerivation {
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "1xkpyd6mff4m8kmk4vkwi7snr2ff2nmrmsa5hf9bk2a93v07p5ss";
+    sha256 = "ede41a79c83e0d8673ed16c64d5c105e404d953591f9611e44c3964130da0713";
   };
 
   patches = [ ./docbook2texi.patch ];

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

@@ -1,25 +1,30 @@
-{ stdenv, fetchgit, qt47, subversion, apr}:
+{ stdenv, fetchgit, ruby, makeWrapper, git }:
 
 stdenv.mkDerivation rec {
-  name = "svn2git";
+  name = "svn2git-2.1.0-20111206";
 
   src = fetchgit {
-    url = http://git.gitorious.org/svn2git/svn2git.git;
+    url = https://github.com/nirvdrum/svn2git;
-    rev = "197979b6a641b8b5fa4856c700b1235491c73a41";
+    rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848";
-    sha256 = "7be1a8f5822aff2d4ea7f415dce0b4fa8c6a82310acf24e628c5f1ada2d2d613";
+    sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca";
   };
 
-  buildPhase = ''
+  buildInputs = [ ruby makeWrapper ];
-    sed -i 's|/bin/cat|cat|' ./src/repository.cpp
-    qmake
-    make CXXFLAGS='-I${apr}/include/apr-1 -I${subversion}/include/subversion-1 -DVER="\"${src.rev}\""'
-  '';
 
-  installPhase = ''
+  buildPhase = "true";
-    ensureDir $out/bin
-    cp svn-all-fast-export $out/bin
-  '';
 
-  buildInputs = [subversion apr qt47];
+  installPhase =
+    ''
+      mkdir -p $out
+      cp -r lib $out/
       
+      mkdir -p $out/bin
+      substituteInPlace bin/svn2git --replace '/usr/bin/env ruby' ${ruby}/bin/ruby
+      cp bin/svn2git $out/bin/
+      chmod +x $out/bin/svn2git
+      
+      wrapProgram $out/bin/svn2git \
+        --set RUBYLIB $out/lib \
+        --prefix PATH : ${git}/bin
+    '';
 }

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

@@ -1,18 +1,21 @@
-{ stdenv, fetchurl, python, makeWrapper, docutils
+{ stdenv, fetchurl, python, makeWrapper, docutils, unzip
 , guiSupport ? false, tk ? null, ssl, curses }:
 
-stdenv.mkDerivation rec {
+let
-  name = "mercurial-1.9.2";
+  name = "mercurial-2.0";
+in
+stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "481309264d8528a871aab013068c48fa3a6072b016a4095a22230cfdfb8bb9aa";
+    sha256 = "1565ns768vgvsqx6pn5q9r2670lmvq8y4zy0jwgwfx2h9n5bgymg";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
   pythonPackages = [ ssl curses ];
 
-  buildInputs = [ python makeWrapper docutils ];
+  buildInputs = [ python makeWrapper docutils unzip ];
 
   makeFlags = "PREFIX=$(out)";
 
@@ -42,6 +45,8 @@ stdenv.mkDerivation rec {
       chmod u+x $out/share/cgi-bin/hgweb.cgi
     '';
 
+  doCheck = false;  # The test suite fails, unfortunately. Not sure why.
+
   meta = {
     description = "A fast, lightweight SCM system for very large distributed projects";
     homepage = http://www.selenic.com/mercurial/;

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

@@ -19,13 +19,13 @@ assert compressionSupport -> neon.compressionSupport;
 
 stdenv.mkDerivation rec {
 
-  version = "1.7.1";
+  version = "1.7.2";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "mirror://apache/subversion//${name}.tar.bz2";
-    sha1 = "4bfaa8e33e9eaf26a504117cd91b23805518071a";
+    sha1 = "8c0824aeb7f42da1ff4f7cd296877af7f59812bb";
   };
 
   buildInputs = [ zlib apr aprutil sqlite ]

pkgs/applications/video/bangarang/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, kdemultimedia, taglib, glibc, gettext }:
+{ stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, soprano, shared_desktop_ontologies, kdemultimedia, taglib, glibc, gettext }:
 stdenv.mkDerivation rec {
   name = "bangarang-2.0";
 
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     sha256 = "1fixqx56k0mk0faz35rzpdg6zaa0mvm4548rg0g7fhafl35fxzlz";
   };
 
-  buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano kdemultimedia taglib glibc gettext ];
+  buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano shared_desktop_ontologies kdemultimedia taglib glibc gettext ];
 
   meta = with stdenv.lib; {
     description = "A media player for KDE based on Nepomuk and Phonon";

pkgs/applications/video/dvb-apps/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation {
+  name = "dvb-apps-7f68f9c8d311";
+
+  src = fetchurl {
+    url = "http://linuxtv.org/hg/dvb-apps/archive/7f68f9c8d311.tar.gz";
+    sha256 = "0a6c5jjq6ad98bj0r954l3n7zjb2syw9m19jksg06z4zg1z8yg82";
+  };
+
+  buildInputs = [ perl ];
+
+  configurePhase = "true"; # skip configure
+
+  installPhase = "make prefix=$out install";
+
+  meta = {
+    description = "Linux DVB API applications and utilities";
+    homepage = http://linuxtv.org/;
+    platforms = stdenv.lib.platforms.linux;
+    license = "GPLv2";
+  };
+}

pkgs/applications/video/quvi/library.nix

@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts}:
+
+stdenv.mkDerivation rec {
+  name = "libquvi-${version}";
+  version="0.4.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/quvi/libquvi-${version}.tar.gz";
+    sha256 = "15cm9j8dssn2zhplqvlw49piwfw511lia6b635byiwfniqf6dnwp";
+  };
+
+  buildInputs = [ pkgconfig lua5 curl quvi_scripts ];
+
+  meta = { 
+    description = "Quvi is a web video downloader.";
+    homepage = http://quvi.sf.net;
+    license = "LGPLv2.1+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.mornfall ]; 
+  };
+}
+

pkgs/applications/video/quvi/scripts.nix

@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig}:
+
+stdenv.mkDerivation rec {
+  name = "quvi-scripts-${version}";
+  version="0.4.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/quvi/libquvi-scripts-${version}.tar.gz";
+    sha256 = "14p1sn7id4n35isaw3i3h8vsgfqlym09fih9k5xfqwsg6n7xdvq5";
+  };
+
+  buildInputs = [ pkgconfig ];
+
+  meta = { 
+    description = "Quvi is a web video downloader.";
+    homepage = http://quvi.sf.net;
+    license = "LGPLv2.1+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.mornfall ]; 
+  };
+}
+

pkgs/applications/video/quvi/tool.nix

@@ -0,0 +1,22 @@
+{stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi}:
+
+stdenv.mkDerivation rec {
+  name = "quvi-${version}";
+  version="0.4.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/quvi/quvi-${version}.tar.gz";
+    sha256 = "0qzyj55py4z7pg97794jjycq8nvrlr02072rgjzg8jgknw49hgfv";
+  };
+
+  buildInputs = [ pkgconfig lua5 curl quvi_scripts libquvi ];
+
+  meta = { 
+    description = "Quvi is a web video downloader.";
+    homepage = http://quvi.sf.net;
+    license = "LGPLv2.1+";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.mornfall ]; 
+  };
+}
+

pkgs/applications/video/vlc/default.nix

@@ -5,7 +5,7 @@
 , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg
 , mpeg2dec, udev, gnutls, avahi, libcddb, jackaudio, SDL, SDL_image
 , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
-, libass, libva
+, libass, libva, libdvbpsi
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     pkgconfig dbus hal fribidi qt4 libvorbis libtheora speex lua libgcrypt
     libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
     udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
-    libkate libtiger libv4l samba liboggz libass
+    libkate libtiger libv4l samba liboggz libass libdvbpsi
   ]
   ++ (with xlibs; [ xlibs.xlibs libXv libXvMC libXpm xcbutil libva ]);
 

pkgs/applications/video/xine-ui/default.nix

@@ -14,6 +14,10 @@ stdenv.mkDerivation {
       xlibs.libXinerama xlibs.libXi
     ];
 
+  preBuild = ''
+    sed -e '/curl.types.h/d' -i *.c *.h */*.c */*.h */*/*.c */*/*.h
+  '';
+
   configureFlags = "--with-readline=${readline}";
   
   NIX_LDFLAGS = "-lXext -lgcc_s";

pkgs/applications/virtualization/virtualbox/default.nix

@@ -4,14 +4,14 @@
 , xorriso, makeself, perl, jdk
 }:
 
-let version = "4.1.2"; in
+let version = "4.1.6"; in
 
 stdenv.mkDerivation {
   name = "virtualbox-${version}-${kernel.version}";
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "1g3nqlxk4bxkq5yqwk0mrn50mz5y0kxpcn0hq5f81bbb9niglc5h";
+    sha256 = "0zmbq0h9g4lamzmxqg281nr9pp88606dxh2dsw6vy1m86g5kfham";
   };
 
   buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk ];

pkgs/applications/window-managers/xmonad/default.nix

@@ -1,12 +1,13 @@
-{cabal, X11, mtl, xmessage, syb}:
+{ cabal, extensibleExceptions, mtl, utf8String, X11, xmessage }:
 
 cabal.mkDerivation (self: {
   pname = "xmonad";
-  name = "${self.fname}";
+  version = "0.10";
-  version = "0.9.2";
+  sha256 = "19z5y36pybsm93x6hlj5hzyys9r4ag7hkdib5spsnryk2mv72xj6";
-  sha256 = "07w5k3pqmybjn0zh2nr1glp69685xg2fhj3z9zxb37x5nzss7kdd";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ extensibleExceptions mtl utf8String X11 ];
   noHaddock = true;
-  propagatedBuildInputs = [X11 mtl syb];
   meta = {
     homepage = "http://xmonad.org";
     description = "A tiling window manager";

pkgs/applications/window-managers/xmonad/xmonad-contrib.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xmonad-contrib";
-  version = "0.9.2";
+  version = "0.10";
-  sha256 = "06hg5j4w8iz62wmyygq4c7xcbi9dxlhhh3dbic438cjk7c0w1h5p";
+  sha256 = "0lp7qr69rpjy4s3knhdgh2bp6zs81xp0az1lisv4a2i7i1ys7hfq";
   buildDepends = [
     extensibleExceptions mtl random utf8String X11 X11Xft xmonad
   ];

pkgs/applications/window-managers/xmonad/xmonad-extras.nix

@@ -1,15 +1,15 @@
-{ cabal, hint, mtl, network, parsec, random, split, X11, xmonad
+{ cabal, hint, HList, libmpd, mtl, network, parsec, random
-, xmonadContrib
+, regexPosix, split, X11, xmonad, xmonadContrib
 }:
 
 cabal.mkDerivation (self: {
   pname = "xmonad-extras";
-  version = "0.9.2";
+  version = "0.10.1";
-  sha256 = "54b41a4c59ff3d68b3a214d727fb5675fa7c1b90090d99e58ecae62b3dfdd701";
+  sha256 = "17rac0xjw1zw1jlc1rpq54vg50xscb3b98knk4gkb8bv1khpgz27";
   buildDepends = [
-    hint mtl network parsec random split X11 xmonad xmonadContrib
+    hint HList libmpd mtl network parsec random regexPosix split X11
+    xmonad xmonadContrib
   ];
-  configureFlags = "-f-with_hlist -f-with_mpd";
   noHaddock = true;
   meta = {
     homepage = "http://projects.haskell.org/xmonad-extras";

pkgs/build-support/builder-defs/builder-defs.nix

@@ -25,6 +25,7 @@ let inherit (builtins) head tail trace; in
                 else if (hasSuffixHack ".tar.xz" s) then "tar.xz"
                 else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip"
                 else if (hasSuffixHack "-cvs-export" s) then "cvs-dir"
+                else if (hasSuffixHack "-git-export" s) then "git-dir"
                 else if (hasSuffixHack ".nar.bz2" s) then "narbz2"
                 else if (hasSuffixHack ".rpm" s) then "rpm"
 
@@ -228,6 +229,10 @@ let inherit (builtins) head tail trace; in
                 cp -r '${s}' .
                 cd \$(basename ${s})
                 chmod u+rwX -R .
+        " else if (archiveType s) == "git-dir" then "
+                cp -r '${s}' .
+                cd \$(basename ${s})
+                chmod u+rwX -R .
         " else if (archiveType s) == "dir" then "
                 cp -r '${s}' .
                 cd \$(basename ${s})

pkgs/build-support/native-darwin-cctools-wrapper/builder.sh

@@ -1,6 +1,6 @@
 source $stdenv/setup
 
 ensureDir $out/bin
-for i in ar as c++filt gprof ld nm nmedit ranlib size strings strip dsymutil; do 
+for i in ar as c++filt gprof ld nm nmedit ranlib size strings strip dsymutil libtool; do 
     ln -s /usr/bin/$i $out/bin/
 done

pkgs/build-support/release/source-tarball.nix

@@ -6,16 +6,15 @@
 , buildInputs ? []
 , name ? "source-tarball"
 , version ? "0"
+, versionSuffix ? 
+    if officialRelease
+    then ""
+    else if src ? rev then "pre${toString src.rev}" else ""
 , src, stdenv, autoconf, automake, libtool
 , ... } @ args:
 
 let
 
-  versionSuffix =
-    if officialRelease
-    then ""
-    else if src ? rev then "pre${toString src.rev}" else "";
-
   # By default, provide all the GNU Build System as input.
   bootstrapBuildInputs =
     if (args ? bootstrapBuildInputs)

pkgs/data/misc/xkeyboard-config/default.nix

@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "0x9hkb4iqz64gcabzkdcfy4p78sdhnpjwh54g8wx5bdgy9087vpr";
   };
 
-  buildInputs = [ perl perlXMLParser xkbcomp gettext intltool ];
+  buildInputs = [ gettext ];
+
+  buildNativeInputs = [ perl perlXMLParser intltool xkbcomp ];
 
   patches = [ ./eo.patch ];
 

pkgs/desktops/e17/e_dbus/default.nix

@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, pkgconfig, ecore, eina, evas, dbus_libs }:
+{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, expat, ecore, eina, evas
+, dbus_libs }:
 stdenv.mkDerivation rec {
   name = "e_dbus-${version}";
-  version = "1.0.1";
+  version = "1.1.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "1ifkijy4ap2mlqw2nd1dlvzlppyi7bnp15bxiy40nhdly8vhpbdl";
+    sha256 = "10y68f023jjq6dinjc0brpr41acnd7clxgb0q1j2i9isalx1473z";
   };
-  buildInputs = [ pkgconfig ecore eina evas ];
+  buildInputs = [ pkgconfig zlib libjpeg expat ecore eina evas ];
   propagatedBuildInputs = [ dbus_libs ];
   configureFlags = ''
     --disable-edbus-test

pkgs/desktops/e17/ecore/default.nix

@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, evas, libX11, libXext }:
 stdenv.mkDerivation rec {
   name = "ecore-${version}";
-  version = "1.0.1";
+  version = "1.1.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "1vi03zxnsdnrjv1rh5r3v0si0b20ikrfb8hf5374i2sqvi1g65j0";
+    sha256 = "12iqhrklp3k5lvbxf7lhqd53wpl1csvricfkzlcv2nny4y3r31m0";
   };
   buildInputs = [ pkgconfig eina evas ];
   propagatedBuildInputs = [ libX11 libXext ];

pkgs/desktops/e17/edje/default.nix

@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, pkgconfig, lua, eina, eet, evas, ecore, embryo }:
+{ stdenv, fetchurl, pkgconfig, lua, expat, zlib, libjpeg, eina, eet, evas
+, ecore, embryo }:
 stdenv.mkDerivation rec {
   name = "edje-${version}";
-  version = "1.0.1";
+  version = "1.1.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0z7gjj4ccjr36ba763ijmjkya58fc173vpdw1m298zwhy8n4164j";
+    sha256 = "0fjn4psl70hkfbjmczk06if8yxarg67w5hp2i1vq49kfkpyn2cx7";
   };
-  buildInputs = [ pkgconfig lua eina eet evas ecore embryo ];
+  buildInputs = [ pkgconfig expat zlib libjpeg lua eina eet evas ecore embryo ];
   meta = {
     description = "Enlightenment's abstract GUI layout and animation object library";
     longDescription = ''

pkgs/desktops/e17/eet/default.nix

@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, zlib, libjpeg }:
 stdenv.mkDerivation rec {
   name = "eet-${version}";
-  version = "1.4.1";
+  version = "1.5.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "1hlznlmgkgzxnkmc3qgqjrc62bmwqj5af8lsh59vac2gf4jnymnc";
+    sha256 = "0csk2s0y3qllf40q06i4wqaj8y2p1csh5jxcqnlmf6lrk1ycjv32";
   };
   buildInputs = [ pkgconfig eina zlib libjpeg ];
   meta = {

pkgs/desktops/e17/eeze/default.nix

@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, ecore, udev }:
 stdenv.mkDerivation rec {
   name = "eeze-${version}";
-  version = "1.0.2";
+  version = "1.1.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0g6afhnl862clj1rfh0s4nzdnhdikylbalfp8zmsw56dj0zncynq";
+    sha256 = "10n2qd7rf1cnsgd3mhh1wd1qm7hsf1lxx1ig72xyj55i4i5dllh3";
   };
   buildInputs = [ pkgconfig eina ecore ];
   propagatedBuildInputs = [ udev ];

pkgs/desktops/e17/efreet/default.nix

@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, eet, ecore }:
 stdenv.mkDerivation rec {
   name = "efreet-${version}";
-  version = "1.0.1";
+  version = "1.1.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0fakczsrr1idyvrp04mxw51ww017kn65xa77vq8wka4js8y0nagi";
+    sha256 = "0fqrrp8dvaqhwczlh7xyh1x6wr4flpmpy6ihrjh1ywymgcvrfwkf";
   };
   buildInputs = [ pkgconfig eina eet ecore ];
   meta = {

pkgs/desktops/e17/eina/default.nix

@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
 stdenv.mkDerivation rec {
   name = "eina-${version}";
-  version = "1.0.1";
+  version = "1.1.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "1v2z1l6nqr7hnp5gki3972kprlvylpalp5wq9xdppm250z91kaas";
+    sha256 = "0h2vmvr7bmnb19n124bjvi2rddv7vm15pv19lrpc7av3idk7ic4j";
   };
   meta = {
     description = "Enlightenment's core data structure library";

pkgs/desktops/e17/embryo/default.nix

@@ -1,11 +1,12 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, pkgconfig, eina }:
 stdenv.mkDerivation rec {
   name = "embryo-${version}";
-  version = "1.0.0";
+  version = "1.1.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0ch9vps83s892vda1ss1cf1fbgzff9p51df2fip7fqlj8y1shvvx";
+    sha256 = "0nk7jajsgi5xf02yxahwr3cm7bml5477fb1mas1i7a788bw7i6zn";
   };
+  buildInputs = [ pkgconfig eina ];
   meta = {
     description = "Enlightenment's small Pawn based virtual machine and compiler";
     longDescription = ''

pkgs/desktops/e17/enlightenment/default.nix

@@ -1,9 +1,10 @@
 { stdenv, fetchurl, pkgconfig, eina, eet, evas, ecore, edje, efreet, e_dbus, embryo }:
 stdenv.mkDerivation rec {
-  name = "enlightenment-0.16.999.55225";
+  name = "enlightenment-${version}";
+  version = "0.16.999.65643";
   src = fetchurl {
-    url = "http://download.enlightenment.org/snapshots/2010-12-03/${name}.tar.gz";
+    url = "http://download.enlightenment.org/snapshots/2011-11-28/${name}.tar.gz";
-    sha256 = "1cv701fidp9mx3g5m9klmzsp0fj149rb133v1w76rzms3a0wljl1";
+    sha256 = "1bb577gbccb1wrifrhv9pzm451zhig2p29mwz55b187ls31p36kz";
   };
   buildInputs = [ pkgconfig eina eet ecore evas edje efreet e_dbus embryo ];
   configureFlags = ''

pkgs/desktops/e17/evas/default.nix

@@ -2,10 +2,10 @@
 , libX11, libXext, eina, eet }:
 stdenv.mkDerivation rec {
   name = "evas-${version}";
-  version = "1.0.1";
+  version = "1.1.0";
   src = fetchurl {
     url = "http://download.enlightenment.org/releases/${name}.tar.gz";
-    sha256 = "0xkwyvxy32dwja0i3j8r8bzlybjwlrgmrhcri1bscp3aaj75x2rx";
+    sha256 = "1qjmxn5a5qhc2slxjx7bsas76w0zlnrbs6hx9swr8xarkifjk3dv";
   };
   buildInputs = [ pkgconfig freetype fontconfig libpng libjpeg
                   libX11 libXext eina eet

pkgs/desktops/kde-4.7/default.nix

@@ -1,7 +1,7 @@
 { callPackage, callPackageOrig, stdenv, qt47 }:
 
 let
-  release = "4.7.2";
+  release = "4.7.4";
 
   # Need callPackageOrig to avoid infinite cycle
   kde = callPackageOrig ./kde-package {

pkgs/desktops/kde-4.7/kde-package/4.7.2.nix

@@ -1,273 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="blinken";value="0597y7xf6908i03mzrc4k6pfjc9fzlxc1d72rg8153j9183yadr1";}
-  {name="cantor";value="13cxw0iq0radipd75yl5pjs0qq3px9khjnphrwcq86ss9jivv70y";}
-  {name="gwenview";value="0zngbigs8g75wwfrhi5f64pxpg77fggd2d54ly4mh3kr1h79ndxs";}
-  {name="kalgebra";value="1dqiavpc91sk8418ahvv4knim0k0ifs1yj2c9bng4aq46kmi7wl5";}
-  {name="kalzium";value="0aysmjnm9iy20prx0q294szp0f9ghmj2mbcix7ds8977l630pkhm";}
-  {name="kamera";value="1kbfhfr3l7iffv4lb8fzik8zdx9kqskpalzr76i7awdba0qqx37n";}
-  {name="kanagram";value="16f37j66lpyg96f3clrh856fl4chlpmxlg3pqjp6lfad47b1191r";}
-  {name="kate";value="1qhvchk1kvs4a9hsd2zxfvn6hrnn883ic8ba6pvwnzvqpdaqijq4";}
-  {name="kbruch";value="0hxcdwyybwsxg07vl83hypn8xzpnn5747zapwv2sg2hxwkccw4sj";}
-  {name="kcolorchooser";value="0hp849nb3hhn48d49kdbl8b95d1l5ychgc6qwfn9nvrvhazgs51q";}
-  {name="kdeaccessibility";value="179k9wmy5j0iig3n0xlzpry7j0li6bv7q1wpqra5hsmlk3ns440s";}
-  {name="kdeadmin";value="0mycw08xw2gbqd09mz6vxwhpxmn6c2isch4kaisha61zz8rm827p";}
-  {name="kdeartwork";value="0cq75mz1s6qbaargdpk435bnllvk6a33zspplw33y9q4l3xyih74";}
-  {name="kde-baseapps";value="1yhbfr1nrdkyklyayvbfdbm1jhdyvkgic9dx1dxpbjfgv552h10i";}
-  {name="kdegames";value="046kk60y7ajv4vagffhnc6jpslmggs1700ds4xl5ina2vhazwl31";}
-  {name="kdegraphics-strigi-analyzer";value="029zw71xc2r3g5d58yv09vzwyv7zd9r87vs1sqpa8jglpysaml9j";}
-  {name="kdegraphics-thumbnailers";value="0sp44m3nn2vv926h91f13kar2zi30l1y445jcdinlpckbzkgyyc8";}
-  {name="kdelibs";value="0f4b7ycs79qx360mhwf1jsbcawhp0sp76pbk46d20g0ms8rhp9xz";}
-  {name="kdemultimedia";value="0078gfx96bqzj26lwyz6jpln07963v4w8qqxg5wc53sd3w8f39m5";}
-  {name="kdenetwork";value="0vy3ygqszy8ishb4sbipvil148yhv73r8mbj6p10lqnrrah0c5n6";}
-  {name="kdepim";value="0c36q3z1krwpzx2naj1gqirvsvl5sadh0an9csa2159vqyzxld8n";}
-  {name="kdepimlibs";value="016jazpgnpzcvxvzn43fl5ihw13ckq16ggb97fzmpahkrh01yyc2";}
-  {name="kdepim-runtime";value="00a89zzqh7005ig4lxz1fypdb0hmxwibs78yk0fyr5qdjdd3i90k";}
-  {name="kdeplasma-addons";value="0cf93s7g3zbrdmkwia0djj7x5qas2q77vgajpab8cwj3r6cnm5bi";}
-  {name="kde-runtime";value="0b8sq97xi0mh0iiwzrfzar3kv2dsiljq3c2bbxgvwlf942g7w5j6";}
-  {name="kdesdk";value="1gi0p4xgyaflkwyv8fmcjfsc6gav83k78ib8awy42cwn8bwpsdy9";}
-  {name="kdetoys";value="0sd9p4rldz07w6sbwsx5b1iwgpljhkycphlnj698qll2dqrjm6b1";}
-  {name="kdeutils";value="15igw1jnvzdr1jf6jbip1xw5lj5kpk6ffgp6wmnlyssmqj7i7snd";}
-  {name="kde-wallpapers";value="0hcgjrqdj1lvgy098lglca1mi77gdg4332hp494klwvmhny1j0li";}
-  {name="kdewebdev";value="0g4fw17pivck9av8xd6dij6q70vr4zjbr2cpngrm0nmzyl5xiky7";}
-  {name="kde-workspace";value="1c4y7wnizj7b9nq97yypi80ylsli7pny5pzdr477015dh1kls5va";}
-  {name="kgamma";value="14p5xwdlyg8za1rwp809axfnybgm0dxhxhpfr97gslqqsnncfq74";}
-  {name="kgeography";value="114m0bs18bjl0f1rvp2v0w6wi0zkw1qk9dy5z8axk5q8dykhxdxs";}
-  {name="khangman";value="07rsfx6lmhfvbm46bzl01cg3l6rbib3phwnf5xdq1b6rifw5d5ks";}
-  {name="kig";value="0264vyq18rx16nq62vqk1g5ip5i7gnpy9x6z6f6p6vdqfb1bankn";}
-  {name="kimono";value="1pkzr2d6axwrbf7n10d48fmkxa1l7i79nf39p12abkh5gy5k6rbn";}
-  {name="kiten";value="0clbfp5n5mvkps6f4c9jx4bfb367c3461sy6yrl35q32j2s0d7dh";}
-  {name="klettres";value="16ywszx3nr6lszdx6sj0cc5nv92db1j7wxn8np24ijvhvvf2qv6c";}
-  {name="kmplot";value="0y7zs9zacx73hbxab2w15h1rpvdsqcncpn80qkhgfg7kiw1mgnvy";}
-  {name="kolourpaint";value="1s2zhw4mc2pq1bzbgkd37iswz8bar38vhvind7xl14n7fmh1a456";}
-  {name="konsole";value="0f3dwwfcrqa0qyqhjzl7r0v5yc91j018gxbyka0633r5v657yp2a";}
-  {name="korundum";value="1d94rlaj89yshvywv3nwvbg7yjdysmxxv9zi4q4lfa8f210pay6b";}
-  {name="kross-interpreters";value="0d3gjj1mj8nzawdcn5g60khmzh8k9jxn8invzy9xcdywdbpdyda2";}
-  {name="kruler";value="1gb7p0b6zbcq2kjf74rcblxjyzn6ffy4pp4mfhynhcnh2fv0nniw";}
-  {name="ksaneplugin";value="04lzyibnxmskszrb6f3k85lxc8ifrlwy71pqy080bfxsmw6avsra";}
-  {name="ksnapshot";value="0rvz9vr2xaq7ixf0rm7snlhkam9cga0w10vmglsrylwi2cch1j59";}
-  {name="kstars";value="13xdbigh7rjcy9ycywz5h3r3q918yqsjdwf4b56w63bi89bf69yx";}
-  {name="ktouch";value="0xxzw58v6395vqs45n2d8865ixyjpqzjna2ahw8j0hv997x4cmc4";}
-  {name="kturtle";value="18hcy1zwyi1s90ypm2sh3s6myqz5hkrsjgyyiabk44rw8ikgsa8a";}
-  {name="kwordquiz";value="1zl21d58z8qrrs898czba902rzvz0xr9ndm1dychnrwmbzm5rjj8";}
-  {name="libkdcraw";value="0lzia65czgrqkl31sfzpnvpzqhrm01zx6vxr3fx0ckmz35rmy5sk";}
-  {name="libkdeedu";value="1bj1f92b408ccf55icsvk0yssp7ilsglcz0k1j5z1bc9lzmdfn3h";}
-  {name="libkexiv2";value="0wfzskm6c96cf7k6f29spxy1x2p15wkmn3r4n3qpxlc8wk4psrg1";}
-  {name="libkipi";value="0nf9cx0p2allmhfbl2yab5xi6mrc9gqkfmndfjdd271bwrgy4w1y";}
-  {name="libksane";value="0zaygvwxxs2i2jprkn6l7mmr5563523xgv19h7chfqbwg4r3y6yc";}
-  {name="marble";value="1i1k2shnzkr0dddd7f6l6xxfhgn0dvvx3bqk596avzpn4bsxinfr";}
-  {name="mobipocket";value="0j9saz9chk2v2jcpiyv3b43z8hpdf4npxfnjqhahqq71pv13fzyi";}
-  {name="okular";value="1qalyxr3cc78yk18601l1z4sflw5bg96jy1c1pkg79zjcdrb1n7x";}
-  {name="oxygen-icons";value="0814knrcisp0mpcr9fcmmbpf140s8jbdrrzw4k3rnk81vffh8w8y";}
-  {name="parley";value="10wkkv3fknbv7d56rnfz1vzs3npyfa9c4b7bmaqzj0399p7l1k65";}
-  {name="perlkde";value="1za9gvh8pvdb9wp79cf9sv1f6hn8is7nq4is9qh46k56z2pgzp92";}
-  {name="perlqt";value="1xindf7sb22wisvcqrfgjb6kjcx4vhapijjgkf2j9xyjlx4fiafa";}
-  {name="pykde4";value="1qap0n4kd247nl5bn9l1015ajpmbzwafqznf8a3i36f77yg1misf";}
-  {name="qtruby";value="1p1f1qkfzr5kl88pgb90slm27vi1yjxxbi62rph0qdkp9crhvgn4";}
-  {name="qyoto";value="1yb99hqqsrw28nf2zhaq6v3aw67qvl83jylgr47rczixdgazzqg0";}
-  {name="rocs";value="1lzkvww0ygq6cl6qzsnmbblbnp4lxhzvc8kiapn7ydcyas7sy21z";}
-  {name="smokegen";value="0yb8w6n8dyivcq97xkqxws60zqzqzh6babml1g022yb35ka4f2dk";}
-  {name="smokekde";value="1zqm1gxbdpvccx777v2vy200n314nrvslabf2mb1y61dxqwkvkmi";}
-  {name="smokeqt";value="0qhksy9z03kfmgbgvnch4vxbxyzcng0f7cy337s50cnh4rabl017";}
-  {name="step";value="01hdl1z7sd2a5sgx1n96anbwsvs6dmd3r4q8dpn5ha657xc38qy1";}
-  {name="svgpart";value="05199j918xk16bq5mmqdc2w3agrknngxsrk5gxas6rflhg8v4qz3";}
-];
-modules=[
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
-    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
-    { name="kgamma";  }
-    { name="kolourpaint";  }
-    { name="kruler";  }
-    { name="ksaneplugin";  }
-    { name="ksnapshot";  }
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="libkipi";  }
-    { name="libksane";  }
-    { name="mobipocket";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="blinken";  }
-    { name="cantor";  }
-    { name="kalgebra";  }
-    { name="kalzium";  }
-    { name="kanagram";  }
-    { name="kbruch";  }
-    { name="kgeography";  }
-    { name="khangman";  }
-    { name="kig";  }
-    { name="kiten";  }
-    { name="klettres";  }
-    { name="kmplot";  }
-    { name="kstars";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
-    { name="marble";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="kimono";  }
-    { name="korundum";  }
-    { name="kross-interpreters"; sane="kross_interpreters"; }
-    { name="perlkde";  }
-    { name="perlqt";  }
-    { name="pykde4";  }
-    { name="qtruby";  }
-    { name="qyoto";  }
-    { name="smokegen";  }
-    { name="smokekde";  }
-    { name="smokeqt";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-    { name="konsole";  }
-  ];
-}
-{ module="kdeaccessibility";  split=false;
-  pkgs=[
-    { name="kaccessible"; }
-    { name="kmag"; }
-    { name="kmouth"; }
-    { name="kmousetool"; }
-    { name="jovie"; }
-  ];
-
-}
-{ module="kdeadmin";  split=false;
-  pkgs=[
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kuser"; }
-    { name="kcron"; }
-    { name="ksystemlog"; }
-    { name="system-config-printer-kde"; sane="system_config_printer_kde";}
-  ];
-
-}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="sounds"; }
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-    { name="aurorae"; }
-  ];
-
-}
-{ module="kdegames";  split=false;}
-{ module="kdelibs";  split=false;}
-{ module="kdemultimedia";  split=false;}
-{ module="kdenetwork";  split=false;
-  pkgs=[
-    { name="kfile-plugins"; sane="kfile_plugins";}
-    { name="kget"; }
-    { name="kopete"; }
-    { name="krdc"; }
-    { name="kppp"; }
-    { name="krfb"; }
-    { name="kdnssd"; }
-    { name="filesharing"; }
-  ];
-
-}
-{ module="kdepim";  split=false;}
-{ module="kdepimlibs";  split=false;}
-{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
-{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
-{ module="kde-runtime"; sane="kde_runtime"; split=false;}
-{ module="kdesdk";  split=false;
-  pkgs=[
-    { name="cervisia"; }
-    { name="lokalize"; }
-    { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";}
-    { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
-    { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
-    { name="kcachegrind"; }
-    { name="kapptemplate"; }
-    { name="kpartloader"; }
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kioslave"; }
-    { name="okteta"; }
-    { name="kmtrace"; }
-    { name="kompare"; }
-    { name="kprofilemethod"; }
-    { name="kstartperf"; }
-    { name="kuiviewer"; }
-    { name="poxml"; }
-    { name="scripts"; }
-    { name="umbrello"; }
-  ];
-
-}
-{ module="kdetoys";  split=false;
-  pkgs=[
-    { name="kteatime"; }
-    { name="ktux"; }
-    { name="amor"; }
-  ];
-
-}
-{ module="kdeutils";  split=false;
-  pkgs=[
-    { name="ark"; }
-    { name="kcalc"; }
-    { name="kremotecontrol"; }
-    { name="kdf"; }
-    { name="kfloppy"; }
-    { name="printer-applet"; sane="printer_applet";}
-    { name="filelight"; }
-    { name="kcharselect"; }
-    { name="kgpg"; }
-    { name="ktimer"; }
-    { name="kwallet"; }
-    { name="sweeper"; }
-    { name="superkaramba"; }
-  ];
-
-}
-{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
-{ module="kdewebdev";  split=false;
-  pkgs=[
-    { name="klinkstatus"; }
-    { name="kfilereplace"; }
-    { name="kimagemapeditor"; }
-    { name="kommander"; }
-  ];
-
-}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
-{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
-];
-}

pkgs/desktops/kde-4.7/kde-package/4.7.4.nix

@@ -0,0 +1,273 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="blinken";value="16daqg0bbkci305qrcrvpv66cvshjfni5rf5gakblcn8qqlmwsi6";}
+  {name="cantor";value="0wgm0j9bl632bk94fi0hzp5s392xpyz0d524ahhi8q33bqkl06ra";}
+  {name="gwenview";value="1dhpb7q0myr9rl4bjsajq0kslvhxcddv1ddplqad63j619wk8gfj";}
+  {name="kalgebra";value="04g07syrk14kpr15f9kgfkkmkjgdvcwmrykmy56jwm8sfb6ncli9";}
+  {name="kalzium";value="0k25cinwp6yjp8q9irmwcb1ahf98ck3mw706jfpybpa7ds8ym5z1";}
+  {name="kamera";value="0airyhxzpnvpzag4w0q1h0pc1lwwplglki5max1mj5miaxg93r34";}
+  {name="kanagram";value="0271aq39dbs92rhc83m19pmm7rx5c573k27931sf3j3pw3x2q0nm";}
+  {name="kate";value="0pfddi7g99apqipnqv62i86ld11vl4igqv65xprqqf0a5a1413my";}
+  {name="kbruch";value="1dhhk55d3bs474l2w0xma89pq74gklq5faskrvd1lvvl853z3zib";}
+  {name="kcolorchooser";value="1gb861f1fy0fvmkg30l1gza998gyhjwj4gcyyv266wp5v7d01xda";}
+  {name="kdeaccessibility";value="12mvs1hy5ygnbbz14hg2fvs7mpvlamkfbz7g7kcvzp0fkjb524h3";}
+  {name="kdeadmin";value="16y73zpdgh72cf8yz8zn246i4d8nh4k6mbz9cbc4ggjblgjcn3pr";}
+  {name="kdeartwork";value="0vfz9mzpm8yy6fysmhcavd8l1fjcld36p0x9qymi4l072b7dkgyv";}
+  {name="kde-baseapps";value="075m3nn407di2mx8w5lv7va3ij0yd7yb575wmf05vfqr01xyhn8a";}
+  {name="kdegames";value="0c42wyk2mq3hz99zg4f9i2dbc9vyaa5l2301j0859pwvnp9zgafz";}
+  {name="kdegraphics-strigi-analyzer";value="1j7chf76mlwrq7z1dgm525f5srx1h30czm8dnw2f0yxfn18lvnl9";}
+  {name="kdegraphics-thumbnailers";value="1ny51jc8fm4gldrlmrfmslpfpn5pahlyws3jzaj6nkd3hdw3krnr";}
+  {name="kdelibs";value="0fdgl8qvpyb9pmb26b3yjfm9ib75mxayw75qm5kyzncmrvn427gy";}
+  {name="kdemultimedia";value="0a0vp1pq159lzgd0x817p9mf6al99w1dwnlyhs9zfpspgz8nw8y1";}
+  {name="kdenetwork";value="0zwqbyl5vw5nnzlilc4khlisjj1xjpziw9ahgvw8cbszscmv68b5";}
+  {name="kdepim";value="0s38qxks58dmwyi3fnvprpq5q9kr17v31n808j33d50rw62y398p";}
+  {name="kdepimlibs";value="0rpfkc0pxvfkaz8pb3yx21dm3ixw8gfrcdny1aqzbn3f7f8abhip";}
+  {name="kdepim-runtime";value="14p5bxrhqjnmz303hxlrdj4vxlmiv8j04qni33ljbgib0hnllva3";}
+  {name="kdeplasma-addons";value="068m2jpyprrscyk3f4nk9qix5smka5pq59sdwdan9996sh256py5";}
+  {name="kde-runtime";value="06nxv46s7ff5n3kmzq3mdc16b0ck0411lj0gf3scdyd85iqx06wd";}
+  {name="kdesdk";value="0v3gwml9rvqz96q8jk8myqvl6gjw3q37js2jn24yawli3sjjw552";}
+  {name="kdetoys";value="17fk1bmabgj9nz0m4j248f48m2xfscql43wmzkqnr7y6zghqfhfh";}
+  {name="kdeutils";value="0s1whgg59xnc6ny609s3vjzvpxak02f2y6v7zw72i808k03aal5v";}
+  {name="kde-wallpapers";value="133amrhhca4xi0gbmajcc6rw1c1ai5x29265fqp45588kyycbgvz";}
+  {name="kdewebdev";value="1nqp2j09nr3jhmfvjydwp86jz4nn5pxwcfi6ww9krfd1hyg4aqjc";}
+  {name="kde-workspace";value="1dj39nndpws9grinz287ypn5lj3zjh96gl4zhl7kp6z8f9mdqp0p";}
+  {name="kgamma";value="05vk5b40w0i75nx5lqn9qax10m604jkjxyxynm0i0b8gyksv78h9";}
+  {name="kgeography";value="1a49zqz8zb9kn7m4m5fsm5ibvn9m5pzq89isrd1yy9q7zlv3qfqc";}
+  {name="khangman";value="1bmzrc5jzbw9q9gxw9pzad37zj4h89rh3k4smycif6ky2jy72x6d";}
+  {name="kig";value="1s0mwnj2riam811l0nfk08ja43f0nibqaqchy2ff7627w22yr5m0";}
+  {name="kimono";value="1cbbchdj4x5sn6ldkmzrx5alhvgzgbprvyjpg1rcsfnyc6whp2p9";}
+  {name="kiten";value="13bcw1r39h0g75vwbyrsh8sb27vmqsbrmx2ay621ily4iy3jn5az";}
+  {name="klettres";value="1wczh41wq3w5ccy2yi4pqr3zk4v0wiy4slcn54a8bfi1b5s1267j";}
+  {name="kmplot";value="0dx5gnya008q7smf74fvygwfsa0hc2ajiznvdmf4qmm3s5bxpbrr";}
+  {name="kolourpaint";value="14zrh321av5f5i8a4bjj7xb1sqfcphzhc5qyg2w54cywaiswy8nx";}
+  {name="konsole";value="1wq2k8g6in86x72jzhz4ar8ba5lyjp0pia969wxa6b1vsj148ipy";}
+  {name="korundum";value="024daf05c9l83whcy0cfgxb3s24ci038kg1pnxlzz4z9sk39432r";}
+  {name="kross-interpreters";value="1kkg4w3id2g7nr89kjdgyy9hik75dnxlm6jmn3g8ilqdvw5ip1qx";}
+  {name="kruler";value="0wd805w2k1ask9l44z50jcd033zkbaxs3xd3w21qrwdvs52x8m41";}
+  {name="ksaneplugin";value="1rxpl6f5b0ld5ap6aag892rjd7r74szbzd6lqw8q8gzm6jmk34gq";}
+  {name="ksnapshot";value="0dn99b6qr4b4hc3c88m26axmb3jim836ig3mfgqpban9r7k15xci";}
+  {name="kstars";value="0zrw4rlfm5cwfbj884zn50sdp90zjg7inl9k2zj450dpvh7i6q3q";}
+  {name="ktouch";value="0vbzr69jbci058bcphf9i3fh40hwgrmcyj1n4gj90gwr4x2ha5hp";}
+  {name="kturtle";value="0mhg2b1jbywafnj93274yimvnaxivycqj98pvld3hppaq32f7vzp";}
+  {name="kwordquiz";value="0kfa83a91w8z39r55456i1vn85pb4dqrbav40sx5fhjb03iyrsdk";}
+  {name="libkdcraw";value="14y8ni9w441zx1k2fhcbnzpa1vcmpvk58mjdqrqvn8n630cy0hzn";}
+  {name="libkdeedu";value="1ga88g5s8mq1m8xwmhl09ylrnl8sw639cpah6wi8wwnqslj2zj0a";}
+  {name="libkexiv2";value="0w8mpjsiw2sr8ya7ffnvnprbsbi8ngpxrcxylgw617zcxpxky6ha";}
+  {name="libkipi";value="01fivyyg5jhnkn9r7bh96ygxvnh7a99h11wh228wk8nzx3i63lsc";}
+  {name="libksane";value="0bb26ajfmknxf4hdy513zx1q9j0hzrs0dr98vxmrwfxxbza67fbm";}
+  {name="marble";value="02yljp6lmqs753zkqpaz58zlrjjxydx9pizppzwjvjx8xk63b9z6";}
+  {name="mobipocket";value="0m08j4cdj2sr1xw3hi0zy651c2ap0q8y9s913r6ccm0f292n0856";}
+  {name="okular";value="03x1fgdnz0s17wj3pkdp77rqrbbb6ssgq0ly493pbi1x4lx768ib";}
+  {name="oxygen-icons";value="0ayx0y2swdcgz4wd1idkhm3gbixkn4mw89f1hrhrdvc6j7wdn2dj";}
+  {name="parley";value="0wgps4adiwaq3l471ig9j56vm7p2xf37779nlhfzavby622lyv8q";}
+  {name="perlkde";value="1psa8ca2ynmavhmbh5p8bgxiljiqj6figi3cmvkaa7ksnmg2p9a3";}
+  {name="perlqt";value="1v12vx46kmg9cgld7krphcqp97y0py1bc3s2gd6jbz5j48g1wznb";}
+  {name="pykde4";value="07c7rzi0rzafrh92m57ldz3v66v8996zqpgcqn351jfycwccg7pz";}
+  {name="qtruby";value="05j08dfqbqnj92k9n70x8yiiaxyk6p9sk3lwm8w8nhsxdciq8yny";}
+  {name="qyoto";value="1maq0c6qb618jiqrdfp4imq3x7x5rdgf80wbrsf8wmaz3iwg18jz";}
+  {name="rocs";value="0qqzfxas64jz95v8i0birbcp0azk01jx5ic6pny7szngwrms6k34";}
+  {name="smokegen";value="0rdaxss113l80gmzp71ngp1l07nn2ip5nhk0a3mmjkvd08i507i8";}
+  {name="smokekde";value="0cxd5y1i672wc295m2czvp5jry1lmvv88dkipd97368gxsqzd3q8";}
+  {name="smokeqt";value="0ll1q87y1sdmna4iac61cm6sn7imsfvcfq573cj7f5raqn08gbpf";}
+  {name="step";value="000a0hc45znshwrjsydrf05f5rwn7lmaiqbk65py827fgk67qkyb";}
+  {name="svgpart";value="056h2ynbl6ylfpf5a2l0qjasnicwx2yzizgd21pprzl9n7708zcw";}
+];
+modules=[
+{
+  module="kdegraphics";
+  split=true;
+  pkgs=[
+    { name="gwenview";  }
+    { name="kamera";  }
+    { name="kcolorchooser";  }
+    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
+    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
+    { name="kgamma";  }
+    { name="kolourpaint";  }
+    { name="kruler";  }
+    { name="ksaneplugin";  }
+    { name="ksnapshot";  }
+    { name="libkdcraw";  }
+    { name="libkexiv2";  }
+    { name="libkipi";  }
+    { name="libksane";  }
+    { name="mobipocket";  }
+    { name="okular";  }
+    { name="svgpart";  }
+  ];
+}
+{
+  module="kdeedu";
+  split=true;
+  pkgs=[
+    { name="blinken";  }
+    { name="cantor";  }
+    { name="kalgebra";  }
+    { name="kalzium";  }
+    { name="kanagram";  }
+    { name="kbruch";  }
+    { name="kgeography";  }
+    { name="khangman";  }
+    { name="kig";  }
+    { name="kiten";  }
+    { name="klettres";  }
+    { name="kmplot";  }
+    { name="kstars";  }
+    { name="ktouch";  }
+    { name="kturtle";  }
+    { name="kwordquiz";  }
+    { name="libkdeedu";  }
+    { name="marble";  }
+    { name="parley";  }
+    { name="rocs";  }
+    { name="step";  }
+  ];
+}
+{
+  module="kdebindings";
+  split=true;
+  pkgs=[
+    { name="kimono";  }
+    { name="korundum";  }
+    { name="kross-interpreters"; sane="kross_interpreters"; }
+    { name="perlkde";  }
+    { name="perlqt";  }
+    { name="pykde4";  }
+    { name="qtruby";  }
+    { name="qyoto";  }
+    { name="smokegen";  }
+    { name="smokekde";  }
+    { name="smokeqt";  }
+  ];
+}
+{
+  module="kde-baseapps";
+sane="kde_baseapps";  split=true;
+  pkgs=[
+    { name="kate";  }
+    { name="kde-baseapps"; sane="kde_baseapps"; }
+    { name="konsole";  }
+  ];
+}
+{ module="kdeaccessibility";  split=false;
+  pkgs=[
+    { name="kaccessible"; }
+    { name="kmag"; }
+    { name="kmouth"; }
+    { name="kmousetool"; }
+    { name="jovie"; }
+  ];
+
+}
+{ module="kdeadmin";  split=false;
+  pkgs=[
+    { name="strigi-analyzer"; sane="strigi_analyzer";}
+    { name="kuser"; }
+    { name="kcron"; }
+    { name="ksystemlog"; }
+    { name="system-config-printer-kde"; sane="system_config_printer_kde";}
+  ];
+
+}
+{ module="kdeartwork";  split=false;
+  pkgs=[
+    { name="ColorSchemes"; }
+    { name="IconThemes"; }
+    { name="emoticons"; }
+    { name="kscreensaver"; }
+    { name="kwin-styles"; sane="kwin_styles";}
+    { name="sounds"; }
+    { name="styles"; }
+    { name="wallpapers"; }
+    { name="HighResolutionWallpapers"; }
+    { name="WeatherWallpapers"; }
+    { name="desktopthemes"; }
+    { name="aurorae"; }
+  ];
+
+}
+{ module="kdegames";  split=false;}
+{ module="kdelibs";  split=false;}
+{ module="kdemultimedia";  split=false;}
+{ module="kdenetwork";  split=false;
+  pkgs=[
+    { name="kfile-plugins"; sane="kfile_plugins";}
+    { name="kget"; }
+    { name="kopete"; }
+    { name="krdc"; }
+    { name="kppp"; }
+    { name="krfb"; }
+    { name="kdnssd"; }
+    { name="filesharing"; }
+  ];
+
+}
+{ module="kdepim";  split=false;}
+{ module="kdepimlibs";  split=false;}
+{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
+{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
+{ module="kde-runtime"; sane="kde_runtime"; split=false;}
+{ module="kdesdk";  split=false;
+  pkgs=[
+    { name="cervisia"; }
+    { name="lokalize"; }
+    { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";}
+    { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
+    { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
+    { name="kcachegrind"; }
+    { name="kapptemplate"; }
+    { name="kpartloader"; }
+    { name="strigi-analyzer"; sane="strigi_analyzer";}
+    { name="kioslave"; }
+    { name="okteta"; }
+    { name="kmtrace"; }
+    { name="kompare"; }
+    { name="kprofilemethod"; }
+    { name="kstartperf"; }
+    { name="kuiviewer"; }
+    { name="poxml"; }
+    { name="scripts"; }
+    { name="umbrello"; }
+  ];
+
+}
+{ module="kdetoys";  split=false;
+  pkgs=[
+    { name="kteatime"; }
+    { name="ktux"; }
+    { name="amor"; }
+  ];
+
+}
+{ module="kdeutils";  split=false;
+  pkgs=[
+    { name="ark"; }
+    { name="kcalc"; }
+    { name="kremotecontrol"; }
+    { name="kdf"; }
+    { name="kfloppy"; }
+    { name="printer-applet"; sane="printer_applet";}
+    { name="filelight"; }
+    { name="kcharselect"; }
+    { name="kgpg"; }
+    { name="ktimer"; }
+    { name="kwallet"; }
+    { name="sweeper"; }
+    { name="superkaramba"; }
+  ];
+
+}
+{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
+{ module="kdewebdev";  split=false;
+  pkgs=[
+    { name="klinkstatus"; }
+    { name="kfilereplace"; }
+    { name="kimagemapeditor"; }
+    { name="kommander"; }
+  ];
+
+}
+{ module="kde-workspace"; sane="kde_workspace"; split=false;}
+{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
+];
+}

pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#! /bin/sh
 
 # Usage: download kde release to $dir, then run
 # $0 $dir

pkgs/desktops/kde-4.7/l10n/manifest-4.7.2.nix

@@ -1,262 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "17s0d1yr561r55b2jgj6ypmjbwv9p7ykmpv28r6lcs7smdhvazg2";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "1q3r15v4hqmw7hqb4bxkgp3xvvybhs4ij8j2k6ph78sl2kq0z9vg";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "00q0mamzkf3rn1r9dxjkbg0fcs0sg06m38d5hvvc81ia2f743qps";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "1k9x805ikaqxq33mxj8knxdbmba22pb7yl5r6yvgys6ffr36x4gv";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "0zfxlsxrwzyh6va0fc7d7xvahw51khf51w5v3yqx0c5zvkbnk5h2";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "1adccwlxqwdv575cckfh665ml0wx47226hmjyyp9qws8csi56c69";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "0d0zbv7f3cwzsly45ilzfz2abjp22f45ilzfmqjp4naj153c1dxi";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "02mzvz5n00dvdnw86awfd3g3s4dsbk28i6nd7hpqxz6anvasqrc1";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "00gi08mgkw9r3mbagxfx25ywcrl7h0xsgs8wvng8y098vq5bsql4";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "0sf7ipp0sggdfcpijhy0gymkvmlxd4yknrw5v1mcbl6hjdg4fpyr";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "0axzzwmx39rad34qnasdla014c5dvz65hvnkf184q2q2fzbsqcn4";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "080prwlf12nhbkkbkc111zsjr5j2zm0zp328s923gmrh5dfxi6c5";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "0vbc01xxnzpnvnrzvv3xird3g7glyls970rbq815a5f8d0svcqhz";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "0rhi9hc2kwh3dl3zin5l8akf1qlfc8i3yi8857f92az4crah0h7j";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "0jwlkiv3phlw4hinjz0hxgmcs5v9nkg2rdh96qfsmqm8qjwbgjj9";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "0nr7357xknsx2nn4w25yxzmhz1rij9b2i9fix9gbfrfi103p4j3d";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "1fvnfxyn2gdmbp6n9rrh7amzb23vwlfz0dif5c4pc17vkm733hci";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "1rmrwbfad81hhx3rvdis38mg4dvq88x3m2ypjy4vg47h7y3nzzsd";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "0w234ndd1rljrnxg1ws814r0kybh3ajc1x5n2m4qch1xvsq96knh";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "0rjaajqa3ci5qpx6zqzglzmllfnsm8knsal65bnm4msxh8s06k96";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "15rsn2qak7fjc3l54s1j26dlng4k31kh9qdgs68y38hsq65x4zc9";
-}
-{
-  lang = "id";
-  saneName = "id";
-  sha256 = "0dlciv1yk6vjc17506cabn722z9n0x25y2cmanafqb37ilm3ji9q";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "0iqsz23l4205p2vbm7nrhq6f4xcjnv2i8fll4zrim1fvmv8m9imb";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "1xmbw2c62d4zfarrwfdxg9ijgyly0p659ycxjqq6vq066ji728n0";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "1jrq9vhs7md5bjfaym5jqjhmlf0ydi9fwdhz87y03bp4cx8k17f5";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "1d5jl8yi8jjp1myg1d3jxh2fdf58n4lh77g50f9f4lab7xhwqiy0";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "1apxmwmsmis77y2if15npf38wd98nzl9h6qqi02mpbl2gq32hjnm";
-}
-{
-  lang = "kn";
-  saneName = "kn";
-  sha256 = "0r70d4m4x0jyq7fq3zj0dgy3v0pz25zbk20l932w3zyq6nxmaj18";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "0zr2ph6n2475fifanx2gisn0z29hgzcd822jy8h33qy1rysfzjv7";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "12vvy72nb16b0i2a8dqfq6zvbdxkanh39wqi6ysmbzxbic634lwy";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "1daxrnydhqcnmi0c2ag2jvdckshk9dypgpi6dchgfbffn4bqgy9p";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "1mjkbgd2k9g6ka811j6yphc9c7yl6hyx504k74l3qwhcd53nhixm";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "0vryzfy5phybffdizm4vxb3k1z04mqwhabvk7qijr536jv457s79";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "16w8i0ywlpyck2svahrjsgaadp18x6y26n637av23ll2albiigj3";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "1kq0nrj5i9kdb2rmn6wmrv0y3awjk25kqq0ls6f49nxy954nw1ch";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "12dqa9lbr99lmb35qb4vsl3pykn04kb95p4dw8yap380wfqr0j53";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "0mdcfw9v5434rrq1ix1zprvmrs3vdkl54nmaz7iz9iqlc44c44w1";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "08bwh2b9040wvhvq3ncih4b1s7yz1cdgchkird2zghsks34jn32j";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "145zgkslkm8y2vrxcr4zm2hv7m7mqc5h5q0vad33p6cxqpy8d0im";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "0w3s87h3msbjrbmil4za323jsh5wg80n4vzsvy77nhlv4a4zkd6p";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "1cddg14g2cdm2lfspps32ld8cbmd9qiwn78a2m6f6jsfbjh8kk0v";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "0wlgmfa15vk8vv9zd08dafvdd0df2j4721lnrn3pjrknbapfv76w";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "176x46y8fxhbs2x4zma705xz258jcxw45af5jkwskq6rq1v2nk8p";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "1sxrxblmyrpvjzag3z7a7ia3k1fd6n3jvqjv6mdcnzky6n4wjs35";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "1ni87ph5wgxydq5dyj7yw9xc6izx0gdqyqqvcbnzxxbfcg37apnx";
-}
-{
-  lang = "th";
-  saneName = "th";
-  sha256 = "1a4fn0vbb714pg15z9w9jkgmmqs0c3wl8397jg68xr6621cphpnh";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "09m81r5vlh9mi863wm0kmnbr881xy2qnsn2n6fy27csk91sj9g6s";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "191ivdzc60sz4z5d513v7m89clq214kw31r8pp16basayqvcycwg";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "1141213hrvw77ri5n518vj76k9whvr73vahbbrygfib3r1vml4rf";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "0mczkwzq5zb5s1mpl9g711lnng7j3bcfmn66zwm5is4ij4hd2swr";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "0ra5km0ddh3k3mb36drynf1wyfi05a1nf346jamx4lafsp5xai1r";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "0qbc0hs1f43aqkj92nnw5vn8b2r11y19hjhh2p8b41818dcyscyf";
-}
-]

pkgs/desktops/kde-4.7/l10n/manifest-4.7.4.nix

@@ -0,0 +1,267 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "1iw8x8k31jrgqc8nq276iwca1dgicz9vcx58rfbnk924dvqrflpv";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "07i4s6jkfkw59mr5n4256rzwy64y1c5wy957jbvnidqcrpzh1azf";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "080svc26zqf45wra6d6ljxzgs8f6gzl567wm73yp5qrgqnvyvxir";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "04fz56hsrpl6mxsbw5ja7armf8zbib542d7iv4p4c87xncib13qj";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "01mi1d6yz5w122bcjzp3r8g70pzil6216sv2y2dxaqjlxpdllklp";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "0l1rwx1k0vpkfc52divm5cnwxr05mwcl1sr84mi24s2ygs6rk8ib";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "1r2pzkvs1rc8hfzi5q0p6drvkl1ykq89bzi3k73i3fghx42qdxv6";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "100589wkw5rdcihk1nwl4i0bc30bq3b289n03q9lgf8zadflrrg9";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "0q41lpkf8srjxrrcnw9c7rkc83m4jw3r7z6s8x9rn0d5h2l36gv8";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "0mmvr3fh51r958myc18nxvl7d8hsm4wl70vmac3a3w47mr9aayqi";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "11k8svvnph9431maxdhzr334h7h11jk681fb2z1hb7i6cprmac9f";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "0pvjfkh93avkg9dii5byjh3kiqcgax9dfw97jmy6qccicgq6frvd";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "0gnnr7nyxjrzf632zs1k3j4bss3gm5qadfm2jki41y9q1f82vy99";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "0mfrmqn1yiqrgq79bgbb8799myv5h30g1gr83xja9g9y0lb645bs";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "03d6xbc7h9gslzvx1q7lcb8bfr5w8809jfb6cn4zv36in593wq85";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "13m7rdz2gd1cag2x6hfzyv8xj5777fly5f9pyhr28hrafyqc44l5";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "1ryimhlddxwaa40si3j0id37xm845ybsfkck0i7x2kmg87a55wcz";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "01v4vkbyhbsv64z7mnj129ss1rnr00n19iiza0ivjzsbzryhh3p2";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "0s2a4nc3z03xj8za426arwr1cjqqcd6pq82lc9q0kiv2fpxgagxw";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "0sv4fsnnnnpnf14s7fv83g9kzqq31gl0647cy523xkyxpdwhj9hp";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "0k9gzxiyplvk78nqk3kmqh74lani6iqciyighii1m0cvylq5sljz";
+}
+{
+  lang = "id";
+  saneName = "id";
+  sha256 = "16l4wif0qsmvpikagkhfyh98wdss4w0imixnzawadx0jq5mac6ga";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "1g5pan1iy2mx43z5gxvp07n3a9yrc56y4pya2r9g6wjnzcp0ynbj";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "0p0grhjx04khqmih8gmlpgjazr8asv7ql1gj965sjaf8a6z1h5ar";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "1f6ig8x3siqww4bwldpgncpyhlmkf6hbd6ahlvd5dqn6hqpknygx";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "0kyhr0b5g842dds59l3rcvyq3n12xx11svcqbqhiqqm3a8qki9vi";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "02ss6rxqf71n06a769l0xky30nhyqdhhsad9lmxs0dbbnxdcnixr";
+}
+{
+  lang = "kn";
+  saneName = "kn";
+  sha256 = "0rk193a27hvh63lfb7yy8g0wxb05kymyqnhdxcmai3wk2n53bi9y";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "0wyplpkkq6mdm5k7jxxppwgrm4rrb5mbhagszg1y460rcx7d5vcm";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "08767csx7sq02jkkrdl16jj7jprqc3qbsz7vdcwli3274qjkdk9s";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "0f4mxjsg2ipsj57ki26n870zxnk28z9ayblzgmv821xiawjaa4gc";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "1myb1b4p849nvb4q2n5hcy5fsfb4zdvhc5vkwa2giiy0pv230cmm";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "1vm6fjac0aaxls0rlgz4s804kbarj1rzyli50dzfcfqwngzkckxk";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "02v0cscngl7wfsl7yc2xr1a593qq064spgk1ynzad1rz1g98z212";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "01s1kfp5x036hcpyl87qzqjlmjwp8hda3qplnj3inihias2cnvb7";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "0al2lwvj23rp1plg2ykakbgw6qzxkkd5pd2nqdfnaif9xq9fp9db";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "08fffsaay01dnbs7bg3w325bknjcfbp3f1ryrdy2g7w2achyakls";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "03klc7q1h0xxc43vqw2m87n4wzxg140ql7mlzrjsrdnqgx2pvch4";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "1g4nd48fzfxam8zsi0imw57lhjm7i7qifqmy53s7pfr4cmq4fbw5";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "112pj6bi1bagafh89322mdj8ynmljv0ry7z2zss4ljfhqxxndc6b";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "1i4fx5mrz9910wkfgi885gjafcspnk8nyx7cimkvnp6y2xwpl733";
+}
+{
+  lang = "si";
+  saneName = "si";
+  sha256 = "0h77cqi9cmzni4mn7k91ar56b9ph8dlyagn29wd958hpkxwbdqiw";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "1q8bxlaah7afs12ni8xpjj6nlxjmxfpzabavm7ixqwnn4l732vyn";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "0508w2k4g7f9dm0ds28h5hhxd5qc4w16zxqskygrs6144567hb0c";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "0bvbzah338bh8vnn2ppakd8zb49vcc7d95ahyahrkqc4ls5z60sv";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "1glgb7shn3qlszayyc11wjhbc5g29agq2rlwf45drk2b5fi2m8bn";
+}
+{
+  lang = "th";
+  saneName = "th";
+  sha256 = "0g3pgrsb3d33295nw45y0a318yb4bvld46xvjsd3ay8hxpxrf4yy";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "02k1jakxwj5zp0z7x8yrjrl17syzv6rfyscal6af5bavjsx99kxp";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "0wq1jlxwz2avqzb9yqnck69qkfy3q7cq76i2jadbfdvwk06w44bi";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "0813bmgi9k3kx2k8rl8h1l9p6zcnabk36p7nm8v9vb4v7d52cyds";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "14slp0ybjbsm62misrp9qni5pzw4pzz3zznzc49z0a7yfni9i6av";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "18jfbz2h8jjby48hwjyrd9yn3k7xbp58g28psmlhsg2m3f8mr669";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "09mfspiy3ihg0n6paqhp0g1srl60sxrkxgha536624kbrbwp1jpq";
+}
+]

pkgs/development/compilers/Agda-executable/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "Agda-executable";
-  version = "2.2.10";
+  version = "2.3.0";
-  sha256 = "0jjlbz5vaz1pasfws1cy8wvllzdzv3sxm2lfj6bckl93kdrxlpy6";
+  sha256 = "1n1ak6z2vh356k9mk0zkiv6dqp9dvx97a7r21b0xnhwkmh3f8p5p";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Agda ];

pkgs/development/compilers/epic/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "epic";
-  version = "0.1.13";
+  version = "0.9";
-  sha256 = "00rdprgndrvssrjlp6jh5jak2rxq6bcd2dknldx6i8h1cq6i69rb";
+  sha256 = "0bxvabzizq0msj0fy02vqj0pylq4cbymsypi6w2babwykscrdgm0";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ mtl ];

pkgs/development/compilers/gcc-4.5/default.nix

@@ -146,13 +146,17 @@ stdenv.mkDerivation ({
 
   postPatch =
     if (stdenv.system == "i586-pc-gnu"
+        || (libcCross != null                  # e.g., building `gcc.hostDrv'
+            && libcCross ? crossConfig
+            && libcCross.crossConfig == "i586-pc-gnu")
         || (cross != null && cross.config == "i586-pc-gnu"
             && libcCross != null))
     then
       # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
       # in glibc, so add the right `-I' flags to the default spec string.
+      assert libcCross != null -> libpthreadCross != null;
       let
-        libc = if cross != null then libcCross else stdenv.glibc;
+        libc = if libcCross != null then libcCross else stdenv.glibc;
         gnu_h = "gcc/config/gnu.h";
         i386_gnu_h = "gcc/config/i386/gnu.h";
         extraCPPDeps =
@@ -174,12 +178,18 @@ stdenv.mkDerivation ({
            echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..."
            sed -i "${gnu_h}" \
                -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
+
+           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..."
+           sed -i "${gnu_h}" \
+               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g'
+           sed -i gcc/config/t-gnu \
+               -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g'
         ''
     else if cross != null || stdenv.gcc.libc != null then
       # On NixOS, use the right path to the dynamic linker instead of
       # `/lib/ld*.so'.
       let
-        libc = if (cross != null && libcCross != null) then libcCross else stdenv.gcc.libc;
+        libc = if (libcCross != null) then libcCross else stdenv.gcc.libc;
       in
         '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."
            for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
@@ -384,6 +394,13 @@ stdenv.mkDerivation ({
   };
 }
 
+// optionalAttrs (cross != null || libcCross != null) {
+  # `builder.sh' sets $CPP, which leads configure to use "gcc -E" instead of,
+  # say, "i586-pc-gnu-gcc -E" when building `gcc.hostDrv'.
+  # FIXME: Fix `builder.sh' directly in the next stdenv-update.
+  postUnpack = "unset CPP";
+}
+
 // optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
   makeFlags = [ "all-gcc" "all-target-libgcc" ];
   installTargets = "install-gcc install-target-libgcc";

pkgs/development/compilers/gcc-4.6/builder.sh

@@ -5,11 +5,6 @@ export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
 mkdir $NIX_FIXINC_DUMMY
 
 
-# libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad
-# Thing.
-export CPP="gcc -E"
-export CXXCPP="g++ -E"
-
 if test "$staticCompiler" = "1"; then
     EXTRA_LDFLAGS="-static"
 else

pkgs/development/compilers/gcc-4.6/default.nix

@@ -151,13 +151,17 @@ stdenv.mkDerivation ({
 
   postPatch =
     if (stdenv.system == "i586-pc-gnu"
+        || (libcCross != null                  # e.g., building `gcc.hostDrv'
+            && libcCross ? crossConfig
+            && libcCross.crossConfig == "i586-pc-gnu")
         || (cross != null && cross.config == "i586-pc-gnu"
             && libcCross != null))
     then
       # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
       # in glibc, so add the right `-I' flags to the default spec string.
+      assert libcCross != null -> libpthreadCross != null;
       let
-        libc = if cross != null then libcCross else stdenv.glibc;
+        libc = if libcCross != null then libcCross else stdenv.glibc;
         gnu_h = "gcc/config/gnu.h";
         i386_gnu_h = "gcc/config/i386/gnu.h";
         extraCPPDeps =
@@ -179,12 +183,18 @@ stdenv.mkDerivation ({
            echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..."
            sed -i "${gnu_h}" \
                -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
+
+           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc}/include'..."
+           sed -i "${gnu_h}" \
+               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g'
+           sed -i gcc/config/t-gnu \
+               -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g'
         ''
     else if cross != null || stdenv.gcc.libc != null then
       # On NixOS, use the right path to the dynamic linker instead of
       # `/lib/ld*.so'.
       let
-        libc = if (cross != null && libcCross != null) then libcCross else stdenv.gcc.libc;
+        libc = if (libcCross != null) then libcCross else stdenv.gcc.libc;
       in
         '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."
            for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
@@ -200,16 +210,17 @@ stdenv.mkDerivation ({
   inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic
     libcCross crossMingw;
 
-  buildNativeInputs = [ texinfo which ]
+  buildNativeInputs = [ texinfo which gettext ]
-    ++ optional langJava perl;
+    ++ (optional (perl != null) perl)
+    ++ (optional javaAwtGtk pkgconfig);
 
-  buildInputs = [ gmp mpfr mpc libelf gettext ]
+  buildInputs = [ gmp mpfr mpc libelf ]
     ++ (optional (ppl != null) ppl)
     ++ (optional (cloogppl != null) cloogppl)
     ++ (optional (cloog != null) cloog)
     ++ (optional (zlib != null) zlib)
     ++ (optionals langJava [ boehmgc zip unzip ])
-    ++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs))
+    ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs))
     ++ (optionals (cross != null) [binutilsCross])
     ++ (optionals langAda [gnatboot])
     ++ (optionals langVhdl [gnat])

pkgs/development/compilers/ghc/7.2.2.nix

@@ -0,0 +1,44 @@
+{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
+
+stdenv.mkDerivation rec {
+  version = "7.2.2";
+  name = "ghc-${version}";
+
+  src = fetchurl {
+    url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
+    sha256 = "0g87d3z9275dniaqzkf56qfgzp1msd89nqqhhm2gkc6iga072spz";
+  };
+
+  buildInputs = [ghc perl gmp ncurses] ++
+    (if stdenv.isDarwin then [darwinInstallNameToolUtility] else []);
+
+  buildMK = ''
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+  '';
+
+  preConfigure = ''
+    echo "${buildMK}" > mk/build.mk
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '';
+
+  configureFlags=[
+    "--with-gcc=${stdenv.gcc}/bin/gcc"
+  ];
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags=["-S" "--keep-file-symbols"];
+
+  meta = {
+    homepage = "http://haskell.org/ghc";
+    description = "The Glasgow Haskell Compiler";
+    maintainers = [
+      stdenv.lib.maintainers.marcweber
+      stdenv.lib.maintainers.andres
+      stdenv.lib.maintainers.simons
+    ];
+    platforms = ghc.meta.platforms;
+  };
+
+}

pkgs/development/compilers/ghc/with-packages.nix

@@ -0,0 +1,89 @@
+{stdenv, ghc, packages ? [], makeWrapper}:
+
+stdenv.mkDerivation rec {
+  name = "ghc-${ghc.version}-linkdir";
+
+  allPackages = stdenv.lib.closePropagation packages;
+  buildInputs = allPackages ++ [makeWrapper];
+  propagatedBuildInputs = packages;
+
+  unpackPhase = "true";
+
+  installPhase = ''
+    originalTopDir="${ghc}/lib/ghc-${ghc.version}"
+    originalPkgDir="$originalTopDir/package.conf.d"
+    linkedTopDir="$out/lib"
+    linkedPkgDir="$linkedTopDir/package.conf.d"
+
+    ensureDir $out/bin
+    ensureDir $linkedTopDir
+    ensureDir $linkedPkgDir
+
+    echo "Linking GHC core libraries:"
+
+    echo -n "Linking $originalTopDir "
+    for f in $originalTopDir/*; do
+      if test -f $f; then
+        ln -s $f $linkedTopDir
+        echo -n .
+      fi
+    done
+    echo
+
+    echo -n "Linking $originalPkgDir "
+    for f in $originalPkgDir/*.conf; do
+      ln -s $f $linkedPkgDir
+      echo -n .
+    done
+    echo
+
+    echo "Linking selected packages and dependencies:"
+
+    for currentPath in ${stdenv.lib.concatStringsSep " " allPackages}; do
+      currentPkgDir="$currentPath/lib/ghc-pkgs/ghc-${ghc.version}"
+      # Check if current path is a Cabal package for the current GHC
+      if test -d $currentPkgDir; then
+        echo -n "Linking $currentPath "
+        for f in $currentPath/bin/*; do
+          ln -s $f $out/bin
+          echo -n .
+        done
+        for f in $currentPkgDir/*.conf; do
+          ln -s $f $linkedPkgDir
+          echo -n .
+        done
+        echo
+      fi
+    done
+
+    echo -n "Generating package cache "
+    ${ghc}/bin/ghc-pkg --global-conf $linkedPkgDir recache
+    echo .
+
+    echo -n "Generating wrappers "
+
+    for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do
+      makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "-B$linkedTopDir"
+      echo -n .
+    done
+
+    for prg in runghc runhaskell; do
+      makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "-f $out/bin/ghc"
+      echo -n .
+    done
+
+    for prg in ghc-pkg ghc-pkg-${ghc.version}; do
+      makeWrapper ${ghc}/bin/$prg $out/bin/$prg --add-flags "--global-conf $linkedPkgDir"
+      echo -n .
+    done
+
+    for prg in hp2ps hpc hasktags hsc2hs haddock haddock-${ghc.version}; do
+      if test -x ${ghc}/bin/$prg -a ! -x $out/bin/$prg; then
+        ln -s ${ghc}/bin/$prg $out/bin/$prg && echo -n .
+      fi
+    done
+    echo
+  '';
+
+  meta = ghc.meta;
+}

pkgs/development/compilers/llvm/clang-include-paths-svn.patch

@@ -1,40 +0,0 @@
-diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/lib/Frontend/InitHeaderSearch.cpp
---- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp	2010-09-03 18:45:53.000000000 +0200
-+++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp	2011-02-05 14:59:08.669573190 +0100
-@@ -480,6 +480,7 @@
-       AddPath(*i, System, false, false, false);
-     return;
-   }
- 
-+#if 0
-   switch (os) {
-   case llvm::Triple::Win32: {
-@@ -593,7 +593,9 @@
-   }
- 
-   if ( os != llvm::Triple::RTEMS )
-     AddPath("/usr/include", System, false, false, false);
-+#endif
-+  AddPath(C_INCLUDE_PATH, System, false, false, false);
- }
- 
- void InitHeaderSearch::
-@@ -550,6 +553,7 @@
-                                   triple);
-     return;
-   }
-+#if 0  
-   // FIXME: temporary hack: hard-coded paths.
- 
-   if (triple.isOSDarwin()) {
-@@ -769,6 +773,10 @@
-   default:
-     break;
-   }
-+#endif
-+  AddGnuCPlusPlusIncludePaths(
-+      CPP_INCLUDE_PATH,
-+      CPP_HOST, "", "", triple);
- }
- 
- void InitHeaderSearch::AddDefaultSystemIncludePaths(const LangOptions &Lang,

pkgs/development/compilers/llvm/default.nix

@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, groff, darwinSwVersUtility }:
 
-let version = "2.9"; in
+let version = "3.0"; in
 
 stdenv.mkDerivation {
   name = "llvm-${version}";
 
   src = fetchurl {
-    url    = "http://llvm.org/releases/${version}/llvm-${version}.tgz";
+    url    = "http://llvm.org/releases/${version}/llvm-${version}.tar.gz";
-    sha256 = "0y9pgdakn3n0vf8zs6fjxjw6972nyw4rkfwwza6b8a3ll77kc4k6";
+    sha256 = "0xq4gi7lflv8ilfckslhfvnja5693xjii1yvzz39kklr6hfv37ji";
   };
 
   buildInputs = [ perl groff ] ++
@@ -19,6 +19,8 @@ stdenv.mkDerivation {
       "CXX=clang++"
     ];
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://llvm.org/;
     description = "Collection of modular and reusable compiler and toolchain technologies";

pkgs/development/compilers/llvm/svn-head.nix

@@ -1,66 +0,0 @@
-{ stdenv, fetchurl, gcc, flex, perl, libtool, groff, fetchsvn
-, buildClang ? false }:
-
-let rev =  "134309"; in
-stdenv.mkDerivation ({
-  name = "llvm-r${rev}";
-  
-  src = fetchsvn {
-    url    = "http://llvm.org/svn/llvm-project/llvm/trunk";
-    inherit rev;
-    sha256 = "136qwpcl22r5bl9y4kk94vgbha1m58xrggy7qw19lg7jkgxxj8s6";
-  };
-
-  buildInputs = [ gcc flex perl groff ];
-
-  configureFlags = [ "--enable-optimized" "--enable-shared" "--disable-static" ];
-
-  meta = {
-    homepage = http://llvm.org/;
-    description = "Collection of modular and reusable compiler and toolchain technologies";
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; all;
-  };
-}
-// stdenv.lib.optionalAttrs buildClang (
-  # I write the assert because 'gcc.libc' will be evaluated although 'triplet' would not
-  # evaluate properly (in the preConfigure below)
-  assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-  let
-    triplet = if (stdenv.system == "i686-linux") then "i686-unknown-linux-gnu"
-              else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu"
-              else throw "System not supported";
-  in rec {
-    name = "clang-r${rev}";
-
-    srcClang = fetchsvn {
-      url = http://llvm.org/svn/llvm-project/cfe/trunk;
-      inherit rev;
-      sha256 = "0afbrjakfw6zgsplxblgzr2kwjndlnr2lnqjnbj16ggam5fcnhlr";
-    };
-
-    prePatch = ''
-      cp -r ${srcClang} tools/clang
-      chmod u+rwX -R tools/clang
-    '';
-
-    patches = [ ./clang-include-paths-svn.patch ];
-
-    # Set up the header file paths
-    preConfigure = ''
-      sed -i -e 's,C_INCLUDE_PATH,"${gcc.libc}/include/",' \
-        -e 's,CPP_HOST,"${triplet}",' \
-        -e 's,CPP_INCLUDE_PATH,"${gcc.gcc}/include/c++/${gcc.gcc.version}",' \
-        tools/clang/lib/Frontend/InitHeaderSearch.cpp
-    '';
-
-    meta = {
-      homepage = http://clang.llvm.org/;
-      description = "A C language family frontend for LLVM";
-      license = "BSD";
-      maintainers = with stdenv.lib.maintainers; [viric];
-      platforms = with stdenv.lib.platforms; linux;
-    };
-  }
-))

pkgs/development/compilers/mit-scheme/default.nix

@@ -1,7 +1,7 @@
 { fetchurl, stdenv, gnum4, texinfo, texLive, automake }:
 
 let
-  version = "9.1";
+  version = "9.1.1";
   bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64);
 in
 stdenv.mkDerivation {
@@ -15,25 +15,16 @@ stdenv.mkDerivation {
     if stdenv.isi686
     then fetchurl {
       url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz";
-      sha256 = "1vqdy9f1lbzflr9bw0gjn4g4w3hdpnjrkiwj5aaah70flif5ndns";
+      sha256 = "0vi760fy550d9db538m0vzbq1mpdncvw9g8bk4lswk0kcdira55z";
     } else if stdenv.isx86_64
     then fetchurl {
       url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz";
-      sha256 = "1l4zxqm5r1alc6y1cky62rn8h6i40qyiba081n6phwypwxr5sd0g";
+      sha256 = "1wcxm9hyfc53myvlcn93fyqrnnn4scwkknl9hkbp1cphc6mp291x";
     } else fetchurl {
       url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz";
-      sha256 = "1661cybycfvjjyq92gb3n1cygxfmfjdhnh3d2ha3vy6xxk9d7za9";
+      sha256 = "0pclakzwxbqgy6wqwvs6ml62wgby8ba8xzmwzdwhx1v8wv05yw1j";
     };
 
-  configurePhase =
-    '' cd src
-       ./configure --prefix="$out"
-
-       cd ../doc
-       ./configure --prefix="$out"
-       cd ..
-     '';
-
   buildPhase =
     '' cd src
        ${if bootstrapFromC

pkgs/development/compilers/nvidia-cg-toolkit/default.nix

@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, patchelf }:
+
+assert stdenv ? glibc;
+
+stdenv.mkDerivation rec {
+  version = "3.0";
+  
+  date = "February2011";
+  
+  name = "nvidia-cg-toolkit-${version}";
+  
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86_64.tgz";
+        sha256 = "07gmnzfsla3vf1kf00cj86p87h6wrdbp6ri4ycslc5kmfxsq7ypq";
+      }
+    else if stdenv.system == "i686-linux" then
+      fetchurl {
+        url = "http://developer.download.nvidia.com/cg/Cg_${version}/Cg-${version}_${date}_x86.tgz";
+        sha256 = "0hr8l0r20akbfm5j0vqv4ghl0acwjf5996pxnfxlajacl9w58nam";
+      }
+    else throw "nvidia-cg-toolkit does not support platform ${stdenv.system}";
+    
+  installPhase = ''
+    for b in cgc cgfxcat cginfo
+    do
+        patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-*.so.? "bin/$b"
+    done
+    # FIXME: cgfxcat and cginfo need more patchelf
+    ensureDir "$out/bin/"
+    cp -v bin/* "$out/bin/"
+    ensureDir "$out/include/"
+    cp -v -r include/Cg/ "$out/include/"
+    ensureDir "$out/lib/"
+    [ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/"
+    [ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/"
+    for mandir in man1 man3 manCg manCgFX
+    do
+        ensureDir "$out/share/man/$mandir/"
+        cp -v share/man/$mandir/* "$out/share/man/$mandir/"
+    done
+    ensureDir "$out/share/doc/$name/"
+    cp -v -r local/Cg/* "$out/share/doc/$name/"
+  '';
+  
+  meta = {
+    homepage = http://developer.nvidia.com/cg-toolkit;
+    license = [ "nonfree-redistributable" ];
+  };
+}

pkgs/development/compilers/opa/default.nix

@@ -0,0 +1,63 @@
+{ stdenv, fetchurl, which, ocaml, perl, jdk
+, findlib, ocaml_ssl, openssl, cryptokit, camlzip, ulex
+, ocamlgraph, coreutils, zlib, ncurses, makeWrapper
+, gcc, binutils, gnumake } :
+
+stdenv.mkDerivation rec {
+  pname = "opa";
+  version = "962";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/MLstate/opalang/tarball/v${version}";
+    name = "opa-${version}.tar.gz";
+    sha256 = "0g4kq2kxbld0iqlzb076b7g43d8fh4sfxam615z15mbk1jcvpf9l";
+  };
+
+  # Paths so the opa compiler code generation will use the same programs as were
+  # used to build opa.
+  codeGeneratorPaths = "${ocaml}/bin:${gcc}/bin:${binutils}/bin:${gnumake}/bin";
+
+  prePatch = ''
+    find . -type f -exec sed -i 's@/usr/bin/env@${coreutils}/bin/env@' {} \;
+    find . -type f -exec sed -i 's@/usr/bin/perl@${perl}/bin/perl@' {} \;
+  '';
+
+  patches = [ ./locate.patch ./libdir.patch ];
+
+  preConfigure = ''
+    configureFlags="$configureFlags -prefix $out"
+  '';
+
+  dontAddPrefix = true;
+
+  configureFlags = "-ocamlfind ${findlib}/bin/ocamlfind -openssl ${openssl}/lib";
+
+  buildInputs = [ which ocaml perl jdk findlib ocaml_ssl openssl cryptokit camlzip ulex
+                  ocamlgraph coreutils zlib ncurses makeWrapper gcc binutils gnumake ];
+
+  postInstall = ''
+    # Have compiler use same tools for code generation as used to build it.
+    for p in $out/bin/opa ; do
+      wrapProgram $p --prefix PATH ":" "${codeGeneratorPaths}" ;
+    done
+
+    # Install emacs mode.
+    ensureDir $out/share/emacs/site-lisp/opa
+    install -m 0644 -v ./utils/emacs/{opa-mode.el,site-start.el} $out/share/emacs/site-lisp/opa
+  '';
+
+  meta = {
+    description = "Opa is a concise and elegant language for writing distributed web applications. Both client and server sides.";
+    longDescription = ''
+    Opa is a new generation of web development platform that lets you write distributed
+    web applications using a single technology. Among the the many features of Opa are these:
+    Opa is concise, simple, concurrent, dynamically distributed, and secure.
+    '';
+
+    homepage = http://opalang.org/;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.kkallio ];
+    platforms = [ "x86_64-linux" ];
+  };
+}

pkgs/development/compilers/opa/libdir.patch

@@ -0,0 +1,93 @@
+These patches have the compiler place path flags in various places so that
+ocaml and c libraries are found in their Nixpkgs locations.
+
+diff -x '*~' -Naur MLstate-opalang-6b295a9//build_rules.ml MLstate-opalang-6b295a9-new//build_rules.ml
+--- MLstate-opalang-6b295a9//build_rules.ml	2011-11-21 08:07:04.000000000 -0430
++++ MLstate-opalang-6b295a9-new//build_rules.ml	2011-11-27 00:34:35.845277134 -0430
+@@ -373,7 +373,11 @@
+     | Some dep -> dep::list
+   ) (tags_of_pathname (env "%.opa_plugin")) []
+   in
+-  let lib_dir s = [A"--ml";A"-I";A"--ml";P (if Pathname.exists s then ".." / s else ("+"^s))] in
++  let cryptokitdir_opt = function
++    | Some path -> path
++    | None -> ""
++  in
++  let lib_dir s = [A"--ml";A"-I";A"--ml";P (if Pathname.exists s then ".." / s else (if s = "cryptokit" then (cryptokitdir_opt Config.Libdir.cryptokit) else ("+"^s)))] in
+   let include_dirs = List.flatten (List.map lib_dir caml_use_lib) in
+   let files = List.map ((^) path) files in
+   build_list build files;
+diff -x '*~' -Naur MLstate-opalang-6b295a9//config.mli MLstate-opalang-6b295a9-new//config.mli
+--- MLstate-opalang-6b295a9//config.mli	2011-11-21 08:07:04.000000000 -0430
++++ MLstate-opalang-6b295a9-new//config.mli	2011-11-27 00:30:39.312443906 -0430
+@@ -43,6 +43,9 @@
+ (** Flag for Dbm present *)
+ val has_dbm : bool
+ 
++(** openssh link directory *)
++val openssl : string option
++
+ (** library directories, if the libs are enabled *)
+ val libnatpmp : (string*string*string) option (** name of the lib, lib dir, include dir *)
+ 
+diff -x '*~' -Naur MLstate-opalang-6b295a9//configure MLstate-opalang-6b295a9-new//configure
+--- MLstate-opalang-6b295a9//configure	2011-11-21 08:07:04.000000000 -0430
++++ MLstate-opalang-6b295a9-new//configure	2011-11-27 00:40:52.496151405 -0430
+@@ -27,6 +27,7 @@
+ 
+ NO_CAMLIDL=1
+ NO_DBM=1
++CONFIG_LIB_OPENSSL=""
+ 
+ while [ $# -gt 0 ]; do
+     case "$1" in
+@@ -51,6 +52,11 @@
+             shift
+             OCAMLOPT=$1
+             ;;
++        -openssl)
++            if [ $# -lt 2 ]; then echo "Error: option $1 requires an argument" >&2; exit 1; fi
++            shift
++            CONFIG_LIB_OPENSSL=$1
++            ;;
+         -ocamlfind)
+             if [ $# -lt 2 ]; then echo "Error: option $1 requires an argument" >&2; exit 1; fi
+             shift
+@@ -647,6 +653,8 @@
+ let miniupnpc = $(camlopt "$HAS_MINIUPNPC" "$(camlstrtuple "${MINIUPNPC[@]}")")
+ let has_dbm = $(camlbool "$HAS_DBM")
+ 
++let openssl = $(camlopt "$CONFIG_LIB_OPENSSL" '"'"$CONFIG_LIB_OPENSSL"'"')
++
+ let available = [ $TAGS_LIST]
+ let all_tags = [ $(for t in $ALL_TAGS_LIST; do echo -n "\"$t\"; "; done)]
+ 
+diff -x '*~' -Naur MLstate-opalang-6b295a9//qml2ocaml/qml2ocamlOptions.ml MLstate-opalang-6b295a9-new//qml2ocaml/qml2ocamlOptions.ml
+--- MLstate-opalang-6b295a9//qml2ocaml/qml2ocamlOptions.ml	2011-11-21 08:07:04.000000000 -0430
++++ MLstate-opalang-6b295a9-new//qml2ocaml/qml2ocamlOptions.ml	2011-11-27 00:32:57.721442828 -0430
+@@ -44,6 +44,7 @@
+ 
+   let options_linker =
+     ["-w a"]
++    @ (match Config.openssl with | Some dir -> ["-ccopt"; "-L"^dir] | None -> [])
+     @ (if Base.is_windows then
+          ["-cclib"; "Dnsapi.lib"; "-cclib"; "libeay32.lib"; "-cclib"; "ssleay32.lib" (*; "ssl_stubs.obj" *)]
+        else [])
+@@ -51,11 +52,13 @@
+   (**
+      Absolute path for include directory, will be passed with the option -I to the ocaml compiler.
+   *)
++  let uselibdirpath = fun po p -> match po with | Some path -> path | None -> p
++
+   let server_include_dir = [
+-    "+zip" ; "+site-lib/zip" ; "+site-lib/camlzip" ;
+-    "+ssl" ; "+site-lib/ssl" ;
+-    "+cryptokit"; "+site-lib/cryptokit" ;
+-    "+ulex" ; "+site-lib/ulex" ;
++    uselibdirpath Config.Libdir.camlzip "+zip" ; "+site-lib/zip" ; "+site-lib/camlzip" ;
++    uselibdirpath Config.Libdir.ssl "+ssl" ; "+site-lib/ssl" ;
++    uselibdirpath Config.Libdir.cryptokit "+cryptokit"; "+site-lib/cryptokit" ;
++    uselibdirpath Config.Libdir.ulex "+ulex" ; "+site-lib/ulex" ;
+   ] @ (
+     if Config.has_dbm then [
+       "+dbm" ; "+site-lib/dbm" ;

pkgs/development/compilers/opa/locate.patch

@@ -0,0 +1,14 @@
+Needed to have ocamlfind discover ocamlgraph with Nixpkgs.
+
+diff -x '*~' -Naur MLstate-opalang-ee92891/configure MLstate-opalang-ee92891-new//configure
+--- MLstate-opalang-ee92891/configure	2011-09-30 05:41:18.000000000 -0430
++++ MLstate-opalang-ee92891-new//configure	2011-11-24 13:47:01.332558705 -0430
+@@ -567,7 +567,7 @@
+ fi
+ 
+ # - checking ocamlgraph
+-if ! CONFIG_LIB_OCAMLGRAPH=$(locate-ocaml-lib "Graph" "ocamlgraph/graph")
++if ! CONFIG_LIB_OCAMLGRAPH=$(locate-ocaml-lib "Graph" "ocamlgraph" "graph")
+ then lib-not-found "ocamlgraph" "libocamlgraph-ocaml-dev"
+ fi
+ 

pkgs/development/compilers/sbcl/src-for-default.nix

@@ -1,9 +1,9 @@
 rec {
-   version="1.0.51";
+   version="1.0.54";
-   name="sbcl-1.0.51";
+   name="sbcl-1.0.54";
-   hash="0kh7c7pgiv0k0rsm1iysbcp0hf2148fhpixi4d8kclryzqpzl9yj";
+   hash="1ip13hz5zsys3vy68y3x0fapxs87xk0gqi6bdp68vyznz2a0v1cd";
-   url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.51/sbcl-1.0.51-source.tar.bz2";
+   url="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.54/sbcl-1.0.54-source.tar.bz2";
-   advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.51/sbcl-1.0.51-source.tar.bz2";
+   advertisedUrl="http://downloads.sourceforge.net/project/sbcl/sbcl/1.0.54/sbcl-1.0.54-source.tar.bz2";
   
   
 }

pkgs/development/compilers/sbcl/src-info-for-default.nix

@@ -1,8 +1,7 @@
 {
   baseName = "sbcl";
-  downloadPage = "http://sourceforge.net/projects/sbcl/files/";
+  downloadPage = "http://sourceforge.net/projects/sbcl/files/sbcl/";
-  choiceCommand = "head -n 2| tail -n 1 | sed -e 's@/download@@;'\"$skipRedirectSF\"";
+  choiceCommand = "head -n 1 | sed -re 's%.*/([0-9.]+)/%http://downloads.sourceforge.net/project/sbcl/sbcl/\\1/sbcl-\\1-source.tar.bz2%'";
-  sourceRegexp = "source[.-].*tar";
+  sourceRegexp = "[/][0-9.]+/\$";
   versionExtractorSedScript = "s/.*-([0-9.rc]+)-.*/\\1/";
-  blacklistRegexp = "1[.]0[.]3[012]|1[.]0[.]29[.]54[.]rc1";
 }

pkgs/development/compilers/strategoxt/0.18.nix

@@ -41,11 +41,11 @@ rec {
 
   
   strategoxt = stdenv.mkDerivation rec {
-    name = "strategoxt-1.8pre21839";
+    name = "strategoxt-1.8pre23644";
 
     src = fetchurl {
-      url = http://hydra.nixos.org/build/1030762/download/1/strategoxt-1.8pre21839.tar.gz;
+      url = http://hydra.nixos.org/build/1569309/download/1/strategoxt-1.8pre23644.tar.gz;
-      sha256 = "b84012ac75dfd031e5356f07ea9202b9e660de48e07de0b8e1c93ac39c073b24";
+      sha256 = "9c900d132e7a8790e914aa78598c376f8ed05947c62b9d05df617ba2eae29381";
     };
 
     buildInputs = [pkgconfig aterm sdf getopt];

pkgs/development/compilers/uhc/default.nix

@@ -3,28 +3,29 @@
 }:
 
 let
-  revision = "2293";
+  revision = "2375";
 in
 stdenv.mkDerivation {
-  name = "ehc-svn-${revision}";
+  name = "uhc-svn-${revision}";
 
   src = fetchsvn {
-     url = https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC;
+     url = "https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC";
      rev = revision;
-     sha256 = "f4c3d83734cffd64b11e31637598330271a2bb8d2573235d063b27b2ef5f76b6";
+     sha256 = "bde79664b7d04337ce668eab63291702687e6d572a302111425e5ff870c57619";
   };
 
   propagatedBuildInputs = [mtl network binary fgl syb];
   buildInputs = [coreutils m4 ghc libtool uulib uuagc];
 
+  # Can we rename this flag to "--with-cpp-uhc-options"?
   configureFlags = "--with-cpp-ehc-options=-I${glibc}/include";
 
-  # EHC builds packages during compilation; these are by default
+  # UHC builds packages during compilation; these are by default
   # installed in the user-specific package config file. We do not
   # want that, and hack the build process to use a temporary package
   # configuration file instead.
   preConfigure = ''
-    p=`pwd`/ehc-local-packages
+    p=`pwd`/uhc-local-packages
     echo '[]' > $p
     sed -i "s|--user|--package-db=$p|g" mk/shared.mk.in
     sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in
@@ -32,8 +33,8 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = "http://www.cs.uu.nl/wiki/Ehc/WebHome";
+    homepage = "http://www.cs.uu.nl/wiki/UHC";
-    description = "Essential Haskell Compiler";
+    description = "Utrecht Haskell Compiler";
     platforms = stdenv.lib.platforms.linux;
     maintainers = [
       stdenv.lib.maintainers.andres

pkgs/development/compilers/urweb/default.nix

@@ -2,23 +2,23 @@
 
 stdenv.mkDerivation rec {
   pname = "urweb";
-  version = "20110917";
+  version = "20111127";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "1qgb25bwpdcs303q7yz1dm577xyy5pzzyvaqabhkvhbgxmlcpl73";
+    sha256 = "1mhicigbi434fdr4gim4dswnmff9dldszh93g2w2542nlxvn9lbj";
   };
 
   buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ];
 
   prePatch = ''
     sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure
-    sed -e 's@gcc @${stdenv.gcc}/bin/gcc @g' -i src/compiler.sml
     '';
 
   preConfigure =
     ''
+      export CC="${stdenv.gcc}/bin/gcc";
       export CCARGS="-I$out/include \
                       -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib";
 

pkgs/development/interpreters/guile/default.nix

@@ -14,11 +14,8 @@ rec {
     sha256 = "14rhlpxxa4v5y3gl992l7lnd5qnqawx0a84idnwq0w2qviwcvsyj";
   };
 
-  buildNativeInputs = [ xz ];
+  buildNativeInputs = [ xz makeWrapper gawk pkgconfig ];
-  buildInputs =
+  buildInputs = [ readline libtool libunistring libffi ];
-    [ makeWrapper gawk readline libtool libunistring
-      libffi pkgconfig
-    ];
   propagatedBuildInputs = [ gmp boehmgc ]
 
     # XXX: These ones aren't normally needed here, but since
@@ -27,9 +24,13 @@ rec {
     # see below.
     ++ [ libtool libunistring ];
 
-  patches =
+  # A native Guile 2.0 is needed to cross-build Guile.
-    stdenv.lib.optionals (coverageAnalysis != null)
+  selfBuildNativeInput = true;
-      [ ./gcov-file-name.patch ./disable-gc-sensitive-tests.patch ];
+
+  enableParallelBuilding = true;
+
+  patches = [ ./disable-gc-sensitive-tests.patch ] ++
+    (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
 
   postInstall = ''
     wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"