Merge master into x-updates

pkgs/applications/audio/amarok/default.nix

@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi
     soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa ];
 
+  cmakeFlags = "-DKDE4_BUILD_TESTS=OFF";
+
   postInstall = ''
     mkdir -p $out/nix-support
     echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages

pkgs/applications/audio/monkeys-audio/buildfix.diff

@@ -0,0 +1,27 @@
+diff -ru monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp monkeys-audio-3.99-u4-b5.patched/src/MACLib/APELink.cpp
+--- monkeys-audio-3.99-u4-b5/src/MACLib/APELink.cpp	2006-06-01 11:00:57.000000000 +0200
++++ monkeys-audio-3.99-u4-b5.patched/src/MACLib/APELink.cpp	2012-01-05 14:51:47.000000000 +0100
+@@ -63,10 +63,10 @@
+     if (pData != NULL)
+     {
+         // parse out the information
+-        char * pHeader = strstr(pData, APE_LINK_HEADER);
+-        char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
+-        char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
+-        char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
++        const char * pHeader = strstr(pData, APE_LINK_HEADER);
++        const char * pImageFile = strstr(pData, APE_LINK_IMAGE_FILE_TAG);
++        const char * pStartBlock = strstr(pData, APE_LINK_START_BLOCK_TAG);
++        const char * pFinishBlock = strstr(pData, APE_LINK_FINISH_BLOCK_TAG);
+ 
+         if (pHeader && pImageFile && pStartBlock && pFinishBlock)
+         {
+@@ -81,7 +81,7 @@
+                 
+                 // get the path
+                 char cImageFile[MAX_PATH + 1]; int nIndex = 0;
+-                char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
++                const char * pImageCharacter = &pImageFile[strlen(APE_LINK_IMAGE_FILE_TAG)];
+                 while ((*pImageCharacter != 0) && (*pImageCharacter != '\r') && (*pImageCharacter != '\n'))
+                     cImageFile[nIndex++] = *pImageCharacter++;
+                 cImageFile[nIndex] = 0;

pkgs/applications/audio/monkeys-audio/default.nix

@@ -0,0 +1,14 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  version = "3.99-u4-b5";
+  pname = "monkeys-audio";
+  name = pname + "-" + version;
+
+  patches = [ ./buildfix.diff ];
+
+  src = fetchurl {
+    url = "http://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz";
+    sha256 = "0kjfwzfxfx7f958b2b1kf8yj655lp0ppmn0sh57gbkjvj8lml7nz";
+  };
+}

pkgs/applications/audio/qmmp/default.nix

@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, cmake, qt4, pkgconfig, x11
+# transports
+, curl, libmms
+# input plugins
+, libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile
+, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi
+# output plugins
+, alsaLib, pulseaudio
+# effect plugins
+, libsamplerate
+}:
+
+# Additional plugins that can be added:
+#  wavpack (http://www.wavpack.com/)
+#  gme (Game music support)
+#  Ogg Opus support
+#  BS2B effect plugin (http://bs2b.sourceforge.net/)
+#  JACK audio support
+#  ProjectM visualization plugin
+
+# To make MIDI work we must tell Qmmp what instrument configuration to use (and
+# this can unfortunately not be set at configure time):
+# Go to settings (ctrl-p), navigate to the WildMidi plugin and click on
+# Preferences. In the instrument configuration field, type the path to
+# /nix/store/*wildmidi*/etc/wildmidi.cfg (or your own custom cfg file).
+
+# Qmmp installs working .desktop file(s) all by itself, so we don't need to
+# handle that.
+
+stdenv.mkDerivation rec {
+  name = "qmmp-0.7.0";
+
+  src = fetchurl {
+    url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
+    sha256 = "0g8qcs82y3dy06lsgam2w6gh2ccx0frlw9fp4xg947vi3a16g6ig";
+  };
+
+  buildInputs =
+    [ # basic requirements
+      cmake qt4 pkgconfig x11
+      # transports
+      curl libmms
+      # input plugins
+      libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile
+      libcdio cdparanoia libcddb faad2 ffmpeg wildmidi
+      # output plugins
+      alsaLib pulseaudio
+      # effect plugins
+      libsamplerate
+    ];
+
+  meta = with stdenv.lib; {
+    description = "Qt-based audio player that looks like Winamp";
+    homepage = http://qmmp.ylsoftware.com/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [maintainers.bjornfor];
+  };
+}

pkgs/applications/editors/eclipse/default.nix

@@ -86,12 +86,12 @@ in {
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.6.2-201102101200/eclipse-SDK-3.6.2-linux-gtk-x86_64.tar.gz;
+          url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.6.2-201102101200/eclipse-SDK-3.6.2-linux-gtk-x86_64.tar.gz;
           sha256 = "0dfcfadcd6337c897fbfd5b292de481931dfce12d43289ecb93691fd27dd47f4";
         }
       else
         fetchurl {
-          url = http://ftp.ing.umu.se/mirror/eclipse/eclipse/downloads/drops/R-3.6.2-201102101200/eclipse-SDK-3.6.2-linux-gtk.tar.gz;
+          url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.6.2-201102101200/eclipse-SDK-3.6.2-linux-gtk.tar.gz;
           sha256 = "1bh8ykliqr8wbciv13vpiy50rvm7yszk7y8dslr796dbwhi5b1cj";
         };
   };
@@ -102,12 +102,12 @@ in {
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz;
+          url = http://eclipse.ialto.com/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz;
           sha1 = "6f914e11fa15a900c46825e4aa8299afd76e7e65";
         }
       else
         fetchurl {
-          url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk.tar.gz;
+          url = http://eclipse.ialto.com/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk.tar.gz;
           sha1 = "1156e4bc0253ae3a3a4e54839e4944dc64d3108f";
         };
   };
@@ -134,12 +134,12 @@ in {
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://eclipse.ialto.com/eclipse/downloads/drops/R-3.7-201106131736/eclipse-SDK-3.7-linux-gtk-x86_64.tar.gz;
+          url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.7-201106131736/eclipse-SDK-3.7-linux-gtk-x86_64.tar.gz;
           sha256 = "00ig3ww98r8imf32sx5npm6csn5nx288gvdk6w653nijni0di16j";
         }
       else
         fetchurl {
-          url = http://eclipse.ialto.com/eclipse/downloads/drops/R-3.7-201106131736/eclipse-SDK-3.7-linux-gtk.tar.gz;
+          url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.7-201106131736/eclipse-SDK-3.7-linux-gtk.tar.gz;
           sha256 = "08rgw85cam51l98mzb39fdc3ykb369v8pap93qhknbs6a3f5dnff";
         };
   };
@@ -182,12 +182,12 @@ in {
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://eclipse.ialto.com/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk-x86_64.tar.gz;
+          url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk-x86_64.tar.gz;
           sha256 = "1mlyy90lk08lb2971ynglgi3nqvqfq1k70md2kb39jk160wd1xrk";
         }
       else
         fetchurl {
-          url = http://eclipse.ialto.com/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk.tar.gz;
+          url = http://archive.eclipse.org/eclipse/downloads/drops4/R-4.2.1-201209141800/eclipse-SDK-4.2.1-linux-gtk.tar.gz;
           sha256 = "1av6qm9wkbyk123qqf38f0jq4jv2bj9wp6fmpnl55zg6qr463c1w";
         };
     };

pkgs/applications/editors/leksah/default.nix

@@ -23,9 +23,6 @@ cabal.mkDerivation (self: {
     description = "Haskell IDE written in Haskell";
     license = "GPL";
     platforms = self.stdenv.lib.platforms.linux;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })

pkgs/applications/graphics/digikam/default.nix

@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
   # Make digikam find some FindXXXX.cmake
   KDEDIRS="${marble}:${qjson}";
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Photo Management Program";
     license = "GPL";

pkgs/applications/graphics/openscad/default.nix

@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
     platforms = with stdenv.lib.platforms;
       linux;
     maintainers = with stdenv.lib.maintainers; 
-      [raskin];
+      [raskin bjornfor];
   };
 }

pkgs/applications/graphics/paraview/default.nix

@@ -7,19 +7,18 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "paraview-3.14.0";
+  name = "paraview-3.98.1";
   src = fetchurl {
-    url = "http://www.paraview.org/files/v3.14/ParaView-3.14.0-Source.tar.gz";
-    sha256 = "168v8zk64pxcd392kb4zqnkbw540d52bx6fs35aqz88i5jc0x9xv";
+    url = "http://paraview.org/files/v3.98/ParaView-3.98.1-source.tar.gz";
+    sha256 = "0i7q3jc4lc40l1zw3fdzv108rpxxfmg3dmmq855fpqyp2g2w9nxp";
   };
 
   # [  5%] Generating vtkGLSLShaderLibrary.h
   # ../../../bin/ProcessShader: error while loading shared libraries: libvtksys.so.pv3.10: cannot open shared object file: No such file or directory
   preConfigure = ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.10 -rpath ../../../bin -rpath ../../bin"
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.98 -rpath ../../../../../../lib -rpath ../../../../../lib -rpath ../../../../lib -rpath ../../../lib -rpath ../../lib -rpath ../lib"
   '';
   cmakeFlags = [
-#    "-DPARAVIEW_USE_MPI:BOOL=ON"
     "-DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON"
     "-DVTK_USE_SYSTEM_LIBXML2:BOOL=ON"
     "-DPARAVIEW_ENABLE_PYTHON:BOOL=ON"
@@ -28,8 +27,6 @@ stdenv.mkDerivation rec {
     "-DCMAKE_SKIP_BUILD_RPATH=ON"
     "-DVTK_USE_RPATH:BOOL=ON"
     "-DPARAVIEW_INSTALL_DEVELOPMENT=ON"
-#    "-DPYTHON_INCLUDE_DIR=${python}/include"
-#    "-DPYTHON_LIBRARY="
   ];
 
   enableParallelBuilding = true;
@@ -40,7 +37,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.paraview.org/";
     description = "3D Data analysis and visualization application";
     license = "free";
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [viric guibert];
     platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/applications/graphics/sxiv/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, libX11, imlib2, giflib }:
+
+stdenv.mkDerivation {
+  name = "sxiv-1.1";
+
+  src = fetchurl {
+    url = "https://github.com/muennich/sxiv/archive/v1.1.tar.gz";
+    name = "sxiv-1.1.tar.gz";
+    sha256 = "0gsqwa1yacsig7ycjrw0sjyrsa9mynfzzbwm1vp2bgk4s9hb08kx";
+  };
+
+  buildInputs = [ libX11 imlib2 giflib ];
+
+  prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
+
+  meta = {
+    description = "Simple X Image Viewer";
+    homepage = "https://github.com/muennich/sxiv";
+    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/applications/misc/arbtt/default.nix

@@ -0,0 +1,23 @@
+{ cabal, binary, bytestringProgress, deepseq, filepath
+, libXScrnSaver, parsec, pcreLight, strict, terminalProgressBar
+, time, transformers, utf8String, X11
+}:
+
+cabal.mkDerivation (self: {
+  pname = "arbtt";
+  version = "0.7";
+  sha256 = "05q31fsyrbkcx0mlf2r91zgmpma5sl2a7100h7qsa882sijc2ybn";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    binary bytestringProgress deepseq filepath parsec pcreLight strict
+    terminalProgressBar time transformers utf8String X11
+  ];
+  extraLibraries = [ libXScrnSaver ];
+  meta = {
+    homepage = "http://www.joachim-breitner.de/projects#arbtt";
+    description = "Automatic Rule-Based Time Tracker";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/applications/misc/blender/default.nix

@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "blender-2.66a";
+  name = "blender-2.67";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "0wj8x9xk5irvsjc3rm7wzml1j47xcdpdpy84kidafk02biskcqcb";
+    sha256 = "066lwrm85455gs187bxr3jhqidc2f6f0791b4216jkagbszd9a8l";
   };
 
   buildInputs = [

pkgs/applications/misc/dunst/default.nix

@@ -1,19 +1,24 @@
 { stdenv, fetchurl, coreutils , unzip, which, pkgconfig , dbus
-, freetype, xdg_utils , libXext, glib, pango , cairo, libX11
-, libxdg_basedir , libXScrnSaver, xproto, libXinerama , perl
+, freetype, xdg_utils , libXext, glib, pango , cairo, libX11, libnotify
+, libxdg_basedir , libXScrnSaver, xproto, libXinerama , perl, gdk_pixbuf
 }:
 
 stdenv.mkDerivation rec {
-  name = "dunst-0.5.0";
-  version = "0.5.0";
+  version = "1.0.0";
+  name = "dunst-${version}";
 
   src = fetchurl {
-    url = "https://github.com/knopwob/dunst/archive/v0.5.0.zip";
-    sha256 = "08myzhpb1afffcfk3mpmc7gs9305x853b0553fxf3lkgksmg70a6";
+    url = "https://github.com/knopwob/dunst/archive/v${version}.zip";
+    sha256 = "1x6k6jrf219v8hmhqhnnfjycldvsnp7ag8a2y8adp5rhfmgyn671";
   };
 
+  patchPhase = ''
+    substituteInPlace "settings.c" \
+      --replace "xdgConfigOpen(\"dunst/dunstrc\", \"r\", &xdg" "fopen(\"$out/share/dunst/dunstrc\", \"r\""
+  '';
+
   buildInputs =
-  [ coreutils unzip which pkgconfig dbus freetype
+  [ coreutils unzip which pkgconfig dbus freetype libnotify gdk_pixbuf
     xdg_utils libXext glib pango cairo libX11 libxdg_basedir
     libXScrnSaver xproto libXinerama perl];
 
@@ -29,5 +34,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.bsd3;
     # NOTE: 'unix' or even 'all' COULD work too, I'm not sure
     platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.iElectric ];
   };
 }

pkgs/applications/misc/evtest/default.nix

@@ -12,8 +12,10 @@ stdenv.mkDerivation rec {
     rev = "1a50f2479c4775e047f234a24d95dda82441bfbd";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Simple tool for input event debugging";
     license = "GPLv2";
+    platforms = platforms.linux;
+    maintainers = [maintainers.bjornfor];
   };
 }

pkgs/applications/misc/freicoin/default.nix

@@ -1,12 +1,12 @@
 { fetchurl, stdenv, db4, boost, gmp, mpfr, miniupnpc, qt4, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "0.0.1-3";
+  version = "0.0.2";
   name = "freicoin-${version}";
 
   src = fetchurl {
     url = "https://github.com/freicoin/freicoin/archive/v${version}.zip";
-    sha256 = "19q4llv67kmvfr0x56rnqcf0d050dayv246q4i51mmkvjijc1qpf";
+    sha256 = "09izmm85rb64d5hd0hz9hkfvv3qag55sb3mdyp8z4103icqwd6d7";
   };
 
   # I think that openssl and zlib are required, but come through other

pkgs/applications/misc/lyx/default.nix

@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.5.1";
+  version = "2.0.6";
   name = "lyx-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${name}.tar.xz";
-    sha256 = "18k9qbz40v6lqmkfcg98wvcv4wi4p36ach1jz3z2b15gbmv2gr9n";
+    sha256 = "1llah9d9ymvdk8asmqslcwnicycxrwb27k8si184n5bfxvnjpjx5";
   };
 
   configureFlags = [
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
     enchant # mythes boost
   ];
 
+  doCheck = true;
+
   meta = {
     description = "WYSIWYM frontend for LaTeX, DocBook, etc.";
     homepage = "http://www.lyx.org";

pkgs/applications/misc/pitz/default.nix

@@ -23,9 +23,11 @@ buildPythonPackage rec {
   # runtime. If we use buildInputs it would just build, not run.
   propagatedBuildInputs = [ tempita jinja2 pyyaml clepy mock nose decorator docutils ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Distributed bugtracker";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     homepage = http://pitz.tplus1.com/;
+    platforms = platforms.linux;
+    maintainers = [maintainers.bjornfor];
   };
 }

pkgs/applications/misc/st/default.nix

@@ -1,14 +1,22 @@
-{ stdenv, fetchurl, libX11, ncurses, libXext, libXft }:
+{ stdenv, fetchurl, writeText, libX11, ncurses, libXext, libXft, fontconfig
+, conf? null}:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "st-0.3";
+  name = "st-0.4.1";
   
   src = fetchurl {
     url = "http://dl.suckless.org/st/${name}.tar.gz";
-    sha256 = "0d0fjixiis4ixbz4l18rqhnssa7cy2bap3jkjyphqlqhl7lahv3d";
+    sha256 = "0cdzwbm5fxrwz8ryxkh90d3vwx54wjyywgj28ymsb5fdv3396bzf";
   };
+
+  configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
+  preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
   
-  buildInputs = [ libX11 ncurses libXext libXft ];
+  buildInputs = [ libX11 ncurses libXext libXft fontconfig ];
+
+  NIX_LDFLAGS = "-lfontconfig";
 
   installPhase = ''
     TERMINFO=$out/share/terminfo make install PREFIX=$out
@@ -17,7 +25,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://st.suckless.org/;
     license = "MIT";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with maintainers; [viric];
+    platforms = with platforms; linux;
   };
 }

pkgs/applications/misc/xfe/default.nix

@@ -1,20 +1,18 @@
-{ stdenv, fetchurl, fox_1_6, pkgconfig, gettext, x11, gcc, intltool, file, libpng }:
-
-let
-  version = "1.33";
-in
+{ stdenv, fetchurl, fox, pkgconfig, gettext, x11, gcc, intltool, file, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "xfe-${version}";
+  name = "xfe-1.34";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/xfe/xfe/${version}/${name}.tar.gz";
-    md5 = "fb089ba73add411b08a6560eeb51742d";
+    url = "mirror://sourceforge/xfe/${name}.tar.gz";
+    sha256 = "0y6gi8vdvw1prz7dv7wadf7v8gl6g75jrlrl5jnsb71l1431ncay";
   };
 
-  buildInputs = [ fox_1_6 pkgconfig gettext x11 gcc intltool file libpng ];
+  buildInputs = [ fox pkgconfig gettext x11 gcc intltool file libpng ];
 
-  doCheck = false;
+  preConfigure = ''
+    sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h
+  '';
 
   enableParallelBuilding = true;
 

pkgs/applications/misc/yeganesh/default.nix

@@ -12,6 +12,5 @@ cabal.mkDerivation (self: {
     description = "small dmenu wrapper";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.simons ];
   };
 })

pkgs/applications/networking/bittorrentsync/default.nix

@@ -1,7 +1,6 @@
 { stdenv, fetchurl, patchelf }:
 
 # this package contains the daemon version of bittorrent sync
-
 # it's unfortunately closed source.
 
 let
@@ -15,16 +14,15 @@ let
     else if stdenv.system == "i686-linux" then "ld-linux.so.2"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  version = "1.0.116";
-  sha256 = if stdenv.system == "x86_64-linux" then "108c11x8lp0a4irq88raclz3zfvmkxsqymxx3y8amc1lc6kc3n8i"
-    else if stdenv.system == "i686-linux" then "0kkxi04rggq6lrvn7g1xjay2nskqn7z4qkm0h0lcra7h2jz09mf1"
+  version = "1.0.134";
+  sha256 = if stdenv.system == "x86_64-linux" then "1kyxiqjabqgsg7n0a8snh03axxzpniazp93shb2l1b6x0f7d24n7"
+    else if stdenv.system == "i686-linux" then "02wb8pqcb1rk108r49cqyg7s14grmjnkr6p3068pkiwdwwgi8jakbt"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
 in stdenv.mkDerivation {
   name = "btsync-bin-${version}";
   src = fetchurl {
-    # TODO: using version-specific URL: http://forum.bittorrent.com/topic/18070-versioned-binary-downloads/#entry45868
-    url = "http://btsync.s3-website-us-east-1.amazonaws.com/btsync_${arch}.tar.gz";
+    url = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz";
     inherit sha256;
   };
 
@@ -43,7 +41,7 @@ in stdenv.mkDerivation {
   meta = {
     homepage = "http://labs.bittorrent.com/experiments/sync.html";
     description = "Automatically sync files via secure, distributed technology.";
-    license = stdenv.lib.licenses.unfreeRedistributable;
+    license = stdenv.lib.licenses.unfree;
     maintainers = [ stdenv.lib.maintainers.iElectric ];
   };
 }

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

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, which
+{ stdenv, fetchurl, makeWrapper, ninja, which
 
 # default dependencies
 , bzip2, flac, speex
@@ -12,12 +12,9 @@
 , utillinux, alsaLib
 , gcc, bison, gperf
 , glib, gtk, dbus_glib
-, libXScrnSaver, libXcursor, mesa
+, libXScrnSaver, libXcursor, libXtst, mesa
 , protobuf, speechd, libXdamage
 
-# dependencies for >= v27
-, libXtst
-
 # optional dependencies
 , libgcrypt ? null # gnomeSupport || cupsSupport
 
@@ -81,14 +78,15 @@ let
     libusb1 libexif
   ];
 
-  pre27 = versionOlder sourceInfo.version "27.0.0.0";
-  pre28 = versionOlder sourceInfo.version "28.0.0.0";
-  post26 = !pre27;
-  post27 = !pre28;
+  # build paths and release info
+  packageName = "chromium";
+  buildType = "Release";
+  buildPath = "out/${buildType}";
+  libExecPath = "$out/libexec/${packageName}";
 
 in stdenv.mkDerivation rec {
   name = "${packageName}-${version}";
-  packageName = "chromium";
+  inherit packageName;
 
   version = sourceInfo.version;
 
@@ -106,22 +104,20 @@ in stdenv.mkDerivation rec {
     gcc bison gperf
     krb5
     glib gtk dbus_glib
-    libXScrnSaver libXcursor mesa
+    libXScrnSaver libXcursor libXtst mesa
     pciutils protobuf speechd libXdamage
   ] ++ optional gnomeKeyringSupport libgnome_keyring
     ++ optionals gnomeSupport [ gconf libgcrypt ]
     ++ optional enableSELinux libselinux
     ++ optional cupsSupport libgcrypt
-    ++ optional pulseSupport pulseaudio
-    ++ optional post26 libXtst;
+    ++ optional pulseSupport pulseaudio;
 
   opensslPatches = optional useOpenSSL openssl.patches;
 
   prePatch = "patchShebangs .";
 
-  patches = optional cupsSupport ./cups_allow_deprecated.patch
-         ++ optional (pulseSupport && pre27) ./pulseaudio_array_bounds.patch
-         ++ optional pre27 ./glibc-2.16-use-siginfo_t.patch;
+  patches = [ ./sandbox_userns.patch ]
+         ++ optional cupsSupport ./cups_allow_deprecated.patch;
 
   postPatch = ''
     sed -i -r -e 's/-f(stack-protector)(-all)?/-fno-\1/' build/common.gypi
@@ -129,8 +125,8 @@ in stdenv.mkDerivation rec {
     cat $opensslPatches | patch -p1 -d third_party/openssl/openssl
   '' + ''
     sed -i -e 's|/usr/bin/gcc|gcc|' \
-      third_party/WebKit/Source/${if post27
-                                  then "core/core.gyp/core.gyp"
+      third_party/WebKit/Source/${if !versionOlder sourceInfo.version "28.0.0.0"
+                                  then "core/core.gypi"
                                   else "WebCore/WebCore.gyp/WebCore.gyp"}
   '';
 
@@ -146,6 +142,8 @@ in stdenv.mkDerivation rec {
     use_openssl = useOpenSSL;
     selinux = enableSELinux;
     use_cups = cupsSupport;
+    linux_sandbox_path="${libExecPath}/${packageName}_sandbox";
+    linux_sandbox_chrome_path="${libExecPath}/${packageName}";
   } // optionalAttrs proprietaryCodecs {
     # enable support for the H.264 codec
     proprietary_codecs = true;
@@ -156,49 +154,43 @@ in stdenv.mkDerivation rec {
     target_arch = "ia32";
   });
 
-  buildType = "Release";
-
-  enableParallelBuilding = true;
-
   configurePhase = ''
-    python build/gyp_chromium --depth "$(pwd)" ${gypFlags}
+    GYP_GENERATORS=ninja python build/gyp_chromium --depth "$(pwd)" ${gypFlags}
   '';
 
-  makeFlags = let
+  buildPhase = let
     CC = "${gcc}/bin/gcc";
     CXX = "${gcc}/bin/g++";
-  in [
-    "CC=${CC}"
-    "CXX=${CXX}"
-    "CC.host=${CC}"
-    "CXX.host=${CXX}"
-    "LINK.host=${CXX}"
-  ];
-
-  buildFlags = [
-    "BUILDTYPE=${buildType}"
-    "library=shared_library"
-    "chrome"
-  ];
+  in ''
+    CC="${CC}" CC_host="${CC}"     \
+    CXX="${CXX}" CXX_host="${CXX}" \
+    LINK_host="${CXX}"             \
+      "${ninja}/bin/ninja" -C "out/${buildType}" \
+        -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES    \
+        chrome ${optionalString (!enableSELinux) "chrome_sandbox"}
+  '';
 
   installPhase = ''
-    mkdir -vp "$out/libexec/${packageName}"
-    cp -v "out/${buildType}/"*.pak "$out/libexec/${packageName}/"
-    cp -vR "out/${buildType}/locales" "out/${buildType}/resources" "$out/libexec/${packageName}/"
-    cp -v out/${buildType}/libffmpegsumo.so "$out/libexec/${packageName}/"
+    mkdir -vp "${libExecPath}"
+    cp -v "${buildPath}/"*.pak "${libExecPath}/"
+    cp -vR "${buildPath}/locales" "${buildPath}/resources" "${libExecPath}/"
+    cp -v ${buildPath}/libffmpegsumo.so "${libExecPath}/"
 
-    cp -v "out/${buildType}/chrome" "$out/libexec/${packageName}/${packageName}"
+    cp -v "${buildPath}/chrome" "${libExecPath}/${packageName}"
 
     mkdir -vp "$out/bin"
-    makeWrapper "$out/libexec/${packageName}/${packageName}" "$out/bin/${packageName}"
+    makeWrapper "${libExecPath}/${packageName}" "$out/bin/${packageName}"
+    cp -v "${buildPath}/chrome_sandbox" "${libExecPath}/${packageName}_sandbox"
 
     mkdir -vp "$out/share/man/man1"
-    cp -v "out/${buildType}/chrome.1" "$out/share/man/man1/${packageName}.1"
+    cp -v "${buildPath}/chrome.1" "$out/share/man/man1/${packageName}.1"
 
     for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do
       num_and_suffix="''${icon_file##*logo_}"
       icon_size="''${num_and_suffix%.*}"
-      logo_output_path="$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps"
+      expr "$icon_size" : "^[0-9][0-9]*$" || continue
+      logo_output_prefix="$out/share/icons/hicolor"
+      logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
       mkdir -vp "$logo_output_path"
       cp -v "$icon_file" "$logo_output_path/${packageName}.png"
     done

pkgs/applications/networking/browsers/chromium/glibc-2.16-use-siginfo_t.patch

@@ -1,27 +0,0 @@
---- a/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h.orig		2012-12-22 16:01:44.000000000 +0200
-+++ b/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h		2012-12-23 21:53:26.746069153 +0200
-@@ -250,7 +250,7 @@
- struct kernel_old_sigaction {
-   union {
-     void             (*sa_handler_)(int);
--    void             (*sa_sigaction_)(int, struct siginfo *, void *);
-+    void             (*sa_sigaction_)(int, siginfo_t *, void *);
-   };
-   unsigned long      sa_mask;
-   unsigned long      sa_flags;
-@@ -287,13 +287,13 @@
-   unsigned long      sa_flags;
-   union {
-     void             (*sa_handler_)(int);
--    void             (*sa_sigaction_)(int, struct siginfo *, void *);
-+    void             (*sa_sigaction_)(int, siginfo_t *, void *);
-   };
-   struct kernel_sigset_t sa_mask;
- #else
-   union {
-     void             (*sa_handler_)(int);
--    void             (*sa_sigaction_)(int, struct siginfo *, void *);
-+    void             (*sa_sigaction_)(int, siginfo_t *, void *);
-   };
-   unsigned long      sa_flags;
-   void               (*sa_restorer)(void);

pkgs/applications/networking/browsers/chromium/pulseaudio_array_bounds.patch

@@ -1,12 +0,0 @@
-diff --git a/media/media.gyp b/media/media.gyp
-index 2a8c6c6..66ca767 100644
---- a/media/media.gyp
-+++ b/media/media.gyp
-@@ -399,6 +399,7 @@
-             ['use_pulseaudio == 1', {
-               'cflags': [
-                 '<!@(pkg-config --cflags libpulse)',
-+                '-Wno-array-bounds',
-               ],
-               'link_settings': {
-                 'libraries': [

pkgs/applications/networking/browsers/chromium/sandbox_userns.patch

@@ -0,0 +1,292 @@
+From a242351d8a32ea33e6337b928969cc9f715e314e Mon Sep 17 00:00:00 2001
+From: aszlig <aszlig@redmoonstudios.org>
+Date: Thu, 16 May 2013 14:17:56 +0200
+Subject: [PATCH] zygote: Add support for user namespaces on Linux.
+
+The implementation is done by patching the Zygote host to execute the sandbox
+binary with CLONE_NEWUSER and setting the uid and gid mapping so that the child
+process is using uid 0 and gid 0 which map to the current user of the parent.
+Afterwards, the sandbox will continue as if it was called as a setuid binary.
+
+In addition, this adds new_user_namespace as an option in process_util in order
+to set the UID and GID mapping correctly. The reason for this is that just
+passing CLONE_NEWUSER to clone_flags doesn't help in LaunchProcess(), because
+without setting the mappings exec*() will clear the process's capability sets.
+
+If the kernel doesn't support unprivileged user namespaces and the sandbox
+binary doesn't have the setuid flag, the Zygote main process will run without a
+sandbox. This is to mimic the behaviour if no SUID sandbox binary path is set.
+
+Signed-off-by: aszlig <aszlig@redmoonstudios.org>
+---
+ base/process_util.h                                |  4 ++
+ base/process_util_posix.cc                         | 71 +++++++++++++++++++++-
+ .../browser/zygote_host/zygote_host_impl_linux.cc  | 28 +++++++--
+ content/zygote/zygote_main_linux.cc                |  7 +++
+ sandbox/linux/suid/client/setuid_sandbox_client.cc |  8 +++
+ sandbox/linux/suid/client/setuid_sandbox_client.h  |  4 ++
+ sandbox/linux/suid/common/sandbox.h                |  1 +
+ 7 files changed, 117 insertions(+), 6 deletions(-)
+
+diff --git a/base/process_util.h b/base/process_util.h
+index 6efc70c..0f0c74c 100644
+--- a/base/process_util.h
++++ b/base/process_util.h
+@@ -261,3 +261,4 @@ struct LaunchOptions {
++        , new_user_namespace(false)
+ #endif  // OS_LINUX
+ #if defined(OS_CHROMEOS)
+         , ctrl_terminal_fd(-1)
+@@ -332,6 +333,9 @@ struct LaunchOptions {
+ #if defined(OS_LINUX)
+   // If non-zero, start the process using clone(), using flags as provided.
+   int clone_flags;
++
++  // If true, start the process in a new user namespace.
++  bool new_user_namespace;
+ #endif  // defined(OS_LINUX)
+ 
+ #if defined(OS_CHROMEOS)
+diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc
+index 6f15130..cea07f0 100644
+--- a/base/process_util_posix.cc
++++ b/base/process_util_posix.cc
+@@ -34,6 +34,13 @@
+ #include "base/threading/platform_thread.h"
+ #include "base/threading/thread_restrictions.h"
+ 
++#if defined(OS_LINUX)
++#include <sched.h>
++#if !defined(CLONE_NEWUSER)
++#define CLONE_NEWUSER 0x10000000
++#endif
++#endif
++
+ #if defined(OS_CHROMEOS)
+ #include <sys/ioctl.h>
+ #endif
+@@ -621,8 +628,19 @@ bool LaunchProcess(const std::vector<std::string>& argv,
+ 
+   pid_t pid;
+ #if defined(OS_LINUX)
+-  if (options.clone_flags) {
+-    pid = syscall(__NR_clone, options.clone_flags, 0, 0, 0);
++  int map_pipe_fd[2];
++  int flags = options.clone_flags;
++
++  if (options.new_user_namespace) {
++    flags |= CLONE_NEWUSER;
++    if (pipe(map_pipe_fd) < 0) {
++      DPLOG(ERROR) << "user namespace pipe";
++      return false;
++    }
++  }
++
++  if (options.clone_flags || options.new_user_namespace) {
++    pid = syscall(__NR_clone, flags, 0, 0, 0);
+   } else
+ #endif
+   {
+@@ -635,6 +653,21 @@ bool LaunchProcess(const std::vector<std::string>& argv,
+   } else if (pid == 0) {
+     // Child process
+ 
++#if defined(OS_LINUX)
++    if (options.new_user_namespace) {
++      // Close the write end of the pipe so we get an EOF when the parent closes
++      // the FD. This is to avoid race conditions when the UID/GID mappings are
++      // written _after_ execvp().
++      close(map_pipe_fd[1]);
++
++      char dummy;
++      if (HANDLE_EINTR(read(map_pipe_fd[0], &dummy, 1)) != 0) {
++        RAW_LOG(ERROR, "Unexpected input in uid/gid mapping pipe.");
++        _exit(127);
++      }
++    }
++#endif
++
+     // DANGER: fork() rule: in the child, if you don't end up doing exec*(),
+     // you call _exit() instead of exit(). This is because _exit() does not
+     // call any previously-registered (in the parent) exit handlers, which
+@@ -749,6 +782,40 @@ bool LaunchProcess(const std::vector<std::string>& argv,
+     _exit(127);
+   } else {
+     // Parent process
++#if defined(OS_LINUX)
++    if (options.new_user_namespace) {
++      // We need to write UID/GID mapping here to map the current user outside
++      // the namespace to the root user inside the namespace in order to
++      // correctly "fool" the child process.
++      char buf[256];
++      int map_fd, map_len;
++
++      snprintf(buf, sizeof(buf), "/proc/%d/uid_map", pid);
++      map_fd = open(buf, O_RDWR);
++      DPCHECK(map_fd >= 0);
++      snprintf(buf, sizeof(buf), "0 %d 1", geteuid());
++      map_len = strlen(buf);
++      if (write(map_fd, buf, map_len) != map_len) {
++        RAW_LOG(WARNING, "Can't write to uid_map.");
++      }
++      close(map_fd);
++
++      snprintf(buf, sizeof(buf), "/proc/%d/gid_map", pid);
++      map_fd = open(buf, O_RDWR);
++      DPCHECK(map_fd >= 0);
++      snprintf(buf, sizeof(buf), "0 %d 1", getegid());
++      map_len = strlen(buf);
++      if (write(map_fd, buf, map_len) != map_len) {
++        RAW_LOG(WARNING, "Can't write to gid_map.");
++      }
++      close(map_fd);
++
++      // Close the pipe on the parent, so the child can continue doing the
++      // execvp() call.
++      close(map_pipe_fd[1]);
++    }
++#endif
++
+     if (options.wait) {
+       // While this isn't strictly disk IO, waiting for another process to
+       // finish is the sort of thing ThreadRestrictions is trying to prevent.
+diff --git a/content/browser/zygote_host/zygote_host_impl_linux.cc b/content/browser/zygote_host/zygote_host_impl_linux.cc
+index ba7884f8..2a674a0 100644
+--- a/content/browser/zygote_host/zygote_host_impl_linux.cc
++++ b/content/browser/zygote_host/zygote_host_impl_linux.cc
+@@ -117,6 +117,9 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
+ 
+   sandbox_binary_ = sandbox_cmd.c_str();
+ 
++  bool userns_sandbox = false;
++  const std::vector<std::string> cmd_line_unwrapped(cmd_line.argv());
++
+   if (!sandbox_cmd.empty()) {
+     struct stat st;
+     if (stat(sandbox_binary_.c_str(), &st) != 0) {
+@@ -124,16 +127,21 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
+                  << sandbox_binary_ << " Aborting now.";
+     }
+ 
+-    if (access(sandbox_binary_.c_str(), X_OK) == 0 &&
+-        (st.st_uid == 0) &&
+-        (st.st_mode & S_ISUID) &&
+-        (st.st_mode & S_IXOTH)) {
++    if (access(sandbox_binary_.c_str(), X_OK) == 0) {
+       using_suid_sandbox_ = true;
++
+       cmd_line.PrependWrapper(sandbox_binary_);
+ 
+       scoped_ptr<sandbox::SetuidSandboxClient>
+           sandbox_client(sandbox::SetuidSandboxClient::Create());
+       sandbox_client->SetupLaunchEnvironment();
++
++      if (!((st.st_uid == 0) &&
++            (st.st_mode & S_ISUID) &&
++            (st.st_mode & S_IXOTH))) {
++        userns_sandbox = true;
++        sandbox_client->SetNoSuid();
++      }
+     } else {
+       LOG(FATAL) << "The SUID sandbox helper binary was found, but is not "
+                     "configured correctly. Rather than run without sandboxing "
+@@ -161,7 +169,19 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
+   base::ProcessHandle process = -1;
+   base::LaunchOptions options;
+   options.fds_to_remap = &fds_to_map;
++  if (userns_sandbox)
++    options.new_user_namespace = true;
+   base::LaunchProcess(cmd_line.argv(), options, &process);
++
++  if (process == -1 && userns_sandbox) {
++    LOG(ERROR) << "User namespace sandbox failed to start, running without "
++               << "sandbox! You need at least kernel 3.8.0 with CONFIG_USER_NS "
++               << "enabled in order to use the sandbox without setuid bit.";
++    using_suid_sandbox_ = false;
++    options.new_user_namespace = false;
++    base::LaunchProcess(cmd_line_unwrapped, options, &process);
++  }
++
+   CHECK(process != -1) << "Failed to launch zygote process";
+ 
+   if (using_suid_sandbox_) {
+diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc
+index ca75518..d906411 100644
+--- a/content/zygote/zygote_main_linux.cc
++++ b/content/zygote/zygote_main_linux.cc
+@@ -402,6 +402,13 @@ static bool EnterSandbox(sandbox::SetuidSandboxClient* setuid_sandbox,
+       *has_started_new_init = true;
+     }
+ 
++    // Don't set non-dumpable, as it causes trouble when the host tries to find
++    // the zygote process (XXX: Not quite sure why this happens with user
++    // namespaces). Fortunately, we also have the seccomp filter sandbox which
++    // should disallow the use of ptrace.
++    if (setuid_sandbox->IsNoSuid())
++      return true;
++
+ #if !defined(OS_OPENBSD)
+     // Previously, we required that the binary be non-readable. This causes the
+     // kernel to mark the process as non-dumpable at startup. The thinking was
+diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.cc b/sandbox/linux/suid/client/setuid_sandbox_client.cc
+index 7a174ef..633401e 100644
+--- a/sandbox/linux/suid/client/setuid_sandbox_client.cc
++++ b/sandbox/linux/suid/client/setuid_sandbox_client.cc
+@@ -166,6 +166,10 @@ bool SetuidSandboxClient::IsInNewNETNamespace() const {
+   return env_->HasVar(kSandboxNETNSEnvironmentVarName);
+ }
+ 
++bool SetuidSandboxClient::IsNoSuid() const {
++  return env_->HasVar(kSandboxNoSuidVarName);
++}
++
+ bool SetuidSandboxClient::IsSandboxed() const {
+   return sandboxed_;
+ }
+@@ -175,5 +179,9 @@ void SetuidSandboxClient::SetupLaunchEnvironment() {
+   SetSandboxAPIEnvironmentVariable(env_);
+ }
+ 
++void SetuidSandboxClient::SetNoSuid() {
++  env_->SetVar(kSandboxNoSuidVarName, "1");
++}
++
+ }  // namespace sandbox
+ 
+diff --git a/sandbox/linux/suid/client/setuid_sandbox_client.h b/sandbox/linux/suid/client/setuid_sandbox_client.h
+index a9f6536..2e8113a 100644
+--- a/sandbox/linux/suid/client/setuid_sandbox_client.h
++++ b/sandbox/linux/suid/client/setuid_sandbox_client.h
+@@ -39,6 +39,8 @@ class SetuidSandboxClient {
+   bool IsInNewPIDNamespace() const;
+   // Did the setuid helper create a new network namespace ?
+   bool IsInNewNETNamespace() const;
++  // Is sandboxed without SUID binary ?
++  bool IsNoSuid() const;
+   // Are we done and fully sandboxed ?
+   bool IsSandboxed() const;
+ 
+@@ -46,6 +48,8 @@ class SetuidSandboxClient {
+   // helper.
+   void SetupLaunchEnvironment();
+ 
++  void SetNoSuid();
++
+  private:
+   // Holds the environment. Will never be NULL.
+   base::Environment* env_;
+diff --git a/sandbox/linux/suid/common/sandbox.h b/sandbox/linux/suid/common/sandbox.h
+index aad4ff8..bd710d5 100644
+--- a/sandbox/linux/suid/common/sandbox.h
++++ b/sandbox/linux/suid/common/sandbox.h
+@@ -18,6 +18,7 @@ static const char kAdjustLowMemMarginSwitch[] = "--adjust-low-mem";
+ 
+ static const char kSandboxDescriptorEnvironmentVarName[] = "SBX_D";
+ static const char kSandboxHelperPidEnvironmentVarName[] = "SBX_HELPER_PID";
++static const char kSandboxNoSuidVarName[] = "SBX_NO_SUID";
+ 
+ static const long kSUIDSandboxApiNumber = 1;
+ static const char kSandboxEnvironmentApiRequest[] = "SBX_CHROME_API_RQ";
+-- 
+1.8.2.1
+

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

@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   dev = {
-    version = "28.0.1485.0";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1485.0.tar.xz";
-    sha256 = "04whky5bwsj909cc1ycwrc91d04iynwncwh21cbbbvg93jsj2pq9";
+    version = "29.0.1516.3";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-29.0.1516.3.tar.xz";
+    sha256 = "0pdn9c6v0v55d7g4amivxrv132bpj9sfqywk5b8l6kqfjq28mw5k";
   };
   beta = {
-    version = "27.0.1453.65";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.65.tar.xz";
-    sha256 = "1flv9870p0bqglnbm4gfzbxzcvz30k2chxgnlbqgpfk5c4qq9mpb";
+    version = "28.0.1500.20";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-28.0.1500.20.tar.xz";
+    sha256 = "1q4qsgixh9q5akjnk614k942kxshi81v4xvm40f7rxzns88qbfrz";
   };
   stable = {
-    version = "26.0.1410.63";
-    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-26.0.1410.63.tar.xz";
-    sha256 = "0gsb0dgk7p04997wlw7swxnnpf5ix9drn0wn07pgsalr8l3zgy3s";
+    version = "27.0.1453.93";
+    url = "http://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.93.tar.xz";
+    sha256 = "0h5d4v7003y3h6rg48dn6cswp6zzj9zdcci3cl9cbb3j9ldc1n3d";
   };
 }

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

@@ -15,9 +15,9 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null;
 
 rec {
 
-  firefoxVersion = "20.0";
+  firefoxVersion = "21.0";
 
-  xulVersion = "20.0"; # this attribute is used by other packages
+  xulVersion = "21.0"; # this attribute is used by other packages
 
 
   src = fetchurl {
@@ -27,7 +27,7 @@ rec {
         # Fall back to this url for versions not available at releases.mozilla.org.
         "ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"
     ];
-    sha1 = "6d776c29da0be0d2a50abeb504d63b06b7861218";
+    sha256 = "076rfh82m1b1hw10dzbgg13h63wmnispgyvag4nb20ylnlf0629r";
   };
 
   commonConfigureFlags =

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

@@ -1,4 +1,4 @@
-{ stdenv, browser, makeDesktopItem, makeWrapper, plugins, libs
+{ stdenv, browser, makeDesktopItem, makeWrapper, plugins, libs, gtk_modules
 , browserName, desktopName, nameSuffix, icon
 }:
 
@@ -28,6 +28,7 @@ stdenv.mkDerivation {
         "$out/bin/${browserName}${nameSuffix}" \
         --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
         --suffix-each LD_LIBRARY_PATH ':' "$libs" \
+        --suffix-each GTK_PATH ':' "$gtk_modules" \
         --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
         --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"
 
@@ -43,6 +44,7 @@ stdenv.mkDerivation {
   # where to find the plugin in its tree.
   plugins = map (x: x + x.mozillaPlugin) plugins;
   libs = map (x: x + "/lib") libs ++ map (x: x + "/lib64") libs;
+  gtk_modules = map (x: x + x.gtkModule) gtk_modules;
 
   meta = {
     description =

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

@@ -0,0 +1,20 @@
+{ stdenv, fetchgit, kdelibs }:
+
+stdenv.mkDerivation rec {
+  name = "kwebkitpart-1.3.2";
+
+  src = fetchgit {
+    url = git://anongit.kde.org/kwebkitpart;
+    rev = "292f32fda933b2ead5a61ff1ec457f839fad5c85";
+    sha256 = "1b2jar9b1yb3gy9fnq8dn2n4z8lffb6pfrj9jc4rjzv5b3rwh1ak";
+  };
+
+  buildInputs = [ kdelibs ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.phreedom ];
+    description = "a WebKit KPart for Konqueror, Akregator and other KDE applications";
+    homepage = https://projects.kde.org/projects/extragear/base/kwebkitpart;
+  };
+}

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

@@ -1,54 +1,92 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, python, intltool, pkgconfig, libX11, gtk
+, ldns, pyopenssl, pythonDBus, pythonPackages
+
+, enableJingle ? true, farstream ? null, gst_plugins_bad ? null
+,                      libnice ? null
+, enableE2E ? true
+, enableRST ? true
+, enableSpelling ? true, gtkspell ? null
+, enableNotifications ? false
+, enableLaTeX ? false, texLive ? null
+}:
+
+assert enableJingle -> farstream != null && gst_plugins_bad != null
+                    && libnice != null;
+assert enableE2E -> pythonPackages.pycrypto != null;
+assert enableRST -> pythonPackages.docutils != null;
+assert enableSpelling -> gtkspell != null;
+assert enableNotifications -> pythonPackages.notify != null;
+assert enableLaTeX -> texLive != null;
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "gajim-${version}";
+  version = "0.15.4";
 
-  version = a.lib.attrByPath ["version"] "0.15.1" a; 
-  buildInputs = with a; [
-    python pyGtkGlade gtk perl intltool dbus gettext
-    pkgconfig makeWrapper libglade pyopenssl libXScrnSaver
-    libXt xproto libXext xextproto libX11 gtkspell aspell
-    scrnsaverproto pycrypto pythonDBus pythonSexy 
-    docutils pyasn1 farstream gst_plugins_bad gstreamer
-    gst_ffmpeg gst_python
-  ];
-in
-rec {
   src = fetchurl {
     url = "http://www.gajim.org/downloads/0.15/gajim-${version}.tar.gz";
-    sha256 = "b315d4a600da0c5f8248e8f887a41ce2630c49995b36cbad8fb2cd81cc8d2e8b";
+    sha256 = "1g4m5j777vqqdwqvr2m6l09ljjx65ilag45d5kfc78z7frm0cz7g";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
+  patches = [
+    (fetchurl {
+      name = "gajim-drill-srv.patch";
+      url = "https://projects.archlinux.org/svntogit/packages.git/"
+          + "plain/trunk/gajim-drill.patch?h=packages/gajim";
+      sha256 = "1k8zz3ns0l0kriffq41jgkv5ym6jvyd24171l7s98v9d81prdw1w";
+    })
+    (fetchurl {
+      name = "gajim-icon-index.patch";
+      url = "http://hg.gajim.org/gajim/raw-rev/b9ec78663dfb";
+      sha256 = "0w54hr5dq9y36val55kmh8d6cid7h4fs2nghx09714jylz2nyxxv";
+    })
+  ];
 
-  preConfigure = a.fullDepEntry (''
-    export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pyGtkGlade})/gtk-2.0"
-    export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath ${a.pygobject})/gtk-2.0"
-    sed -e '/-L[$]x_libraries/d' -i configure
-    sed -e 's@tmpfd.close()@os.close(tmpfd)@' -i src/common/latex.py
-  '') ["addInputs" "doUnpack"];
+  postPatch = ''
+    sed -i -e '0,/^[^#]/ {
+      /^[^#]/i export \\\
+        PYTHONPATH="'"$PYTHONPATH\''${PYTHONPATH:+:}\$PYTHONPATH"'" \\\
+        GST_PLUGIN_PATH="'"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}${""
+        }$GST_PLUGIN_PATH"'"
+    }' scripts/gajim.in
 
-  fixScriptNames = a.fullDepEntry (''
-    mkdir "$out"/bin-wrapped
-    for i in "$out"/bin/.*-wrapped; do
-      name="$i"
-      name="''${name%-wrapped}"
-      name="''${name##*/.}"
-      mv "$i" "$out/bin-wrapped/$name"
-      sed -e 's^'"$i"'^'"$out/bin-wrapped/$name"'^' -i "$out/bin/$name"
-      sed -e "2aexport LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${a.gtkspell}/lib:${a.gtkspell}/lib64\"" -i "$out/bin/gajim"
-      sed -e "2aexport NIX_LDFLAGS=\"\$NIX_LDFLAGS -L${a.gtkspell}/lib -L${a.gtkspell}/lib64\"" -i "$out/bin/gajim"
-      sed -e "2aexport GST_PLUGIN_PATH=\"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}$(echo ${a.gst_plugins_bad}/lib/gstreamer-*):$(echo ${a.gst_ffmpeg}/lib/gstreamer-*):$(echo ${a.farstream}/lib/gstreamer-*)\"" -i "$out/bin/gajim"
-    done
-  '') ["wrapBinContentsPython"];
+    sed -i -e 's/return helpers.is_in_path('"'"'drill.*/return True/' \
+      src/features_window.py
+    sed -i -e "s|'drill'|'${ldns}/bin/drill'|" src/common/resolver.py
+  '' + optionalString enableSpelling ''
+    sed -i -e 's|=.*find_lib.*|= "${gtkspell}/lib/libgtkspell.so"|'   \
+      src/gtkspell.py
+  '' + optionalString enableLaTeX ''
+    sed -i -e "s|try_run(.'dvipng'|try_run(['${texLive}/bin/dvipng'|" \
+           -e "s|try_run(.'latex'|try_run(['${texLive}/bin/latex'|"   \
+           -e 's/tmpfd.close()/os.close(tmpfd)/'                      \
+           src/common/latex.py
+  '';
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["preConfigure" (a.doDump "1") "doConfigure" "doMakeInstall" 
-    "wrapBinContentsPython" "fixScriptNames"];
+  buildInputs = [
+    python intltool pkgconfig libX11
+    pythonPackages.pygobject pythonPackages.pyGtkGlade
+    pythonPackages.sqlite3 pythonPackages.pyasn1
+    pythonPackages.pyxdg
+    pyopenssl pythonDBus
+  ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ]
+    ++ optional enableE2E pythonPackages.pycrypto
+    ++ optional enableRST pythonPackages.docutils
+    ++ optional enableNotifications pythonPackages.notify
+    ++ optional enableLaTeX texLive;
+
+  postInstall = ''
+    install -m 644 -t "$out/share/gajim/icons/hicolor" \
+                      "icons/hicolor/index.theme"
+  '';
+
+  enableParallelBuilding = true;
 
-  name = "gajim-" + version;
   meta = {
-    description = "Jabber client with meta-contacts";
-    maintainers = [a.lib.maintainers.raskin];
+    homepage = "http://gajim.org/";
+    description = "Jabber client written in PyGTK";
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.raskin maintainers.aszlig ];
   };
 }

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

@@ -52,6 +52,8 @@ in stdenv.mkDerivation {
         patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $file || true
         patchelf --set-rpath ${rpath}:$out/lib $file || true
     done
+    substituteInPlace $out/share/applications/hipchat.desktop \
+      --replace /opt/HipChat/bin $out/bin
   '';
 
   meta = {

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

@@ -12,14 +12,14 @@
   enableOfficialBranding ? false
 }:
 
-let version = "17.0"; in
+let version = "17.0.6"; in
 
 stdenv.mkDerivation {
   name = "thunderbird-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
-    sha1 = "ccc5f2e155364948945abf6fd27bebeb4d797aa8";
+    sha1 = "cb5cb5dbfe77179b5853345c826eaa2bc634d48c";
   };
 
   enableParallelBuilding = false;
@@ -89,7 +89,7 @@ stdenv.mkDerivation {
       # Official branding implies thunderbird name and logo cannot be reuse,
       # see http://www.mozilla.org/foundation/licensing.html
       if enableOfficialBranding then licenses.proprietary else licenses.mpl11;
-    maintainers = maintainers.pierron;
+    maintainers = [ maintainers.pierron maintainers.eelco ];
     platforms = platforms.linux;
   };
 }

pkgs/applications/networking/mumble/default.nix

@@ -41,5 +41,7 @@ stdenv.mkDerivation rec {
     homepage = http://mumble.sourceforge.net/;
     description = "Low-latency, high quality voice chat software";
     license = "BSD";
+    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [viric];
   };
 }

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

@@ -1,85 +0,0 @@
-{ stdenv, fetchurl, libextractor, libmicrohttpd, libgcrypt
-, zlib, gmp, curl, libtool, guile, adns, sqlite, pkgconfig
-, libxml2, ncurses, gettext, findutils
-, gtkSupport ? false, gtk ? null, libglade ? null
-, makeWrapper }:
-
-assert gtkSupport -> (gtk != null) && (libglade != null);
-
-let version = "0.8.1b";
-in
-  stdenv.mkDerivation {
-    name = "gnunet-${version}";
-
-    src = fetchurl {
-      url = "mirror://gnu/gnunet/GNUnet-${version}.tar.gz";
-      sha256 = "0k6nrsxz5s52z6hlahb7d3sj1z0gidm79n04pf9j2ngfylp4v1bw";
-    };
-
-    buildInputs = [
-      libextractor libmicrohttpd libgcrypt gmp curl libtool
-      zlib guile adns sqlite libxml2 ncurses
-      pkgconfig gettext findutils
-      makeWrapper
-    ] ++ (if gtkSupport then [ gtk libglade ] else []);
-
-    preConfigure = ''
-      # Brute force: since nix-worker chroots don't provide
-      # /etc/{resolv.conf,hosts}, replace all references to `localhost'
-      # by their IPv4 equivalent.
-      for i in $(find . \( -name \*.c -or -name \*.conf \) \
-                      -exec grep -l localhost {} \;)
-      do
-        echo "$i: substituting \`127.0.0.1' to \`localhost'..."
-        substituteInPlace "$i" --replace "localhost" "127.0.0.1"
-      done
-
-      # Make sure the tests don't rely on `/tmp', for the sake of chroot
-      # builds.
-      for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \
-                      -exec grep -l /tmp {} \;)
-      do
-        echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
-        substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
-      done
-    '';
-
-    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 = {
-      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/p2p/gnunet/svn.nix

@@ -0,0 +1,89 @@
+{ stdenv, fetchsvn, libextractor, libmicrohttpd, libgcrypt
+, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
+, libxml2, ncurses, gettext, libunistring, libidn
+, makeWrapper, autoconf, automake }:
+
+let
+  rev = "27314";
+in
+stdenv.mkDerivation rec {
+  name = "gnunet-svn-${rev}";
+
+  src = fetchsvn {
+    url =  https://gnunet.org/svn/gnunet;
+    sha256 = "14b893y5dy84hp1klrmng06znbh2m2wk4f1kpbhzbwnvjyhk6kdq";
+  };
+
+  buildInputs = [
+    libextractor libmicrohttpd libgcrypt gmp curl libtool
+    zlib adns sqlite libxml2 ncurses libidn
+    pkgconfig gettext libunistring makeWrapper
+    autoconf automake
+  ];
+
+  preConfigure = ''
+    # Brute force: since nix-worker chroots don't provide
+    # /etc/{resolv.conf,hosts}, replace all references to `localhost'
+    # by their IPv4 equivalent.
+    for i in $(find . \( -name \*.c -or -name \*.conf \) \
+                    -exec grep -l '\<localhost\>' {} \;)
+    do
+      echo "$i: substituting \`127.0.0.1' to \`localhost'..."
+      sed -i "$i" -e's/\<localhost\>/127.0.0.1/g'
+    done
+
+    # Make sure the tests don't rely on `/tmp', for the sake of chroot
+    # builds.
+    for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \
+                    -exec grep -l /tmp {} \;)
+    do
+      echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
+      substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
+    done
+
+    # Ensure NSS installation works fine
+    configureFlags="$configureFlags --with-nssdir=$out/lib"
+    patchShebangs src/gns/nss/install-nss-plugin.sh
+
+    sh contrib/pogen.sh
+    sh bootstrap
+  '';
+
+  doCheck = false;
+
+  /* FIXME: Tests must be run this way, but there are still a couple of
+     failures.
+
+  postInstall =
+    '' export GNUNET_PREFIX="$out"
+       export PATH="$out/bin:$PATH"
+       make -k check
+    '';
+  */
+
+  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 = with stdenv.lib.maintainers; [ ludo viric ];
+    platforms = stdenv.lib.platforms.gnu;
+  };
+}

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

@@ -1,16 +1,17 @@
 { stdenv, fetchurl, perl, pkgconfig, gtk, libpcap, flex, bison
 , gnutls, libgcrypt, glib, zlib, libxml2, libxslt, adns, geoip
 , heimdal, python, lynx, lua5
+, makeDesktopItem
 }:
 
-let version = "1.8.5"; in
+let version = "1.8.7"; in
 
 stdenv.mkDerivation {
   name = "wireshark-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/wireshark/wireshark-${version}.tar.bz2";
-    sha256 = "0wp33qa5yvi60b08iiz55wflhr1vwd7680sbwx2kqjlp2s17kr6l";
+    sha256 = "0hm8zisy5dg7sfhh7rvgnpffq2qcw0syd8k5kns8j0j13sf44zjw";
   };
 
   buildInputs =
@@ -20,13 +21,30 @@ stdenv.mkDerivation {
 
   configureFlags = "--disable-usr-local --with-ssl --enable-threads --enable-packet-editor";
 
+  desktopItem = makeDesktopItem {
+    name = "Wireshark";
+    exec = "wireshark";
+    icon = "wireshark";
+    comment = "Powerful network protocol analysis suite";
+    desktopName = "Wireshark";
+    genericName = "Network packet analyzer";
+    categories = "Network;System";
+  };
+
+  postInstall = ''
+    mkdir -p "$out"/share/applications/
+    mkdir -p "$out"/share/icons/
+    cp "$desktopItem"/share/applications/* "$out"/share/applications/
+    cp image/wsicon.svg "$out"/share/icons/wireshark.svg
+  '';
+
   meta = {
-    homepage = "http://sourceforge.net/projects/wireshark/";
+    homepage = http://www.wireshark.org/;
     description = "a powerful network protocol analyzer";
     license = stdenv.lib.licenses.gpl2;
 
     longDescription = ''
-      Wireshark (formerly known as "Etherreal") is a powerful network
+      Wireshark (formerly known as "Ethereal") is a powerful network
       protocol analyzer developed by an international team of networking
       experts. It runs on UNIX, OS X and Windows.
     '';

pkgs/applications/networking/umurmur/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, protobufc, libconfig }:
 
 stdenv.mkDerivation rec {
-  name = "umurmur-0.2.10";
+  name = "umurmur-0.2.12";
   
   src = fetchurl {
     url = "http://umurmur.googlecode.com/files/${name}.tar.gz";
-    sha256 = "0c990jvm73a6lajr1qlzw0p6nkshkh2nqwjmz2sq79pj0hm9ckvy";
+    sha1 = "5be3c765af3c5f518d1e1bbd828b3582ad4097cd";
   };
   
   buildInputs = [ openssl protobufc libconfig ];

pkgs/applications/office/calligra/default.nix

@@ -4,11 +4,11 @@
 , libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular }:
 
 stdenv.mkDerivation rec {
-  name = "calligra-2.5.0";
+  name = "calligra-2.5.5";
 
   src = fetchurl {
     url = "mirror://kde/stable/${name}/${name}.tar.bz2";
-    sha256 = "0q6ydi7hzrzwqzb38gikdh1l2zf8qp4i3nkgyb01148bjwrhvf21";
+    sha256 = "0h9idadrcyjvd0mkwri4lg310mzpna6s0pvc7b7r3267wzjbn9kw";
   };
 
   nativeBuildInputs = [ cmake perl pkgconfig ];

pkgs/applications/office/libreoffice/default.nix

@@ -16,7 +16,7 @@ let
   langsSpaces = stdenv.lib.concatStringsSep " " langs;
   major = "3";
   minor = "6";
-  patch = "2";
+  patch = "6";
   tweak = "2";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
@@ -36,17 +36,17 @@ let
       }) ] ++ (map fetchThirdParty (import ./libreoffice-srcs.nix));
     translations = fetchSrc {
       name = "translations";
-      sha256 = "a6ef65d5acfe9be19a3d4d743cd23a1017733f651ffc57f5773a24704a282c33";
+      sha256 = "1n3yk2077adyxrhs0jpkbm8dg3lxpn3sy63f0dl87ifv7ha1rfpn";
     };
 
     help = fetchSrc {
       name = "help";
-      sha256 = "55ec6ef5eef4bbf2298c3b864f67c8424ebb5ccbe7bcd6ca59abba2867989e31";
+      sha256 = "12rb5mw6sbi41w1zaxrj4qffiis9qcx8ibp5cpmwsz07nsdv5sxk";
     };
 
     core = fetchSrc {
       name = "core";
-      sha256 = "5ec07ffacec09c4dcee9246cb132f7a59a618b395835e781735fd61bf47e8d37";
+      sha256 = "0xw36sa73cgk3k3fv1spv5pavm95bc02lszn8415ay36lcc098pn";
     };
   };
 in

pkgs/applications/office/libreoffice/libreoffice-srcs.nix

@@ -336,8 +336,8 @@
   md5 = "d197bd6211669a2fa4ca648faf04bcb1";
 }
 {
-  name = "mdds_0.5.3.tar.bz2";
-  md5 = "0ff7d225d087793c8c2c680d77aac3e7";
+  name = "mdds_0.6.1.tar.bz2";
+  md5 = "9f9e15966b5624834157fe3d748312bc";
 }
 {
   name = "boost_1_44_0.tar.bz2";
@@ -352,8 +352,8 @@
   md5 = "3bf481ca95109b14435125c0dd1f2217";
 }
 {
-  name = "libvisio-0.0.18.tar.bz2";
-  md5 = "a9a1db27688bad49418667b434d29c1f";
+  name = "libvisio-0.0.19.tar.bz2";
+  md5 = "94e7f271e38c976462558b4278590178";
 }
 {
   name = "LinLibertineG-20120116.zip";
@@ -364,15 +364,11 @@
   md5 = "0d2dcdfbf28d6208751b33057f5361f0";
 }
 {
-  name = "libcdr-0.0.8.tar.bz2";
-  md5 = "ce5a1def34578b75959ac31210f031f6";
+  name = "libcdr-0.0.9.tar.bz2";
+  md5 = "3c0037fb07dea2f0bbae8386fa7c6a9a";
 }
 {
   name = "lcms2-2.3.tar.gz";
   md5 = "327348d67c979c88c2dec59a23a17d85";
 }
-{
-  name = "libvisio-0.0.19.tar.bz2";
-  md5 = "94e7f271e38c976462558b4278590178";
-}
 ]

pkgs/applications/science/astronomy/stellarium/default.nix

@@ -1,14 +1,14 @@
 {stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv}:
 
 let
-  name = "stellarium-0.11.4a";
+  name = "stellarium-0.12.1";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/stellarium/${name}.tar.gz";
-    sha256 = "0gs3lf2061chgcyx22xbnn6b284nsnj8xal7jyjzj57s8yk4n619";
+    sha256 = "02qfp56mkg3bqggv3ndx8v6zfswg51gkczwiqy5c9y4rw28hazla";
   };
 
   buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ];

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

@@ -0,0 +1,86 @@
+{ stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig
+, openssl, libXrender, libXrandr, libXcursor, libX11, libXext, libXi
+}:
+
+let
+
+  libPath = stdenv.lib.makeLibraryPath
+    [ zlib freetype fontconfig openssl libXrender libXrandr libXcursor libX11
+      libXext libXi
+    ];
+
+in
+
+stdenv.mkDerivation rec {
+  name = "eagle-${version}";
+  version = "6.4.0";
+
+  src = fetchurl {
+    url = "ftp://ftp.cadsoft.de/eagle/program/6.4/eagle-lin-${version}.run";
+    sha256 = "0jb44dsq4cl9rx5nam6rxsw9fsmm6fsksv9s544p2zrwnad2x2i8";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "Eagle";
+    exec = "eagle";
+    icon = "eagle";
+    comment = "Schematic capture and PCB layout";
+    desktopName = "Eagle";
+    genericName = "Schematic editor";
+    categories = "Application;Development;";
+  };
+
+  buildInputs =
+    [ patchelf zlib freetype fontconfig openssl libXrender libXrandr libXcursor
+      libX11 libXext libXi
+    ];
+
+  phases = [ "installPhase" ];
+
+  # NOTES:
+  # Eagle for Linux comes as a self-extracting shell script with embedded
+  # tarball. The tarball data (.tar.bz2) starts after a __DATA__ marker.
+  #
+  # Eagle apparently doesn't like binary patching. This is what happens:
+  #   $ ./result/eagle-6.4.0/bin/eagle
+  #   argv[0] (/home/bfo/nixpkgs/result/eagle-6.4.0/bin/eagle) is not the currently executed program version!
+  installPhase = ''
+    # Extract eagle tarball
+    mkdir "$out"
+    sed '1,/^__DATA__$/d' "$src" | tar -xjf - -C "$out"
+
+    # Install manpage
+    mkdir -p "$out"/share/man/man1
+    ln -s "$out"/eagle-${version}/doc/eagle.1 "$out"/share/man/man1/eagle.1
+
+    # Build LD_PRELOAD library that redirects license file access to the home
+    # directory of the user
+    mkdir -p "$out"/lib
+    gcc -shared -fPIC -DEAGLE_PATH=\"$out/eagle-${version}\" ${./eagle_fixer.c} -o "$out"/lib/eagle_fixer.so -ldl
+
+    # Make wrapper script
+    dynlinker="$(cat $NIX_GCC/nix-support/dynamic-linker)"
+    mkdir -p "$out"/bin
+    cat > "$out"/bin/eagle << EOF
+    #!${stdenv.shell}
+    export LD_LIBRARY_PATH="${stdenv.gcc.gcc}/lib:${libPath}"
+    export LD_PRELOAD="$out/lib/eagle_fixer.so"
+    exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@"
+    EOF
+    chmod a+x "$out"/bin/eagle
+
+    # Make desktop item
+    mkdir -p "$out"/share/applications
+    cp "$desktopItem"/share/applications/* "$out"/share/applications/
+    mkdir -p "$out"/share/icons
+    ln -s "$out/eagle-${version}/bin/eagleicon50.png" "$out"/share/icons/eagle.png
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Schematic editor and PCB layout tool from CadSoft";
+    homepage = http://www.cadsoftusa.com/;
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}

pkgs/applications/science/electronics/eagle/eagle_fixer.c

@@ -0,0 +1,134 @@
+/*
+ * LD_PRELOAD trick to make Eagle (schematic editor and PCB layout tool from
+ * CadSoft) work from a read-only installation directory.
+ *
+ * When Eagle starts, it looks for the license file in <eagle>/bin/eagle.key
+ * (where <eagle> is the install path). If eagle.key is not found, Eagle checks
+ * for write access to <eagle>/bin/, shows a license dialog to the user and
+ * then attempts to write a license file to <eagle>/bin/.
+ *
+ * This will of course fail when Eagle is installed in the read-only Nix store.
+ * Hence this library that redirects accesses to the those paths in the
+ * following way:
+ *
+ *   <eagle>/bin              => $HOME
+ *   <eagle>/bin/eagle.key    => $HOME/.eagle.key
+ *
+ * Also, if copying an example project to ~/eagle/ (in the Eagle GUI), Eagle
+ * chmod's the destination with read-only permission bits (presumably because
+ * the source is read-only) and fails to complete the copy operation.
+ * Therefore, the mode argument in calls to chmod() is OR'ed with the S_IWUSR
+ * bit (write by owner).
+ *
+ * Usage:
+ *   gcc -shared -fPIC -DEAGLE_PATH="$out/eagle-${version}" eagle_fixer.c -o eagle_fixer.so -ldl
+ *   LD_PRELOAD=$PWD/eagle_fixer.so ./result/bin/eagle
+ *
+ * To see the paths that are modified at runtime, set the environment variable
+ * EAGLE_FIXER_DEBUG to 1.
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <dlfcn.h>
+#include <limits.h>
+#include <sys/stat.h>
+
+#ifndef EAGLE_PATH
+#error Missing EAGLE_PATH, path to the eagle-${version} installation directory.
+#endif
+
+typedef FILE *(*fopen_func_t)(const char *path, const char *mode);
+typedef int (*access_func_t)(const char *pathname, int mode);
+typedef int (*chmod_func_t)(const char *path, mode_t mode);
+
+/*
+ * Map <eagle>/bin to $HOME and <eagle>/bin/eagle.key to $HOME/.eagle.key
+ *
+ * Path is truncated if bigger than PATH_MAX. It's not threadsafe, but that's
+ * OK.
+ */
+static const char *redirect(const char *pathname)
+{
+	static char buffer[PATH_MAX];
+	const char *homepath;
+	const char *new_path;
+	static int have_warned;
+
+	homepath = getenv("HOME");
+	if (!homepath) {
+		homepath = "/";
+		if (!have_warned && getenv("EAGLE_FIXER_DEBUG")) {
+			fprintf(stderr, "eagle_fixer: HOME is unset, using \"/\" (root) instead.\n");
+			have_warned = 1;
+		}
+	}
+
+	new_path = pathname;
+	if (strcmp(EAGLE_PATH "/bin", pathname) == 0) {
+		/* redirect to $HOME */
+		new_path = homepath;
+	} else if (strcmp(EAGLE_PATH "/bin/eagle.key", pathname) == 0) {
+		/* redirect to $HOME/.eagle.key */
+		snprintf(buffer, PATH_MAX, "%s/.eagle.key", homepath);
+		buffer[PATH_MAX-1] = '\0';
+		new_path = buffer;
+	}
+
+	return new_path;
+}
+
+FILE *fopen(const char *pathname, const char *mode)
+{
+	FILE *fp;
+	const char *path;
+	fopen_func_t orig_fopen;
+
+	orig_fopen = (fopen_func_t)dlsym(RTLD_NEXT, "fopen");
+	path = redirect(pathname);
+	fp = orig_fopen(path, mode);
+
+	if (path != pathname && getenv("EAGLE_FIXER_DEBUG")) {
+		fprintf(stderr, "eagle_fixer: fopen(\"%s\", \"%s\") => \"%s\": fp=%p\n", pathname, mode, path, fp);
+	}
+
+	return fp;
+}
+
+int access(const char *pathname, int mode)
+{
+	int ret;
+	const char *path;
+	access_func_t orig_access;
+
+	orig_access = (access_func_t)dlsym(RTLD_NEXT, "access");
+	path = redirect(pathname);
+	ret = orig_access(path, mode);
+
+	if (path != pathname && getenv("EAGLE_FIXER_DEBUG")) {
+		fprintf(stderr, "eagle_fixer: access(\"%s\", %d) => \"%s\": ret=%d\n", pathname, mode, path, ret);
+	}
+
+	return ret;
+}
+
+int chmod(const char *pathname, mode_t mode)
+{
+	int ret;
+	mode_t new_mode;
+	chmod_func_t orig_chmod;
+
+	orig_chmod = (chmod_func_t)dlsym(RTLD_NEXT, "chmod");
+	new_mode = mode | S_IWUSR;
+	ret = orig_chmod(pathname, new_mode);
+
+	if (getenv("EAGLE_FIXER_DEBUG")) {
+		fprintf(stderr, "eagle_fixer: chmod(\"%s\", %o) => %o: ret=%d\n", pathname, mode, new_mode, ret);
+	}
+
+	return ret;
+}

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

@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, blas, bzip2, gfortran, liblapack, libX11, libXmu, libXt
+, libjpeg, libpng, libtiff, ncurses, pango, pcre, perl, readline, tcl
+, texLive, tk, xz, zlib, less, texinfo, graphviz
+}:
+
+stdenv.mkDerivation rec {
+  name = "R-3.0.1";
+
+  src = fetchurl {
+    url = "http://ftp5.gwdg.de/pub/misc/cran/src/base/R-3/${name}.tar.gz";
+    sha256 = "0d3iv382bsyz6ad5fk382x7sy3qzgpqvd0fw26r0648lyf54i45g";
+  };
+
+  buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt
+    libXt libjpeg libpng libtiff ncurses pango pcre perl readline tcl
+    texLive tk xz zlib less texinfo graphviz ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "a free software environment for statistical computing and graphics";
+    homepage = "http://www.r-project.org/";
+    license = stdenv.lib.licenses.gpl2Plus;
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}

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

@@ -2,14 +2,14 @@
 
 let
   name    = "wxmaxima";
-  version = "12.09.0";
+  version = "13.04.1";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${name}/wxMaxima-${version}.tar.gz";
-    sha256 = "5803ab62fc791bcb87f0d0f38357dba6fccc4efa61cb9f709e142c2954b1305d";
+    url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxMaxima-${version}.tar.gz";
+    sha256 = "0irp1m9vr50ym7wfj1c1vbrzd2pip1vmvn9ykqsdf04afkkwkran";
   };
 
   buildInputs = [wxGTK maxima makeWrapper];

pkgs/applications/science/spyder/default.nix

@@ -42,7 +42,7 @@ buildPythonPackage rec {
     cp spyderlib/images/spyder.svg $out/share/icons/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Scientific PYthon Development EnviRonment (SPYDER)";
     longDescription = ''
       Spyder (previously known as Pydee) is a powerful interactive development
@@ -50,6 +50,8 @@ buildPythonPackage rec {
       testing, debugging and introspection features.
     '';
     homepage = https://code.google.com/p/spyderlib/;
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [maintainers.bjornfor];
   };
 }

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

@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
-    url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
-    sha256 = "0g89lmkrs02qdb1k1bfq9gz3j4yv35320vb8ddmj99f4nnhqc6vv";
+    url = "https://github.com/joeyh/git-annex/tarball/${version}";
+    sha256 = "1280sdj3d3s3k5a1znzl7xzzyncv9kz522bprhwb9if03v6xh2kl";
     name = "git-annex-${version}.tar.gz";
   };
 

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

@@ -10,7 +10,7 @@
 
 let
 
-  version = "1.8.2.1";
+  version = "1.8.2.3";
 
   svn = subversionClient.override { perlBindings = true; };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha1 = "ad9f833e509ba31c83efe336fd3599e89a39394b";
+    sha1 = "2831f7deec472db4d0d0cdffb4d82d91cecdf295";
   };
 
   patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];

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

@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
     mkdir -p $out/etc/bash_completion.d/
     cp contrib/tig-completion.bash $out/etc/bash_completion.d/
   '';
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://jonas.nitro.dk/tig/";
     description = "Tig is a git repository browser that additionally can act as a pager for output from various git commands";
-    maintainers = [ stdenv.lib.maintainers.garbas ];
-    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ maintainers.garbas maintainers.bjornfor ];
+    license = licenses.gpl2;
   };
 }

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

@@ -2,14 +2,15 @@
 , guiSupport ? false, tk ? null, curses }:
 
 let
-  name = "mercurial-2.2.3";
+  name = "mercurial-2.6.1";
 in
+
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "0yv7kn96270fixigry910c1i3zzivimh1xjxywqjn9dshn2y6qbw";
+    sha256 = "0r4fg269xnqgacc82ppm3wxl9wwvvgwz8z6zi1iai4gx76iklhdn";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git
@@ -39,6 +40,12 @@ stdenv.mkDerivation {
           $WRAP_TK
       done
 
+      mkdir -p $out/etc/mercurial
+      cat >> $out/etc/mercurial/hgrc << EOF
+      [web]
+      cacerts = /etc/ssl/certs/ca-bundle.crt
+      EOF
+
       # copy hgweb.cgi to allow use in apache
       mkdir -p $out/share/cgi-bin
       cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin
@@ -49,5 +56,6 @@ stdenv.mkDerivation {
     description = "A fast, lightweight SCM system for very large distributed projects";
     homepage = "http://www.selenic.com/mercurial/";
     license = "GPLv2";
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }

pkgs/applications/video/mplayer/default.nix

@@ -16,6 +16,7 @@
 , x264Support ? false, x264 ? null
 , jackaudioSupport ? false, jackaudio ? null
 , pulseSupport ? false, pulseaudio ? null
+, bs2bSupport ? false, libbs2b ? null
 # For screenshots
 , libpngSupport ? true, libpng ? null
 , useUnfreeCodecs ? false
@@ -38,6 +39,7 @@ assert theoraSupport -> libtheora != null;
 assert x264Support -> x264 != null;
 assert jackaudioSupport -> jackaudio != null;
 assert pulseSupport -> pulseaudio != null;
+assert bs2bSupport -> libbs2b != null;
 assert libpngSupport -> libpng != null;
 
 let
@@ -112,6 +114,7 @@ stdenv.mkDerivation rec {
     ++ optional vdpauSupport libvdpau
     ++ optional speexSupport speex
     ++ optional libpngSupport libpng
+    ++ optional bs2bSupport libbs2b
     ;
 
   nativeBuildInputs = [ yasm ];

pkgs/applications/video/mplayer2/default.nix

@@ -12,6 +12,7 @@
 , theoraSupport ? true, libtheora ? null
 , jackaudioSupport ? false, jackaudio ? null
 , pulseSupport ? true, pulseaudio ? null
+, bs2bSupport ? false, libbs2b ? null
 # For screenshots
 , libpngSupport ? true, libpng ? null
 , useUnfreeCodecs ? false
@@ -29,6 +30,7 @@ assert speexSupport -> speex != null;
 assert theoraSupport -> libtheora != null;
 assert jackaudioSupport -> jackaudio != null;
 assert pulseSupport -> pulseaudio != null;
+assert bs2bSupport -> libbs2b != null;
 assert libpngSupport -> libpng != null;
 
 let
@@ -92,6 +94,7 @@ stdenv.mkDerivation rec {
     ++ optional screenSaverSupport libXScrnSaver
     ++ optional vdpauSupport libvdpau
     ++ optional speexSupport speex
+    ++ optional bs2bSupport libbs2b
     ++ optional libpngSupport libpng
     ;
 

pkgs/applications/video/xbmc/default.nix

@@ -33,11 +33,11 @@ assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport;
 assert pulseSupport -> pulseaudio != null;
 
 stdenv.mkDerivation rec {
-    name = "xbmc-12.1";
+    name = "xbmc-12.2";
 
     src = fetchurl {
       url = "http://mirrors.xbmc.org/releases/source/${name}.tar.gz";
-      sha256 = "1hqyq1vl34sywcj8zgx7kdpf8ljzj969l5w6yy4314c431pg7qr9";
+      sha256 = "077apkq9sx6wlwkwmiz63w5dcqbbrbjbn6qk9fj2fgaizhs0ccxj";
     };
 
     buildInputs = [

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

@@ -1,13 +1,19 @@
-{ stdenv, fetchurl, pkgconfig, glib, pango, libxml2, libXau }:
+{ stdenv, fetchurl, pkgconfig
+, libxml2, libXinerama, libXcursor, libXau, libXrandr
+, imlib2, pango, libstartup_notification }:
 
 stdenv.mkDerivation rec {
-  name = "openbox-3-4-11-2";
+  name = "openbox-3.5.0";
 
-  buildInputs = [ pkgconfig glib pango libxml2 libXau ];
+  buildInputs = [
+    pkgconfig libxml2
+    libXinerama libXcursor libXau libXrandr
+    imlib2 pango libstartup_notification
+  ];
 
   src = fetchurl {
-    url = http://openbox.org/dist/openbox/openbox-3.4.11.2.tar.gz;
-    sha256 = "2e7579389c30e6bb08cc721a2c1af512e049fec2670e71715aa1c4e129ec349d";
+    url = "http://openbox.org/dist/openbox/${name}.tar.gz";
+    sha256 = "02pa1wa2rzvnq1z3xchzafc96hvp3537jh155q8acfhbacb01abg";
   };
 
   meta = {

pkgs/build-support/fetchhg/builder.sh

@@ -2,7 +2,7 @@ source $stdenv/setup
 
 header "getting $url${tag:+ ($tag)} into $out"
 
-hg clone ${tag:+-r "$tag"} "$url" "$out"
+hg clone --insecure ${tag:+-r "$tag"} "$url" "$out"
 
 rm -rf "$out/.hg"
 

pkgs/build-support/fetchsvn/default.nix

@@ -1,5 +1,5 @@
-{stdenv, subversion, sshSupport ? false, openssh ? null}: 
-{url, rev ? "HEAD", md5 ? "", sha256 ? "", ignoreExternals ? false}:
+{stdenv, subversion, sshSupport ? false, openssh ? null}:
+{url, rev ? "HEAD", md5 ? "", sha256 ? "", ignoreExternals ? false, name ? null}:
 
 let
   repoName = with stdenv.lib;
@@ -18,10 +18,12 @@ let
       else if snd path == "tags" then     "${trd path}-${fst path}"
       # ../repo (no trunk) -> repo
       else fst path;
+
+  name_ = if name == null then "${repoName}-r${toString rev}" else name;
 in
 
 stdenv.mkDerivation {
-  name = "${repoName}-r${toString rev}";
+  name = name_;
   builder = ./builder.sh;
   buildInputs = [subversion];
 

pkgs/build-support/fetchurl/builder.sh

@@ -13,6 +13,7 @@ curl="curl \
  --disable-epsv \
  --cookie-jar cookies \
  --insecure \
+ $curlOpts \
  $NIX_CURL_FLAGS"
 
 

pkgs/build-support/fetchurl/default.nix

@@ -47,6 +47,9 @@ in
   # locations.  They are tried in order.
   urls ? []
 
+, # Additional curl options needed for the download to succeed.
+  curlOpts ? ""
+
 , # Name of the file.  If empty, use the basename of `url' (or of the
   # first element of `urls').
   name ? ""
@@ -97,7 +100,7 @@ stdenv.mkDerivation {
   outputHash = if outputHash != "" then outputHash else
       if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
 
-  inherit showURLs mirrorsFile impureEnvVars;
+  inherit curlOpts showURLs mirrorsFile impureEnvVars;
 
   # Doing the download on a remote machine just duplicates network
   # traffic, so don't do that.

pkgs/build-support/kdewrapper/default.nix

@@ -0,0 +1,42 @@
+{ stdenv, kde4, shared_mime_info, extraLibs ? [] }:
+
+/* Supply a KDE program, and it will have the necessary KDE vars to
+  get icons, mime types, etc. working.
+  For example:
+  
+  packageOverrides = pkgs : {
+    kdenliveWrapped = kde4.wrapper kde4.kdenlive;
+  };
+  */
+program:
+
+let
+  libs = with kde4; [ kdelibs kde_runtime oxygen_icons shared_mime_info ]
+    ++ extraLibs;
+in
+stdenv.mkDerivation {
+  name = program.name + "-wrapped";
+
+  inherit libs;
+
+  buildCommand = ''
+    ensureDir $out/bin
+
+    KDEDIRS=${program}
+    QT_PLUGIN_PATH=${program}/lib/qt4/plugins:${program}/lib/kde4/plugins
+    for a in $libs; do
+      KDEDIRS=$a''${KDEDIRS:+:}$KDEDIRS
+      QT_PLUGIN_PATH=$a/lib/qt4/plugins:$a/lib/kde4/plugins''${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH
+    done
+    for a in ${program}/bin/*; do 
+      PROG=$out/bin/`basename $a` 
+    cat > $PROG << END
+    #!/bin/sh
+    export KDEDIRS=$KDEDIRS\''${KDEDIRS:+:}\$KDEDIRS
+    export QT_PLUGIN_PATH=$QT_PLUGIN_PATH\''${QT_PLUGIN_PATH:+:}\$QT_PLUGIN_PATH
+    exec $a "\$@"
+    END
+    chmod +x $PROG
+    done
+  '';
+}

pkgs/build-support/vm/default.nix

@@ -1,9 +1,9 @@
 { pkgs
-, linuxKernel ? pkgs.linux
+, linuxKernel ? pkgs.linux_3_9
 , img ? "bzImage"
 , rootModules ?
     [ "cifs" "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "nls_utf8" "ext2" "ext3"
-      "ext4" "unix" "hmac" "md4" "ecb" "des_generic"
+      "ext4" "unix" "hmac" "md4" "ecb" "des_generic" "sha256"
     ]
 }:
 
@@ -123,14 +123,14 @@ rec {
 
     echo "mounting Nix store..."
     mkdir -p /fs/nix/store
-    mount -t cifs //10.0.2.4/store /fs/nix/store -o guest,sec=none
+    mount -t cifs //10.0.2.4/store /fs/nix/store -o guest,sec=none,sec=ntlm
 
     mkdir -p /fs/tmp
     mount -t tmpfs -o "mode=755" none /fs/tmp
 
     echo "mounting host's temporary directory..."
     mkdir -p /fs/tmp/xchg
-    mount -t cifs //10.0.2.4/xchg /fs/tmp/xchg -o guest,sec=none
+    mount -t cifs //10.0.2.4/xchg /fs/tmp/xchg -o guest,sec=none,sec=ntlm
 
     mkdir -p /fs/proc
     mount -t proc none /fs/proc
@@ -302,7 +302,7 @@ rec {
     fi
     touch /mnt/.debug
 
-    mkdir /mnt/proc /mnt/dev /mnt/sys /mnt/bin
+    mkdir /mnt/proc /mnt/dev /mnt/sys
     ${createDeviceNodes "/mnt/dev"}
   '';
 
@@ -445,7 +445,7 @@ rec {
      etc. from the specified filesystem image, which typically is a
      filesystem containing a non-NixOS Linux distribution. */
 
-  runInLinuxImage = attrs: runInLinuxVM (attrs // {
+  runInLinuxImage = drv: runInLinuxVM (lib.overrideDerivation drv (attrs: {
     mountDisk = true;
 
     /* Mount `image' as the root FS, but use a temporary copy-on-write
@@ -470,7 +470,7 @@ rec {
 
     /* Don't run Nix-specific build steps like patchelf. */
     fixupPhase = "true";
-  });
+  }));
 
 
   /* Create a filesystem image of the specified size and fill it with
@@ -479,6 +479,7 @@ rec {
   fillDiskWithRPMs =
     { size ? 4096, rpms, name, fullName, preInstall ? "", postInstall ? ""
     , runScripts ? true, createRootFS ? defaultCreateRootFS
+    , unifiedSystemDir ? false
     }:
 
     runInLinuxVM (stdenv.mkDerivation {
@@ -491,10 +492,25 @@ rec {
 
         chroot=$(type -tP chroot)
 
+        # Make the Nix store available in /mnt, because that's where the RPMs live.
+        mkdir -p /mnt/nix/store
+        ${utillinux}/bin/mount -o bind /nix/store /mnt/nix/store
+
+        # Newer distributions like Fedora 18 require /lib etc. to be
+        # symlinked to /usr.
+        ${lib.optionalString unifiedSystemDir ''
+          mkdir -p /mnt/usr/bin /mnt/usr/sbin /mnt/usr/lib /mnt/usr/lib64
+          ln -s /usr/bin /mnt/bin
+          ln -s /usr/sbin /mnt/sbin
+          ln -s /usr/lib /mnt/lib
+          ln -s /usr/lib64 /mnt/lib64
+          ${utillinux}/bin/mount -t proc none /mnt/proc
+        ''}
+
         echo "unpacking RPMs..."
         for i in $rpms; do
             echo "$i..."
-            ${rpm}/bin/rpm2cpio "$i" | (cd /mnt && ${cpio}/bin/cpio -i --make-directories)
+            ${rpm}/bin/rpm2cpio "$i" | (chroot /mnt ${cpio}/bin/cpio -i --make-directories)
         done
 
         eval "$preInstall"
@@ -505,9 +521,6 @@ rec {
         PATH=/usr/bin:/bin:/usr/sbin:/sbin $chroot /mnt \
           rpm --initdb
 
-        # Make the Nix store available in /mnt, because that's where the RPMs live.
-        mkdir -p /mnt/nix/store
-        ${utillinux}/bin/mount -o bind /nix/store /mnt/nix/store
         ${utillinux}/bin/mount -o bind /tmp /mnt/tmp
 
         echo "installing RPMs..."
@@ -519,8 +532,7 @@ rec {
 
         rm /mnt/.debug
 
-        ${utillinux}/bin/umount /mnt/nix/store
-        ${utillinux}/bin/umount /mnt/tmp
+        ${utillinux}/bin/umount /mnt/nix/store /mnt/tmp ${lib.optionalString unifiedSystemDir "/mnt/proc"}
         ${utillinux}/bin/umount /mnt
       '';
 
@@ -726,10 +738,11 @@ rec {
     , packagesList ? "", packagesLists ? [packagesList]
     , packages, extraPackages ? []
     , preInstall ? "", postInstall ? "", archs ? ["noarch" "i386"]
-    , runScripts ? true, createRootFS ? defaultCreateRootFS }:
+    , runScripts ? true, createRootFS ? defaultCreateRootFS
+    , unifiedSystemDir ? false }:
 
     fillDiskWithRPMs {
-      inherit name fullName size preInstall postInstall runScripts createRootFS;
+      inherit name fullName size preInstall postInstall runScripts createRootFS unifiedSystemDir;
       rpms = import (rpmClosureGenerator {
         inherit name packagesLists urlPrefixes archs;
         packages = packages ++ extraPackages;
@@ -982,6 +995,32 @@ rec {
       packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
     };
 
+    fedora18i386 = {
+      name = "fedora-18-i386";
+      fullName = "Fedora 18 (i386)";
+      packagesList = fetchurl {
+        url = mirror://fedora/linux/releases/18/Everything/i386/os/repodata/935f57e61365047b6aee346792bc68bfd24de30874ce5d26bf730a992d36678d-primary.xml.gz;
+        sha256 = "935f57e61365047b6aee346792bc68bfd24de30874ce5d26bf730a992d36678d";
+      };
+      urlPrefix = mirror://fedora/linux/releases/18/Everything/i386/os;
+      archs = ["noarch" "i386" "i586" "i686"];
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
+      unifiedSystemDir = true;
+    };
+
+    fedora18x86_64 = {
+      name = "fedora-18-x86_64";
+      fullName = "Fedora 18 (x86_64)";
+      packagesList = fetchurl {
+        url = mirror://fedora/linux/releases/18/Everything/x86_64/os/repodata/463ac49f2218e404607b2eeb3c04be1a648d90293f4239bbb6a63c2fed672bea-primary.xml.gz;
+        sha256 = "463ac49f2218e404607b2eeb3c04be1a648d90293f4239bbb6a63c2fed672bea";
+      };
+      urlPrefix = mirror://fedora/linux/releases/18/Everything/x86_64/os;
+      archs = ["noarch" "x86_64"];
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
+      unifiedSystemDir = true;
+    };
+
     opensuse103i386 = {
       name = "opensuse-10.3-i586";
       fullName = "openSUSE 10.3 (i586)";
@@ -1559,14 +1598,14 @@ rec {
         name = "redhat-9-i386";
         fullName = "Red Hat Linux 9 (i386)";
         size = 1024;
-        rpms = import ./rpm/redhat-9-i386.nix {inherit fetchurl;};
+        rpms = import ./rpm/redhat-9-i386.nix { inherit fetchurl; };
       };
 
       suse90i386 = fillDiskWithRPMs {
         name = "suse-9.0-i386";
         fullName = "SUSE Linux 9.0 (i386)";
         size = 1024;
-        rpms = import ./rpm/suse-9-i386.nix {inherit fetchurl;};
+        rpms = import ./rpm/suse-9-i386.nix { inherit fetchurl; };
         # Urgh.  The /etc/group entries are installed by aaa_base (or
         # something) but due to dependency ordering, that package isn't
         # installed yet by the time some other packages refer to these

pkgs/data/misc/cacert/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "cacert-20120628";
+  name = "cacert-20121229";
 
   src = fetchurl {
     url = "http://nixos.org/tarballs/${name}.pem.bz2";
-    sha256 = "0xg9f1w2pmsv221lgc60c07bs0xf2rr189a2yp2y9an95h3gx7ir";
+    sha256 = "031s86pqvn620zkj6w97hqgjvkp6vsvlymzz7rwvkv25zvrjsgif";
   };
 
   unpackPhase = "true";

pkgs/data/misc/freepats/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "freepats-20060219";
+
+  src = fetchurl {
+    url = "http://freepats.zenvoid.org/${name}.tar.bz2";
+    sha256 = "12iw36rd94zirll96cd5k0va7p5hxmf2shvjlhzihcmjaw8flq82";
+  };
+
+  installPhase = ''mkdir "$out"; cp -r . "$out"'';
+
+  meta = with stdenv.lib; {
+    description = "Instrument patches, for MIDI synthesizers";
+    longDescription = ''
+      Freepats is a project to create a free and open set of instrument
+      patches, in any format, that can be used with softsynths.
+    '';
+    homepage = http://freepats.zenvoid.org/;
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = [maintainers.bjornfor];
+  };
+}

pkgs/data/misc/shared-mime-info/default.nix

@@ -2,11 +2,11 @@
 , libxml2, glib}:
 
 stdenv.mkDerivation rec {
-  name = "shared-mime-info-1.0";
+  name = "shared-mime-info-1.1";
 
   src = fetchurl {
     url = "http://freedesktop.org/~hadess/${name}.tar.xz";
-    sha256 = "13xf09c4vc4hl5qhk7i4gc6z8knc32b5wjb4ds8ds4z2mbjk1s6j";
+    sha256 = "0v70z5b6340jsjvdhf7brczpzq766wc1lsnjg9hc57ks2m5hjk8q";
   };
 
   buildInputs = [

pkgs/desktops/kde-4.10/default.nix

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

pkgs/desktops/kde-4.10/kde-package/4.10.2.nix

@@ -1,399 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="analitza";value="1k950n7rq081qy2pv7cbwzr81qp6bifll7cddgwgxk9kv16wrmh1";}
-  {name="ark";value="11jfdw4hkma564r6b9mn6vn2h5s6b6mf4imjad6iw7z3lxq6v7w9";}
-  {name="audiocd-kio";value="0zgil29ig2n5km3wzsx0gpwxk7l6zpcnxqgws9mgaqm3vnfqcjh6";}
-  {name="blinken";value="19jxlqalxfbxh1dshgpdyjkb8n7bynfr09p4hy38kv6nfil890y8";}
-  {name="bomber";value="08g82id9sf1m9zg38k47vannqcpm3fmskpgz4j41bcn24yfwynvf";}
-  {name="bovo";value="1zsbly04bcn00gyl751vszw82pvakdlw6l1n67hsgg3h5wa5z1fb";}
-  {name="cantor";value="1f3xwl9da0cz25qrx47p9b1bkcsbdj4i740py6awvhrrq60s0870";}
-  {name="dragon";value="0f9ma8aaglxh91inm711y64xqscxlqfil53gpk8c1bbanb8m99xp";}
-  {name="ffmpegthumbs";value="12fljrxyv8zgr1vl0ki8hxahwm4dn15pqhb1xgkw5pld0lvcq4sy";}
-  {name="filelight";value="0jiahda52k4knka4b0an4g2brbp263b2q8c09ayzmcd4mp9a4cgv";}
-  {name="granatier";value="0npp24j7bxmnfi743qsjn4ymi5b5icli0fb6g4x2f713z7i6raf8";}
-  {name="gwenview";value="1bznjfki05mydgjb3bmj5dymh33rac9lxrzlczqmah87c0f8fbc7";}
-  {name="jovie";value="17fbyja7ffsx0q6wlls9lagfcv8b21cnjnww06k90cyg0vn7sng4";}
-  {name="juk";value="0ni0iqprfrypx1iwgphhxwyw9216nc5s7hb0hv5j3v2kl1v2ir2n";}
-  {name="kaccessible";value="1zqbs26nl6wxnkya6nqzvnjfwmsqciraixi1awra4nzzx7n736rg";}
-  {name="kactivities";value="1d0xalwk2hlz0xxfgkrkfp0kgl347psgfhixsl8axhjgfxxi3bmx";}
-  {name="kajongg";value="1k401zxhkw8nha69kqr5igfwfgzlbmlvsy24fn4m2h2k1sh3vdcj";}
-  {name="kalgebra";value="1dzj9m6rm07xfr7plf9f7qrs44fzs4j9ncj02h9hzjli7zb44c3p";}
-  {name="kalzium";value="03zwwsbnizqm23zrhh5iagayw7jynmx87fwv0piiz65mgn4kxr5p";}
-  {name="kamera";value="1qvq4flqw1hw3513mcqdhsdvvr12sac272lhaf3jzxsm7p1qc3p1";}
-  {name="kanagram";value="0b5h2b8jm9zssn1hcl0wzf3mh11yh5hhaiay1i5db9k9g6y2nbn1";}
-  {name="kapman";value="1ghlfhmjivxnbga255x2lcdi6kxddyb3hnq93n6bzpg30m4j95sx";}
-  {name="kate";value="0cfdpg5j0zfi1zi0cjq8m3lgnbc9pwb2wlr9dvm4m0hy7byp88p3";}
-  {name="katomic";value="1r2nxya5c6dazvi7810hr24ydkyyb11ganbxkc4d1m8735i6fbqw";}
-  {name="kblackbox";value="0hslyixnw5bb2z71jncahjhnnf08baid8vxsp9n6a4ckcvbmldw4";}
-  {name="kblocks";value="1ds06amafp2igkhcjlwmaszbdvx4kfzlqpx57r5r4nlypnqfvv7k";}
-  {name="kbounce";value="0qp5ayyv3vacr2vak797wzxvkl5b9wn3db1rrzldiixb067f8jzy";}
-  {name="kbreakout";value="1ywk8zwpgqichq12idracld1gjv8gzhfyzxfi1n7165jyqqf9ba6";}
-  {name="kbruch";value="0vr1pbh7ds30vys3gd71c056fc96m5jpi7ihdbvm96p0bz94s7s4";}
-  {name="kcalc";value="1wni970xvd0inpxgw6mb85h6j9acp8vv62v7ipxcm4s4ay5jj9n1";}
-  {name="kcharselect";value="1rigpqyykd9s3gsai61y0jm6vbcza9gafwr2a4kgr72w7rn767fk";}
-  {name="kcolorchooser";value="0k60hbx41snpx83ivmnakl0a4li72pdimbgg987pl9ydjb7ja8gy";}
-  {name="kdeadmin";value="1a6412g8083g9b1xf75cwf0x3x3szadcqw3r4415vxww6kmb8br1";}
-  {name="kdeartwork";value="0a12fcmvhbc11vlmgds43mqbc6zf5j00dpsnj27ylz0nckjlajlb";}
-  {name="kde-baseapps";value="1gmyy9lkgcjhhbffzq51rjqr4m59x16qcsplcyywz218zr28gpfs";}
-  {name="kde-base-artwork";value="1vz5y6qb1wy3vcinnbsxydy39gz2ifls56dyg082j2f709hijzy3";}
-  {name="kdegraphics-mobipocket";value="0nf2k94bz8iqrr60zrql5mg14q14przq5lxscm71kk1bhdh711si";}
-  {name="kdegraphics-strigi-analyzer";value="10l1bmnskmfrwln78pzagfhz5kc2nipdm57i1c3fyp15d0msdgjz";}
-  {name="kdegraphics-thumbnailers";value="0p6bmllgzamfc3f9vigdq8knlblsmp4308lhh4f5bw5wkncjglqg";}
-  {name="kdelibs";value="1bylppbp6bzqyhkw5cavccmxh6zixjzc3z4g28d2lqixga1l16qz";}
-  {name="kdenetwork";value="0kjjwj69a79rfx7z3qxp5gjpykqq3nkwr5cm50f0phsfnflzx9l8";}
-  {name="kdepim";value="14q30gf3al23sx7cf8mhp89xa5c5xd1ns7dwq26igzkvji79kwlk";}
-  {name="kdepimlibs";value="1m56ljhssdj581hsb4irkgi6dwx25s5x8axk4fpipzvj6dq6yplz";}
-  {name="kdepim-runtime";value="1c9wv2wr843090jg41dwhqmvvvzqw875asmvydhj6kw625k62hr1";}
-  {name="kdeplasma-addons";value="1n1yar1rqw3swfnjmazqs1qm7yg19pki97204xa8dnlispbqk21s";}
-  {name="kde-runtime";value="0gmirvzs5cvh6rzps59hqkj4zk3nixh7i5hrxmm1ib7g1qnh0kfg";}
-  {name="kdesdk";value="1nyff19fv186n1j14qpvgslnaphl5y4rls8rn0yc0vxh31x769d9";}
-  {name="kdetoys";value="12c4h8vv5fd12k1wkbpmsf95c0gqa8nnwhszri72danal1qak7jj";}
-  {name="kde-wallpapers";value="17kavdzxql2cgpqrw0v9c2aflajv0l1qgllsg0l5qr7w68fqdjn7";}
-  {name="kdewebdev";value="0hv4ly6323f64wiqvizdn1ia0z50chhravm796wczb8xw8mcidh8";}
-  {name="kde-workspace";value="0rv8gdwlkvhajbn5s8mybrqc4ilpq4b0v7r55zp9dcb27c8jkr1n";}
-  {name="kdf";value="1bkj5yr7ds74gqlfsvyxf26kdqsyac8kg04phnc2rkzp31dvgldg";}
-  {name="kdiamond";value="1y1fyv211mvh5sbw55f827b7nx4da3aaly7c1bm2c13nnj7j5r9s";}
-  {name="kfloppy";value="063zzya13jmcdr2y3vig5k54hx1asnzs6lg2r5sckqp5lsmpdaz5";}
-  {name="kfourinline";value="1af58yrhpjhj61ppxfymw5z43ks9j5cz6ldagxiblp67w4bpa468";}
-  {name="kgamma";value="167z8ycnvi59kvmyar856hkcpb4znwhkkxvn4gg4g74byjzwlf3a";}
-  {name="kgeography";value="04p6ypf72gd2k54qaarsgyvji0bvsi0iqbbjr4qdyd9dhxihhzzp";}
-  {name="kgoldrunner";value="13m1j31fjiz6j0wfivkvgcmicz274h0jvdm8mkjzlp10g3691x4p";}
-  {name="kgpg";value="00zs8x2dhli8dlmj0365gq9517pzkpyf31kb4398zfrrcmja2qip";}
-  {name="khangman";value="1wj439z0n6sy1l5vknh9nrq2d1q2bq5sh0963g1zb9hp8l13bf8a";}
-  {name="kig";value="0hhfvl38czabramgyxjlazqp4dlkkc859fs36wq042iip05kyy3q";}
-  {name="kigo";value="0bvcqsq8w983lnrgi85pjajb7phbg826ky50w5wk5vql1afl02c6";}
-  {name="killbots";value="08j9p8wyqpjj78b9sj13f4vhlkcrhc7sgzwakcv4bg2dvmpr95mp";}
-  {name="kimono";value="14z3ca8s7swwxwnm198bq4ndfsl2m0brc9k465k7rj50l15y0rhl";}
-  {name="kiriki";value="13cay0dllcf5618yjjs1hz3392hcig8bj7r09b0hbqhay65z9l5y";}
-  {name="kiten";value="0lrdkha6xmlxfq9f36rb5ysk8hg9m5zmc9x1y206gxk3rf3k1wzj";}
-  {name="kjumpingcube";value="179p3lw1vl9vxvsdwzx8qjfrahii0igakw0qrdpkcmx4yr0a9gfx";}
-  {name="klettres";value="149xgrxqbp2bq8v2abzhmb8w2b2ssd7xmb06j6k1s707wc9kcs5g";}
-  {name="klickety";value="00x4f4nxfi9xasrddnc84vayn36dd0chyl8jxryswg8dabzazb25";}
-  {name="klines";value="0vamlsz3a945zcm34gb3w0iq2rknwkh9cbv1syh3cc2s9dn5sg29";}
-  {name="kmag";value="06jcp2nhgqbw6yrr5xhajsy2lxklk31kjfmq0pphssfs9yhi1pan";}
-  {name="kmahjongg";value="07hj806mix703h9x676rnwmklrfms04hfxidvzl0324idjw6v5m9";}
-  {name="kmines";value="07nrv4qn7wg590id83dgw7l5kyh4prj3nbi9np4x9ik1rr5bq9nm";}
-  {name="kmix";value="1hwmn4rvr7jid4y3gycsvxvvfxmkv128jxsdfjdhzqz8lcp2q87q";}
-  {name="kmousetool";value="1mrhppgrwwr3cyr3fna0hgypclssixhw9yx6wvqgqj3sc5wd6n4f";}
-  {name="kmouth";value="1s7789qsvg18548bdhmmgcs3w9843naxhcwsiqhc8x0dvaxlgd5r";}
-  {name="kmplot";value="0jzrc47c4v6hvrs6p0yhki70diyfgs55vnjac4gfrfn17jgh562w";}
-  {name="knavalbattle";value="1mqvlvhqd7sa4qsz6cf6gffysamgfml3nd4h71x5qzw8qqw778yq";}
-  {name="knetwalk";value="14nizf7nrvsmqg6d5vaazl8wf74q64gwxq6nmj86brinf7d5nn5h";}
-  {name="kolf";value="1qghkmzbpaajb91xcwd22fx87cfpmgmjjwqisdzkjz4qn3z5mpx0";}
-  {name="kollision";value="1z0xg967q3l2gxmnigjbrnqwvw5fm7cpscpfavn31zp4vbmk937m";}
-  {name="kolourpaint";value="135i7h1lf23cggzx7l2p2hsh7s4zrik3298fwwbhly0jl564ribb";}
-  {name="konquest";value="133zjqqpzwrai34f8gb4nk3im50i61c2my8hnqzr61pbbgd61ff3";}
-  {name="konsole";value="1iaih9c6i5ad0bvalwykrdgrwz6wb7k6x808na1df0yynw76r4s7";}
-  {name="korundum";value="1h8rr229hwkckrvpz6zkkxpfkrpg18fvyxsqb01sjaky7c6i4649";}
-  {name="kpat";value="1imr9w6jymx4379ba7drpa9nmaq6z28hrf5jwi06crhp5fyi08dh";}
-  {name="kremotecontrol";value="0zzhjgpy17wrgcrr70z582zh7rj0n4vgbxksz7gl3qm543y15kry";}
-  {name="kreversi";value="0dmfsg38hhav78j4s34arjr09ahfblv4k7s8llpafg7cicm8g0iv";}
-  {name="kross-interpreters";value="043wpb05di9pw3h206lpccgpfghc4v23s0n2bwv30246ig75rmk1";}
-  {name="kruler";value="1g7f810d7940j9lylzj0k7d89mbblz8ai9gs5cc7n0mkrczb9ws9";}
-  {name="ksaneplugin";value="1svsfgsvd21f9fhrsvi2fasffrx0r5rf8a8r4jx19hlzcvha0kza";}
-  {name="kscd";value="1ipl9sq8zikdjs044lbi519jyvdaahi0f8a877zfdp0xspzqi398";}
-  {name="kshisen";value="06qkl8fwh8rql6hdl8fygvfybp7w6c3ys0qsnjpxk5bz4m5xap1d";}
-  {name="ksirk";value="1hqp00dilzkbkada7dc5j56sh2rp19xcirhvj26560whlwdxhcj5";}
-  {name="ksnakeduel";value="0nbn1pn0hzh6wmhxkabrga50y06k4gv4pbb5235jbynjmk539n31";}
-  {name="ksnapshot";value="09na29nydwi0cmgg9g6yqr3wl9npgiqpvdq3wxc5jk1kxadlb0aj";}
-  {name="kspaceduel";value="1xf5qb8a08ar0v0ws1iyiqbax6qc8crbhn59nzy2hrc12451lbkc";}
-  {name="ksquares";value="1iz9r80mnkyq5mx4i95gx5a5qk5y5by8bwq9599ypamrb9fr1zpl";}
-  {name="kstars";value="0p86fpcyb1ipgmi2ypckdb5zzwanky9b3c1n5ddcr25y84b2m7iy";}
-  {name="ksudoku";value="0k5qdy0i20kxcsqdwzxhrw6rn3lzh2mgbw97rlxw5gmr3619irdz";}
-  {name="ktimer";value="149zlkpdz38pfg0yy9mi6xkrc3wcz790kc3026x1c5zyvb2nnwm7";}
-  {name="ktouch";value="109dwxxz1hcwj5506k33a0zy86ky50rp058x6pgqh1m0a6ljvswi";}
-  {name="ktuberling";value="1vsdkx7kz4gz35g3ggn6h5gmk43sww7mawdfl4r11q5rq7r2nlnx";}
-  {name="kturtle";value="1jvj34jlbvzvwmr7q8c12rh9q47d78dl6vx6lhjhvs1b0969zzrq";}
-  {name="kubrick";value="1vqjbf6p6adrmnrl4i4y1jh80rimzlp4fyfmgscpfncdnc5pzgb0";}
-  {name="kwallet";value="0sc6xn1gyl2jvfqqvln2x4cb68b2x5cjmb8gvxhgwizx93jmwkc1";}
-  {name="kwordquiz";value="1i7kdfp8x1r109jmj1a86bmn69cgjc8q9c4n92j1imr17ig063is";}
-  {name="libkcddb";value="1krr3jh46q3q02rps3wawv59bv9jzri7i4gi4qgszk5v8gn67nqb";}
-  {name="libkcompactdisc";value="1y7sznz6sdrgs8jiqxs2y7imqywq91l46w1dv8fkc9mcpx5233zb";}
-  {name="libkdcraw";value="1nhhnj6hir347g6jp20k5jq0faygp8x9k3lic9ixdw2byigy9c3p";}
-  {name="libkdeedu";value="0m0ipprcldg1l2yi0hpq87npvqic9vfh6pn60fg4wvl56syn0sfg";}
-  {name="libkdegames";value="1qs59v68nwli5438ax3am6694r1c04i7crv34bs9hksnmr51l499";}
-  {name="libkexiv2";value="0n93d4s37m2jdg04wgvmljrs7j14967bjjk6mk7fibv0jqmp65i5";}
-  {name="libkipi";value="0kjp9y2rngvhskzk63az6zfzjrysir2qlapy56ynscdgq3yl0ygm";}
-  {name="libkmahjongg";value="0g7fp0wzrhxfyhj46bv0in8z4iwal6ipjjcm38qz1j4ric71l1kf";}
-  {name="libksane";value="0pqgh21ymq0pclbvq411aglclak6afqll5d0y8hz8m6afkmjhqxc";}
-  {name="lskat";value="04gvh3266hllfzl5syai3qw7zvkd7jipqdrwzynqvzpdg725a05g";}
-  {name="marble";value="0v4c1psyl5342f01n0794wk0ckg5chblibvap0vicanlq16pp65f";}
-  {name="mplayerthumbs";value="198b8f3s7zv4sprbj22flzdpxsag91p283iym5q9mkialf51789y";}
-  {name="nepomuk-core";value="15zzraacig4qqmwabw7xy38ddvcxam7djw96yhxc0z8zr3xffysj";}
-  {name="nepomuk-widgets";value="1kjzp7px5l7q9bal0dxpm24wq05s0wbjgqli6bhx7d5hipfr53w2";}
-  {name="okular";value="0zvmfh9ijwx10zy9nq6295x1w9x1xljkdcsz5269m230ff6wwmnh";}
-  {name="oxygen-icons";value="1z46zmazg1hf6yy2krfqpb5i5xmf7kpw9l7wvh3ihfqsdh77qmn8";}
-  {name="pairs";value="0i9wg6a3y71m3bdp5qjk6f9bmmd45r9hi7b8fqxp8srxcqn5hzx1";}
-  {name="palapeli";value="1cq8vggcc1358nf4n15pycmbn7m50lndd1w0541c85qirlnrq7wm";}
-  {name="parley";value="0cqdmjcsjqa8p42p7j8ni9mkf898p5hs3wdb757b4c1vyzkkdlpx";}
-  {name="perlkde";value="0w628fdxqmwv8k0x22307a4cpwlvq3lfsbhl5b3bv7naqjnwf549";}
-  {name="perlqt";value="11g5rh32i2x8klg5y5bapg581k4gm38jdfsmqsrjdcmxfw94bjil";}
-  {name="picmi";value="0y3s3k1x78z2asbcrcl8xkrk7kkz2ci4lbh1jfbnd66bx7lmwv0l";}
-  {name="print-manager";value="0x8lqjndi3ln90n8bgw26k09kz5ghkfm2xgqi4y0295ggbm3cm24";}
-  {name="pykde4";value="02qih6jw13mv9x4wf85ff9m5akdmxrz2jf2nlldyimh879dn0hxr";}
-  {name="qtruby";value="15wv6rh8d1f0d96f42bawyljlkpnamwxqng69jfd3q44j54gjkc5";}
-  {name="qyoto";value="1jpk5vp4ymvy8hhqia7b4mw0pzgdskb3aff30ik154mngzaqbdzc";}
-  {name="rocs";value="131gb6xfcrmwnl7nbxpm1rip9q2r8wzw8pb8f8a47vvswf200n7g";}
-  {name="smokegen";value="1vcc7yz6j7ndk8ppg7zr546cji6x5w38nlfc1lanq1pb3lbsddwn";}
-  {name="smokekde";value="1ib1xj6lkh2z80l9dci6w58f62f2mmpfz6hm81hygxqyxbf8rl64";}
-  {name="smokeqt";value="1fpv9c1qsl08p8s5a86ql0342hbalbh2inxv9a3risqg6qd0is6l";}
-  {name="step";value="1iayd98rqsl5qm1r4jiabnhw68691kakajgp9kpmn302ljn2wx5j";}
-  {name="superkaramba";value="1g86gacs1ss2sa3vdyg1ciwbpcd6d3i8yfb7fjmgvjm4qiyl3npg";}
-  {name="svgpart";value="0iy01cl4p37bfmr5779shbp202w25ik3phsqq6yjzfb7521xbm4r";}
-  {name="sweeper";value="1np09is041rb7bk8q1bhl0wmv3dypmsgyvd5yxg1qlsibn8mwbiw";}
-];
-modules=[
-{
-  module="kdemultimedia";
-  split=true;
-  pkgs=[
-    { name="audiocd-kio"; sane="audiocd_kio"; }
-    { name="dragon";  }
-    { name="ffmpegthumbs";  }
-    { name="juk";  }
-    { name="kmix";  }
-    { name="kscd";  }
-    { name="libkcddb";  }
-    { name="libkcompactdisc";  }
-    { name="mplayerthumbs";  }
-  ];
-}
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
-    { 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="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdelibs";
-  split=true;
-  pkgs=[
-    { name="kdelibs";  }
-    { name="nepomuk-core"; sane="nepomuk_core"; }
-    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
-  ];
-}
-{
-  module="kdeutils";
-  split=true;
-  pkgs=[
-    { name="ark";  }
-    { name="filelight";  }
-    { name="kcalc";  }
-    { name="kcharselect";  }
-    { name="kdf";  }
-    { name="kfloppy";  }
-    { name="kgpg";  }
-    { name="kremotecontrol";  }
-    { name="ktimer";  }
-    { name="kwallet";  }
-    { name="print-manager"; sane="print_manager"; }
-    { name="superkaramba";  }
-    { name="sweeper";  }
-  ];
-}
-{
-  module="applications";
-  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="konsole";  }
-  ];
-}
-{
-  module="kdegames";
-  split=true;
-  pkgs=[
-    { name="bomber";  }
-    { name="bovo";  }
-    { name="granatier";  }
-    { name="kajongg";  }
-    { name="kapman";  }
-    { name="katomic";  }
-    { name="kblackbox";  }
-    { name="kblocks";  }
-    { name="kbounce";  }
-    { name="kbreakout";  }
-    { name="kdiamond";  }
-    { name="kfourinline";  }
-    { name="kgoldrunner";  }
-    { name="kigo";  }
-    { name="killbots";  }
-    { name="kiriki";  }
-    { name="kjumpingcube";  }
-    { name="klickety";  }
-    { name="klines";  }
-    { name="kmahjongg";  }
-    { name="kmines";  }
-    { name="knavalbattle";  }
-    { name="knetwalk";  }
-    { name="kolf";  }
-    { name="kollision";  }
-    { name="konquest";  }
-    { name="kpat";  }
-    { name="kreversi";  }
-    { name="kshisen";  }
-    { name="ksirk";  }
-    { name="ksnakeduel";  }
-    { name="kspaceduel";  }
-    { name="ksquares";  }
-    { name="ksudoku";  }
-    { name="ktuberling";  }
-    { name="kubrick";  }
-    { name="libkdegames";  }
-    { name="libkmahjongg";  }
-    { name="lskat";  }
-    { name="palapeli";  }
-    { name="picmi";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="analitza";  }
-    { 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="pairs";  }
-    { 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="kdeaccessibility";
-  split=true;
-  pkgs=[
-    { name="jovie";  }
-    { name="kaccessible";  }
-    { name="kmag";  }
-    { name="kmousetool";  }
-    { name="kmouth";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdeadmin";  split=false;
-  pkgs=[
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kuser"; }
-    { name="kcron"; }
-    { name="ksystemlog"; }
-  ];
-
-}
-{ 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"; }
-  ];
-
-}
-{ module="kde-base-artwork"; sane="kde_base_artwork"; 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;}
-#had to add fake pkgs to kdesdk to get it to be treated like a split module
-{ module="kdesdk";  split=false; pkgs = [{ name="fake"; }]; }
-{ module="kdetoys";  split=false;
-  pkgs=[
-    { name="kteatime"; }
-    { name="ktux"; }
-    { name="amor"; }
-  ];
-
-}
-{ 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.10/kde-package/4.10.3.nix

@@ -0,0 +1,399 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="analitza";value="0y8481jrb4bklwrcadska1rdqrbbknml6i9gcvkp8sibjnj0hz7y";}
+  {name="ark";value="0y4adimbsax8g5q9nffd22icskxpjcqhr4ws2p1857znlxxc9prh";}
+  {name="audiocd-kio";value="1pwfdb989yf5kjni8y2irzys8qdcw9ipwszmds7ss9ycdv1mc9p7";}
+  {name="blinken";value="1scywjdj6sjlzwbpxnarik3wypw7f6fcdmcgiql1sa1df1bdbh41";}
+  {name="bomber";value="0jxl93adfv3pf2xkkazh1yfkiixz49yhbg9kblnav44np9wydpzk";}
+  {name="bovo";value="0plm0g75qyx6lgdmzaml650nm7v1kjss5cq1v4dpmicahw9mgqfd";}
+  {name="cantor";value="05rd4jm5w9l4i16qrx5vqrszk666gzvmndn9w4f80jgzdsal0h45";}
+  {name="dragon";value="0xmxjicj8bg43d7mlmw5hwl5mqn9r2xm9kqh47cmlili9g90hklx";}
+  {name="ffmpegthumbs";value="0i4qbfa954qsirpq6ywwspfi7y26j8jkrx4x7h73ywqmilbw7gab";}
+  {name="filelight";value="0p840l6nw9hm25ndcr87g9pykhajzj99kzdqbirwancgj77rgn14";}
+  {name="granatier";value="0b50dnyvq0qgldg9jp9dsig0yh7xmmbfbza3vv6b0bwr8i7q3zcd";}
+  {name="gwenview";value="199yafvaz9bgd6wg49n9l5f90bvq61z0pc46h4p3fpfp0lp66r6p";}
+  {name="jovie";value="1fay1czn7s9412gh8dda889bcxcphclj66xd1snmxyq80avpyilr";}
+  {name="juk";value="0k9b745kqa3w3lzwibrh9aawpd1xdzqv6mf6ik9yy3r25wkj22sy";}
+  {name="kaccessible";value="13391w38l3k7b4il3spsrzniwiw1hq7lhqsl1wl2zfigz47hv288";}
+  {name="kactivities";value="00fdnw2rwpk8q6xgydwshawl23l76igdr6v8p69d5fmaj93nbqb8";}
+  {name="kajongg";value="1pkdjc54ydzxlbjp63s2cz5fzg56isrjyym0wlgiqlhgiqjf48qn";}
+  {name="kalgebra";value="09gsbn4aj4i52q670ginj0n2y26iqnsh12sh09642g9jkhdmigik";}
+  {name="kalzium";value="0rd3yz0q0158m158n20qmd9h0xmrc53wnhjc7g17lj2l605svkkv";}
+  {name="kamera";value="1s9znmi6ka8r2wyylp9pwlv3pg313yzc0k3j50c18c529nbx1dsx";}
+  {name="kanagram";value="0jxjz4zz7vivqdpm9c4lvi2pgvf5v16fhn0np8sdzaiv7rj2sl3j";}
+  {name="kapman";value="0f6nd2f56qy1c704451lxz57fzlnxry5njbid80wn8rv6c9c6m6k";}
+  {name="kate";value="07nchlm93860rwwbcllcj92w7p8dx06dimc6vclgn640d19j3ac2";}
+  {name="katomic";value="053l57z8l68r4vrrcj3rh4gn36f9qcqwysk0k34lh0szaii81qjw";}
+  {name="kblackbox";value="0lr7k2d0ml2aqga9md05kddm9zik7n18b622v57jim54id9i8iyl";}
+  {name="kblocks";value="1fylcrwaziksw2f17nbwmprk5psb5b292qwfc09y2i2ykx734gc8";}
+  {name="kbounce";value="0n7bgcldblmy9123ls5d7cpa7qajhpskpl0nv83n2dyfz4pa70dp";}
+  {name="kbreakout";value="13vjzna3n7m0hnc2glnz931j9pcwwzb4vnyhs6bjszrj422k6r5d";}
+  {name="kbruch";value="00a999gjzgd5cffjrkpdin8y9qqppir591w53yp1layvv080370j";}
+  {name="kcalc";value="0k84r6g0iz30g7ff39kgrcxx1xjnw6p5khzvikj79y9b56sd0g19";}
+  {name="kcharselect";value="0drah7js6r6zl6nii2bmpxhxzn78y04sqj013bzyblskqibxh0zz";}
+  {name="kcolorchooser";value="1crk5dxfxgyh3wz286hd69rhcf0s9jnq5pqcnhgcrsjpfjk9hahs";}
+  {name="kdeadmin";value="1iq93in2wvmqjgz1wqmr0vn9rd1pzdrl202n3qhass0rfm0vsv7w";}
+  {name="kdeartwork";value="0qcypdzyh5pqp70b2m32hqhcnv4gwpyawdhb2nphmgv64v9s2b8z";}
+  {name="kde-baseapps";value="1p2qfghvyi0pglp88p351c6lm54i3ibp7h2yxh27phwdi0j9lbzx";}
+  {name="kde-base-artwork";value="12zgimngxcp96bcw2mffrk6fsy34mbll5pp4blm3c59ya7b50nq1";}
+  {name="kdegraphics-mobipocket";value="1qcddcc5h3108i2xkp4ibjmgg3k0sxyr30i9nkbaawaid66l36lk";}
+  {name="kdegraphics-strigi-analyzer";value="0ixj0gqjdqrwqk0zc3p0kdkd0wg1rwkyxzndq459y8xpnbyn3pvi";}
+  {name="kdegraphics-thumbnailers";value="03pc1ybbnpybp85jc4gn45lr61q5x8yf541qnkap1mrs658f57d1";}
+  {name="kdelibs";value="1vrcawx3w5cdr4yapim0j2zx4lmlcpjg6866wd70bhp6fary1gaz";}
+  {name="kdenetwork";value="1xz57fb3dpllydi4jhbv5z5y710k2fdk1jl516ixihhbjbbr4phg";}
+  {name="kdepim";value="1myznqi7dggxkkd59vil16514biydrvlihksl8b3njfif2f4ifkj";}
+  {name="kdepimlibs";value="0r7qvq0rvkl5a76xq28f56fqd7hfxbin541qw9gniygnlddnhjvq";}
+  {name="kdepim-runtime";value="01cxrf9541fsga5c9fjzarzja2p58vrpwll6gx4dk49hmx1hwvjb";}
+  {name="kdeplasma-addons";value="1s1rxhd8apnww0z4hsawlvib126p3lj0m5jg29kgh4xwbkrwi2qa";}
+  {name="kde-runtime";value="01gjyhvymf0a0ishhdwy6mfvv20sj2b182q1r410miq5zjl3l79n";}
+  {name="kdesdk";value="1y4qxvcgl9zg0cqgaqc77hhpqlrbb6panpicarm766vas3pw78na";}
+  {name="kdetoys";value="0nspyll9if2jk8r2b65z9hahwcawmyhkl3pfi38drxqxzaqkpcq0";}
+  {name="kde-wallpapers";value="1ik0lmkzyml63dgh6inv3qa9wbj3ylk2rjkfafmqc2anzsgpjmxk";}
+  {name="kdewebdev";value="05g308cl6njl5vrnks2jv87xvqwphppfgy9mkgmm7brwkk0n25ny";}
+  {name="kde-workspace";value="17g4zjf6sich990i8s22m54i534p4hyzbbnc2566vv6w74pxnw6q";}
+  {name="kdf";value="1r19lfsxps177nc5ys4mqfa8y43b4rcsj4wiigvry6vmwvxnqy4j";}
+  {name="kdiamond";value="0hd4zn8xyk12idkwjv0h4rlfzdyx0m03i054h99z2ls4vfxixb6v";}
+  {name="kfloppy";value="037gng2bx7lv7zki7n56yxbcqrl4aj4y2zn1milm5dv1r33ga4k0";}
+  {name="kfourinline";value="1aav3b4snqj3ah2cwyl02mmvdnk3hsw2wcxbabijkbd2anaijbvg";}
+  {name="kgamma";value="1ccbjbfjljcndz39f1qhjcisbihk8v407hcl3nnwf25sgcvqygiz";}
+  {name="kgeography";value="00dsl70d7w7kfwam39pjwd624zs9fwbwbb8kn7gas3m9kc435drs";}
+  {name="kgoldrunner";value="1r2lrv63ks2c39nzfgc4bj9prlqcd1jqrywahxla6l8fpp299r05";}
+  {name="kgpg";value="1xg1axd8gvcn8w9haywjfi0lk044vi7z3klp2y93rwxdidxjjjji";}
+  {name="khangman";value="1a27n9m9js8j3rn112dg0aqj58qxjs8rb6mylzwi99a6w6jl44ka";}
+  {name="kig";value="1ns3d7lk96lr9l8kipdz92xq0q7q5lpbbqip6f55wcvazb4280r3";}
+  {name="kigo";value="1hbxx8ivwbw7mpkz3hsb5lwci2cxd48kiia4jd2859znjza5hz70";}
+  {name="killbots";value="1idczq2f1g7maxlf0fyc4dpm3f9lbsqgnsyf6j48hm0aicsazmcj";}
+  {name="kimono";value="1a0m6gk25qhx88z7y17154b8i9r9s3ry6zx21mxr7zz42d1ng5by";}
+  {name="kiriki";value="1307xbyxhxzqv294x99712h269p3k3cw34mpq8b5nv0102ig4pwl";}
+  {name="kiten";value="1n27cl8g4r7i60hrwfpc7nl7d118f2kyby0wgbwil6ip5q9ak71w";}
+  {name="kjumpingcube";value="0mw6bns7b9dwf7kbcpk0ilgvqbmak9765wffqhx52ykj7c993x1i";}
+  {name="klettres";value="0ymy4a0172fym2b0pvfgjb07waivb610z7cpnnrdw0qyzxks7131";}
+  {name="klickety";value="1mln3hb97isy2v71bxk0ijbqrlx31s1483ziajnlva7j7mc44pi2";}
+  {name="klines";value="0ylhz4nvwgc0ilgpv1fpf2vgcnypwgd0bslmg1sh2cc3gczxkdx8";}
+  {name="kmag";value="123a329sx3d3h3vk3w4400w5g9nsl6r2c7lv8i8xvcp7xcxixls7";}
+  {name="kmahjongg";value="1ahjdwwglp24a9g75cpq4c9bbqcwl50630ys94za94j5lj4sbrg4";}
+  {name="kmines";value="1pgpfhj5008vckpplmvwngm34wl1m3pz2ig9x12j20rcd0sy0k27";}
+  {name="kmix";value="0qkmnjlscsggmcfkj2xqfawrv2zn56byhzczn94piva28pcxcvps";}
+  {name="kmousetool";value="0khxn5qnzgdjba1d229kqfd3vf5bjdpj8i2zahwynxvgghmmg6cz";}
+  {name="kmouth";value="05wvwkj5xhjn3g5c1shviqfl284zfqf8qbgcc7a980f453sr8bbr";}
+  {name="kmplot";value="0pv41r9bygw895azcnf22r3lfddzf1xplnx1li88038gp9vzrybv";}
+  {name="knavalbattle";value="0hgralml3xhd487zi4gac60738arlb1xi3kzm1vlq7f5vp2dllaj";}
+  {name="knetwalk";value="0r6l3n3jzl3mabjn8v7mk41j5gcbh5xnajngk075vk0v7mp4xasj";}
+  {name="kolf";value="1wfvcz3hy8a9v07qs1427bqxniaai3iv8r63x1ia0sim5j33xlgq";}
+  {name="kollision";value="0g98icgnazlqjbbgcqa4i6gp5zm5wwzab7rd93cf5jvd81g5ymys";}
+  {name="kolourpaint";value="01qccaavpb3fp15ajfrmmimg0mwx8jbmq5gndmd0qrfymqvdwfm2";}
+  {name="konquest";value="0i5jbnm46mj3055d471zfs7j9c2sr6y39a311485mk24yf31pcif";}
+  {name="konsole";value="1kcg2lmnqbamhgik3bpynq8gf4jl78fhlq9ydh1m0vlqwj38vs36";}
+  {name="korundum";value="08bkgqj3r51jsvss517v74ikl7vdrzd15wn5fbcrkz625y8blcv6";}
+  {name="kpat";value="0l41dnjd2smrxjgkldsrscn5550kzaf5byv686f5iavb60nlr36x";}
+  {name="kremotecontrol";value="0p2z0q0l2wdlg5zij053cvimdkijwy949f1k1ma00z8gf881y3ix";}
+  {name="kreversi";value="0w0q11m5n39p80p38p6x3q3xlz19xnd2xnmkvx1zwq2sy8hwc06w";}
+  {name="kross-interpreters";value="1irw7wca7wlvv8ap9ypzn13zvjdijlyzf5mxkikdh23hhbhmmvn5";}
+  {name="kruler";value="0cqlidxwsg08am32nlgxdknzj0iwlg35z786ms6dqxax9rjzqs31";}
+  {name="ksaneplugin";value="0w08r33l5k3dn6vvm0ss49b84ffp04yc0aakx772ywp7shx1fkim";}
+  {name="kscd";value="13f7xb4kp24hq6wyvd7r55002r86fjh2c4sl2p5sh05glscw361f";}
+  {name="kshisen";value="0v6rplsxj8c60p2798w85llvfwdlhc4n6sck3m3kb70h725i3vnw";}
+  {name="ksirk";value="1bppikyznpwfy82bx22wacayrvsbzsqzrckrysmh6w8zadbalmmf";}
+  {name="ksnakeduel";value="09lyviv79ki1qld18854wpkrv6xb1g99jql8x7mfpafhsfqh3x9f";}
+  {name="ksnapshot";value="16qz4rmmx6901jmvc998izdr9q6p5jv5296ynwj3x6hlx4n4h21x";}
+  {name="kspaceduel";value="0nkwpny631fxvgg7h29pdgy8ikdfvynfa7bbn6vpaf56d4n5rj4s";}
+  {name="ksquares";value="0pxcm9i7j0g5cxrij3ir2bbqv5yla5n3m1fxig2qxa084a45d6nb";}
+  {name="kstars";value="01pv6aryk4wknjfh270ynrr3v5j308l3m55ca16f68njfndh7wi1";}
+  {name="ksudoku";value="1cb3ahkvjm2mps11spw1vbrxh2fal16mix5d2kjlayj0pmm6yhvc";}
+  {name="ktimer";value="0lnbzjqj0xbhhaw53z2a0sdfd1i1kzckczbfjy3ab2bg6xwfyb4y";}
+  {name="ktouch";value="08am04nirzh05rdh0mh2xixrd5w04xnnc7r8rfzcxra6s84jlsns";}
+  {name="ktuberling";value="0b206b4whhivhbn41fg0hwidn9m0acs5jfdjnv269x58vh79w7dj";}
+  {name="kturtle";value="1i19ksrac0k65xqj8yhb5n53x4qxj93zanb546gqirrgvhlhh573";}
+  {name="kubrick";value="1s5p1f8b30iqpngkxzkv29qc078nxncqlwlvfyq18gn27zdwcy2g";}
+  {name="kwallet";value="0v6c356ysv9xf6gg3ivlshqsd06rxsmvfcvq4igp7z4l9cz4cdya";}
+  {name="kwordquiz";value="1v061nq5scwgamshpkajq2cgp5dqipa3qlq5xl393kvp89zfl2bp";}
+  {name="libkcddb";value="09s6s779k6lq2pnb4iy4qnny2h8mbiy4w12nvw791gid1670vng7";}
+  {name="libkcompactdisc";value="06mm2im3rllwvrv2ph9smgbjfh2lhm3r3j8gmzikdqhzpyqp2kpc";}
+  {name="libkdcraw";value="0v2ji0jdzqpy54z60gq4p1k7zdw3bdsa0xd711gzbyxh34k5i1dg";}
+  {name="libkdeedu";value="1f8wqc0lfvgych011pg1smxyqsh9vwjhr13wcnmkf35hfwh81vfm";}
+  {name="libkdegames";value="16lz2mj93myl5wr7xyird9kwqml0na9h9c5vnxhig18vqvxs64ca";}
+  {name="libkexiv2";value="1sjpndx5d5w9dllh1f5cjg4z2gl0v827qjnnwnbm1lvps2s1kmm3";}
+  {name="libkipi";value="02ymmx97nbpwbhq786kcxi2cfr8f6vwyicskywv01f0qv4qh5llg";}
+  {name="libkmahjongg";value="0z9ahgfbf6ymbhzg6xcgcrl4qqadc986hi9xx38rcr1v3hm21pld";}
+  {name="libksane";value="17ahz4zm0lh52295nzdjvhafnlfixyi8p1xl9dyan6zwr2hbq9i2";}
+  {name="lskat";value="0qgsfy67pvvg058i1ik4h45d8n4x7npbvbhwcv9p29ar57vg1xd9";}
+  {name="marble";value="0fclzqvda5jjqy0mqbbq1wsb6s3xjbcx6nwzmc72f2ni2qas3yyx";}
+  {name="mplayerthumbs";value="04a8rccs0amgkmvgzqfz01ng13s287gyllppsqhxfr8ndpqdxp06";}
+  {name="nepomuk-core";value="1hj2z2sxghk71cqaz62v7b1lab0c3hh8cb6bb6fm6abg3gcb4z7g";}
+  {name="nepomuk-widgets";value="1w11va7m2665xlm1lgg7jx7qqxkpicr9mblf53vlvssljq96qak0";}
+  {name="okular";value="0lgri7y5zf2hx7zyi8i02i1amqcsn6k7nwbq77cgs2xlmj9kr7dn";}
+  {name="oxygen-icons";value="1wsac10jdxc7ywwm46mdvsxnil7bnzpdrcn3yjjdrkjjsn4kgj1i";}
+  {name="pairs";value="0gfq7cgxs3k2449fa5rdklwamrs5brj23zi19jns6x6mgasnl5ww";}
+  {name="palapeli";value="1grj7bm0im94crjzav3vlgqn9w014n55v6mms51r0issa2lpcblx";}
+  {name="parley";value="0wfcmrgzygz7pwgpsi5wzswk3wnimrxkdhby5jcdpaphwcn7pml2";}
+  {name="perlkde";value="0l3bz1l2s5p7kq785a9yvgnr28xlq2sddd7kzdbwahb0jrbhbyra";}
+  {name="perlqt";value="0j1a38qm3iqgdxx28flaam8v49r7l4lwg89by3vqsymc9bd787r8";}
+  {name="picmi";value="0p18667nybyr41b3n55s0862vvnhy1fw3gm7n0xa6r57dlkcsxjs";}
+  {name="print-manager";value="18scysv26jrzm36wrhjcad7qrf98hy2yq3b14j5ra1vdnr1n8nkk";}
+  {name="pykde4";value="1zq4xivx4xiwkdpz54llahjvfvx89bpf09jr275mj1rxayl2plma";}
+  {name="qtruby";value="0rbkqdvn36bgac6zv552jpgh8np6mf90hckf8g07npbf4sirgawa";}
+  {name="qyoto";value="0zbf7mpabazqwqh8g1dkg41bp06mvk9pcfh5m2br95wixcd6hv4g";}
+  {name="rocs";value="1ia1qfnhdic9py12nycp8v5lpyr6py4x5vvmj51b5w7h1m841dnd";}
+  {name="smokegen";value="1ybpxhh9fldzxha9307x8dq45zizqlj3cjwap3b4j4darvmsm0ky";}
+  {name="smokekde";value="1r0vq064afr6ih0is90wlidl0pxllk00hrzsqy5hgvr5c2yhaynk";}
+  {name="smokeqt";value="0df2js5k9vwzakcix06k1sprsrm1jl6fgnpsxs9r05a3mkkdl37q";}
+  {name="step";value="1dgqfycsf0d2fzrlkpw9d2s6aw11ik4cv9m37xdaciw1qkfjc6w2";}
+  {name="superkaramba";value="0mrk1vipxh65r9gwys89y1iacb7423mqx031abpry78jsa4prc4d";}
+  {name="svgpart";value="0bkbp7qd6xq3fdsn68r74a92r7pw97v494h78w4vrc06xx4v912w";}
+  {name="sweeper";value="1azvnv32r2fg8ha0ly3bkp2xc3s4kdvyyj9vl0p8az1q86x0z3jj";}
+];
+modules=[
+{
+  module="kdemultimedia";
+  split=true;
+  pkgs=[
+    { name="audiocd-kio"; sane="audiocd_kio"; }
+    { name="dragon";  }
+    { name="ffmpegthumbs";  }
+    { name="juk";  }
+    { name="kmix";  }
+    { name="kscd";  }
+    { name="libkcddb";  }
+    { name="libkcompactdisc";  }
+    { name="mplayerthumbs";  }
+  ];
+}
+{
+  module="kdegraphics";
+  split=true;
+  pkgs=[
+    { name="gwenview";  }
+    { name="kamera";  }
+    { name="kcolorchooser";  }
+    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
+    { 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="okular";  }
+    { name="svgpart";  }
+  ];
+}
+{
+  module="kdelibs";
+  split=true;
+  pkgs=[
+    { name="kdelibs";  }
+    { name="nepomuk-core"; sane="nepomuk_core"; }
+    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
+  ];
+}
+{
+  module="kdeutils";
+  split=true;
+  pkgs=[
+    { name="ark";  }
+    { name="filelight";  }
+    { name="kcalc";  }
+    { name="kcharselect";  }
+    { name="kdf";  }
+    { name="kfloppy";  }
+    { name="kgpg";  }
+    { name="kremotecontrol";  }
+    { name="ktimer";  }
+    { name="kwallet";  }
+    { name="print-manager"; sane="print_manager"; }
+    { name="superkaramba";  }
+    { name="sweeper";  }
+  ];
+}
+{
+  module="applications";
+  split=true;
+  pkgs=[
+    { name="kate";  }
+    { name="konsole";  }
+  ];
+}
+{
+  module="kdegames";
+  split=true;
+  pkgs=[
+    { name="bomber";  }
+    { name="bovo";  }
+    { name="granatier";  }
+    { name="kajongg";  }
+    { name="kapman";  }
+    { name="katomic";  }
+    { name="kblackbox";  }
+    { name="kblocks";  }
+    { name="kbounce";  }
+    { name="kbreakout";  }
+    { name="kdiamond";  }
+    { name="kfourinline";  }
+    { name="kgoldrunner";  }
+    { name="kigo";  }
+    { name="killbots";  }
+    { name="kiriki";  }
+    { name="kjumpingcube";  }
+    { name="klickety";  }
+    { name="klines";  }
+    { name="kmahjongg";  }
+    { name="kmines";  }
+    { name="knavalbattle";  }
+    { name="knetwalk";  }
+    { name="kolf";  }
+    { name="kollision";  }
+    { name="konquest";  }
+    { name="kpat";  }
+    { name="kreversi";  }
+    { name="kshisen";  }
+    { name="ksirk";  }
+    { name="ksnakeduel";  }
+    { name="kspaceduel";  }
+    { name="ksquares";  }
+    { name="ksudoku";  }
+    { name="ktuberling";  }
+    { name="kubrick";  }
+    { name="libkdegames";  }
+    { name="libkmahjongg";  }
+    { name="lskat";  }
+    { name="palapeli";  }
+    { name="picmi";  }
+  ];
+}
+{
+  module="kdeedu";
+  split=true;
+  pkgs=[
+    { name="analitza";  }
+    { 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="pairs";  }
+    { 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="kdeaccessibility";
+  split=true;
+  pkgs=[
+    { name="jovie";  }
+    { name="kaccessible";  }
+    { name="kmag";  }
+    { name="kmousetool";  }
+    { name="kmouth";  }
+  ];
+}
+{
+  module="kde-baseapps";
+sane="kde_baseapps";  split=true;
+  pkgs=[
+    { name="kde-baseapps"; sane="kde_baseapps"; }
+  ];
+}
+{ module="kactivities";  split=false;}
+{ module="kdeadmin";  split=false;
+  pkgs=[
+    { name="strigi-analyzer"; sane="strigi_analyzer";}
+    { name="kuser"; }
+    { name="kcron"; }
+    { name="ksystemlog"; }
+  ];
+
+}
+{ 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"; }
+  ];
+
+}
+{ module="kde-base-artwork"; sane="kde_base_artwork"; 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;}
+#had to add fake pkgs to kdesdk to get it to be treated like a split module
+{ module="kdesdk";  split=false; pkgs = [{ name="fake"; }]; }
+{ module="kdetoys";  split=false;
+  pkgs=[
+    { name="kteatime"; }
+    { name="ktux"; }
+    { name="amor"; }
+  ];
+
+}
+{ 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.10/kde-runtime.nix

@@ -1,18 +1,20 @@
 { kde, kdelibs, shared_desktop_ontologies, bzip2, libssh, exiv2, attica
 , libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, qca2, xz, pulseaudio
-, networkmanager, kactivities, kdepimlibs
+, networkmanager, kactivities, kdepimlibs, openexr, ilmbase
 }:
 
 kde {
   buildInputs = [
     kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
     qca2 samba (libcanberra.override { gtk = null; }) pulseaudio
-    networkmanager kactivities kdepimlibs
-#todo: add openslp, openexr
+    networkmanager kactivities kdepimlibs openexr
+#todo: add openslp
   ];
 
   nativeBuildInputs = [ pkgconfig ];
 
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
   passthru.propagatedUserEnvPackages = [ virtuoso ];
 
   meta = {

pkgs/desktops/kde-4.10/kde-wallpapers.nix

@@ -9,7 +9,7 @@ kde {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "1qpnv4f8f2aga3i1w9k0f0s6myilnm0f9mja8ikkkgi2qpv1q66f";
+  outputHash = "01k4rr7xkay5j0g8qwmfmvf4d0rjc9sdk121wravsagbidz3s9ci";
 
   meta = {
     description = "Wallpapers for KDE";

pkgs/desktops/kde-4.10/kdelibs/kdelibs.nix

@@ -3,60 +3,39 @@
 , openexr, avahi, kerberos, attr, shared_desktop_ontologies, libXScrnSaver
 , automoc4, strigi, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee
 , docbook_xml_dtd_42, docbook_xsl, polkit_qt_1
-, getopt, udev, herqq, phonon, libjpeg, xz
+, getopt, udev, herqq, phonon, libjpeg, xz, ilmbase
 , pkgconfig
 }:
 
 kde {
   buildInputs =
-    [ pkgconfig
-# attr
- attica #todo: update to 4.1
- avahi
- bzip2
- enchant
- fam
-# getopt
- giflib
- grantlee # todo: update to 0.3
- herqq
- jasper
-      libdbusmenu_qt #todo: update to 0.9.2
- libXScrnSaver
- libxslt
-# pcre
- polkit_qt_1 qca2
-      shared_desktop_ontologies xz udev
-# libxml2
- libjpeg
- kerberos
-
-#openexr # todo: update openexr to 1.7.1. make it compile maybe need ilmbase although it's supposedly propagated
+    [ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq jasper
+      libdbusmenu_qt libXScrnSaver libxslt polkit_qt_1 qca2
+      shared_desktop_ontologies xz udev libjpeg kerberos openexr
     ];
 
-  propagatedBuildInputs = [ qt4 soprano
- strigi # todo: update to 0.7.8
- phonon ];
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
 
-  propagatedNativeBuildInputs = [ automoc4 cmake perl
- shared_mime_info #todo: update to 1.1
- ];
+  propagatedBuildInputs = [ qt4 soprano strigi phonon ];
+
+  propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ];
 
   # TODO: make sonnet plugins (dictionaries) really work.
   # There are a few hardcoded paths.
-  # Let kdelibs find openexr
   # Split plugins from libs?
 
   patches = [ ../files/polkit-install.patch ];
 
   # cmake fails to find acl.h because of C++-style comment
-  # TODO: OpenEXR
+
   cmakeFlags = [
     "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
     "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
     "-DHUPNP_ENABLED=ON"
   ];
 
+  passthru.wantsUdisks2 = false;
+
   meta = {
     description = "KDE libraries";
     license = "LGPL";

pkgs/desktops/kde-4.10/kdepim.nix

@@ -3,7 +3,7 @@
 , nepomuk_widgets, dblatex }:
 
 kde {
-#todo: update grantlee to 0.3
+
   buildInputs =
     [ kdepimlibs boost akonadi shared_desktop_ontologies nepomuk_widgets
       libxslt cyrus_sasl gpgme libassuan grantlee prison dblatex

pkgs/desktops/kde-4.10/l10n/manifest-4.10.2.nix

@@ -1,282 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "1si3hkxag2s93vywr8spiwaz8rr287b8ms0akw7ba4hr3mccgllz";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "1dfp2zkzj5h0qqz03sicdvw024afc49vlj59k973vqnziwqwkvil";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "0v56by3jxpn76dcbrz89np6par2ndmz6l9lgpyzi3qgh7c1flh3k";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "0xj157l9h6frac4pnfsirh06j7kdq37wlikm7rnybnpdg7nv4kls";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "0zrc3cpbiarsfh2jqrrhxalmz62k5bb9wf9vbfcvbh90a0v5csaw";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "1scy726cxyv6gmh77wnfb8qb00vhhxxg1wwg8lk56r79jsh77pbh";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "1qdhzw9v1q188bky8phv3wj0sj3imf08j3bqqf2gcniw2zr0nkhq";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "13r97in3yl17scq41fncbzp3s99c2ahspxixcjb5b066c9ln4n4z";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "0c3w2cxmv46l85kg9d68v037br0ck423k0zfkyi01hgh76jixhnm";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "158i25z1b5hj5fhhsczf52l2369xmzyxfjjr1xp9pp5aga2kp3dc";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "0vm2sr5nqzjssm2mzjw56wwsygzasrr04pl77y4mvq1d573gaks3";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "0w4dqvgain4m14cr8vmr49a890lmjiz203vw347fyq6mvqg57f3z";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "1809g1jdbrp22572h68zr7a5riymzv240hpmh633v8qmdqyzmnlk";
-}
-{
-  lang = "fa";
-  saneName = "fa";
-  sha256 = "1y1m9zagw1wras6vfrw6zbhy08xm1djfg7wg0fqvr2pnw01b903f";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "0fd6zbxn1dcq3i8vp6m4ifsrfhpghbgvwrh0gqmpw60kr9ms72pj";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "1ybdnvsb2fi8hymad4fj7dhgfqjabbhgjgmcs4g0px583gbx38ys";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "1hcdx82213dhy6v2hy9c543fci8pj3p5lz2bb0sds14wscryngiy";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "0p0k0r42wqp9ww0w4k4dp0cp9mv4is1zffsnpb1vdj8fr4n73lms";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "0wfyx7w2igz078f9s3nf2gr2s2bj6kdrpsd4cycdrvi7lpkv97mg";
-}
-{
-  lang = "hi";
-  saneName = "hi";
-  sha256 = "0nr6lskvq4v885hlnwyn5c6r76lj923lnmzz7f3ymxsm8ahgy9i1";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "1zg11q416rlcwygbapllmhwy577gwrvxyrr2hv0knz8r6jdwxnxj";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "1km3w6m7m3w3315ivy80rwmn82g41cfw3id21ks8sykqray60jyf";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "1rb6qsvhp8r7ivsjcp2980vdkb5pczxky6wix884xdd2jyb4dqbs";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "0kngwsasyw36g05xbxcgn71mkl89xs3sg8lx3qzd6g7drk2s5r1w";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "1ckb7alln8f72x9q6hi4ji7xylaipd3zwilnrr7978y1q5b8297l";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "1s0m6kl0wdd22pbnrnmxq19y1nzyvmln64g5gqr9c33x08lwd3jz";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "1jn3pd4j5jpw8ing7hi0npkrk4cy5vbfp62jcpn93dizq71g0cis";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "1y6492rmh8hw3fw8yss80j8dnn6gah4mp207wnjx7savxdganrk9";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "05r7cslynx4yxlkaqq2lhjg2rmvjzz74h41if5fj3lkm9p848663";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "1xa7jc3jbhicqzikayssmm08mnqwhwy3gbr2xp2wyxvrwgy0vd7b";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "1xr2938yqkl81rwcfg43mqksm9r6zcw5bp49cm5ybrrr1np08d4p";
-}
-{
-  lang = "mr";
-  saneName = "mr";
-  sha256 = "0w4g863da74vabbx6dc7hpf6lqa09bsxm5bdl33bqp6wxz0qbrxf";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "1axqkkwgm3x12fpfnvxzm2bf22rh2fxic15rrk70sjc0xzkmbfc2";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "1y72jrw7s6afznj0axwrxczvcxm2i3m9dldjjb32w8lr2gbibhz9";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "01ps3fgwhzffsb52zcjgi4frgy719wlgjmrva9hl320wgi6bgs30";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "0a9zrn54x38c4jn2p59s3wiv42g1f7nwar2gppn992q2awq05m6x";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "1782vpj199ck5fswv3jc0adff0k7bv699b4la604kb0a7dl43cf2";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "0lldhl2jd51j3srf2dqq6gd4nxy6y3qxd585bgxpclvnmz7zqq9b";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "10w740h5h3ag2jpj44xyclpya59d8jmgv5ma1rz27wcvwl38jggx";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "1rn5jc9dihi0mwvly1rk1fqzdbhyg9gxax1bip0l80wg8mj9d0h5";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "1l1b9j9ixianyvbg2msc4d4bkm2km3w0h6xkbcyl7rg0cja9ys8l";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "0rgasg2c0ds96yqky1rnqj7fc9w3g6p0ng27v5vq3ja7paij1yv9";
-}
-{
-  lang = "si";
-  saneName = "si";
-  sha256 = "0124dhn1ng225zhyz8lmc2lf6cpxbbirr3bl3h6cq8lyjs4p078l";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "0xfp2wh1qyyh1cixypam9qnni0zin580vcbnhpmbx5disy3znmga";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "1hfqq8k5n48hjypj5sribh761gpgn930410qbdnrxjmm0l95rzlp";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "1rma3l9mpm1xakkf2mkjpa6nxhl076hnm6fiirna7nsgvsk2c3jz";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "02rg9hm0j1lfdv9nb80bh4yy41z3rvfh39w8xwrmv941y6k58q7w";
-}
-{
-  lang = "tg";
-  saneName = "tg";
-  sha256 = "16731c2bjg3c8r7i6lm6j3gsj9yqs2yd69sl04y9nv5yh1i0km15";
-}
-{
-  lang = "th";
-  saneName = "th";
-  sha256 = "032zwwn5za8cknmqxd8yzr3djylnvrzjldgygqlshf0pxkryjkrp";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "1bp8bndwyw33rkkv2dhs1l9qbzkhccsrqcflxnjrm98shks2vgzr";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "0hhdj4yb208rmpd9a77jf7x9p5iq35iyvn68sr6n1m228pncddi6";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "0sw07alwjw7qiss93bgf4h5ix9kpz2czfwbbgdydfwqcwz5nzvcy";
-}
-{
-  lang = "vi";
-  saneName = "vi";
-  sha256 = "06fchmphkp7rpg6i0gd50qyjlfr6drj0xnlkdczw54iy1zklrlmh";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "1pm3wvs88h03gch6nzn5hd268r2q4jd13slh6bh2nvhq719g8zsa";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "0k8j3dprpzxi87rd6xhp1qr93jg91i0hym87y7wlqb239aqz41dn";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "05ks7gdl3x6wkxs2rdj6f48bpd4cishw9zfh0a264kix6mh2fzcq";
-}
-]

pkgs/desktops/kde-4.10/l10n/manifest-4.10.3.nix

@@ -0,0 +1,282 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "0m9zzggcq9ril1wklq1w94hgqdzg78m9v932j1hv1h1nvsjf2gkl";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "1c6y2b249sh8k76q1ahw1z4lfn9riqhngxhmrjc6qsi3lpfd851n";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "0q7jcw0085cm8wnr5fykim6yvvvps4hn9z9anb8dmgxrzyvvr2p4";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "1mzcmxqlabgfhdq4bkwcc5gv2dpx0yxkwln5whyjzy7jz5wz5hhl";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "1laz6av9xssdmkd3xcz68bbjdp1b61py0xpqhj90ma1bhza9rk5v";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "12smzrr5chavlg0xis993f60hwqrh1hrbkh0n6n5m3mdsfi5dwix";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "0a0hm328lvw9ahw4xmbwsyngidpawjcc3fi9kinqsss4srm257jc";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "1wz9ly4yqs20s3c6lb92p8v1hylidkp57j8v02qys7883j5rii8w";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "0954c5jar0lmjnivnnbbs2b04xd58l7s0s3adbnrg392cvq92ca7";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "15y0s4y9rqqc8g0qm9v4l9w2km6589xckyd9c21bqhx0nsk2dm5k";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "0d7blp0xc808gfhyjww60zdr9wbp5lx1m4i8cca8l683rbxqcbvb";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "07l9w9mk4xylk5s00xs1i8vpa0fhy2fxngqayqyr3n0ljj0ls9my";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "1g8yap82jz9nvj25bihrw4xrbjq6669l3qlikjsb89x9jxdslncj";
+}
+{
+  lang = "fa";
+  saneName = "fa";
+  sha256 = "0492aps0xvw8krcq5h0rx7farm96k0s3apc3lhxxx9g1flxpjffa";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "0pnmjikbn077h6p2inkpisgyrkmfy0wphbmif3spli07nakd1kaw";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "1hs53c35fpxkrgfpdfp3qxyy6sh6wv2zcb078rrpc1yc8vjxs31q";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "1d6ch6hkc7vncpwkqg5prm1ngkgckr8ynk32w6vi5lkhcc1lmi2g";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "16jrf6zb4glsighllq7n1hg73la6g3gzbzs4c56yhgyyi8x02i7h";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "0gjhnypd2lrrx2v0kn2h2iqclhy8fh38z5fzry2m0dgzxqpj7nmw";
+}
+{
+  lang = "hi";
+  saneName = "hi";
+  sha256 = "0pplwd10jancgfilywl12fifsnng1dw1j87ph1khgx786q0fncwj";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "1a33p1pic8g9cfjx1inry1dxf2lsz91cw7v3niwv5a3xsyd1p5sw";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "08q62d900hyfzf2lnysjk4bg7gg5lgna80x537fkpz5klbmhipar";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "010gjkpky3arbfhhhwb51px2qwcn35ppfg1rhm16vvpmi4whz768";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "1pdla5xvx0jqs0bzz8ncgjllg39wa4a67lzz9mr2j4w51c4y2s5p";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "1i2cvvyknjmznag1raf1i3d6s91m084whk2vk5kywlbncmncx3bm";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "18b5j98ysg9ps232wj5b3rkxqhj002rr2yzkffsysmqm6232azw6";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "14n8y8wy8pbvxix4zgs2lvffcppya491y79pgr4zfgjbckz8hbw9";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "0qy7xzn8asv8nxq899fisbjdflz2dmg1kx8zmw78xxjyl6kdiqrc";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "0l9h9q8c6z8g4hc2vk6vla85gjk9ghkwpwd7mpqsa8q60qbqa1r3";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "0xq83xnx533075ml5xg4mnhi8a5k41v16riqd9rfgbwj82w098xz";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "1x1afwssvxzkk605j9895c3h363gnra9zjyw5fyvgh02hrfysv7f";
+}
+{
+  lang = "mr";
+  saneName = "mr";
+  sha256 = "1akl0l8dmsshwsvy0m9hlprkxlx345v1r5wh2zbyad3nzz1sa2ig";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "1div9bf6hhisrvcrlmdiwkzk4wnff2gdzwjp81nqldfhaw098hip";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "1ll2m6jxkwqg6z7bp816j04gf7a0x98yk3qxlp7an4khacqy60pl";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "0dchxgsr8m1awwahwqyrbrq55035rpkv6387z9qwmz8098yx1vgf";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "1liv2q1yblq55lk20sg4qma4kfa05c1wsp1y8zqv456h10ksmh67";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "031idmcpkcnr3qmbg94zwpzf8vw5wia8mndggis6shrf9gnnkhs2";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "1k5ng4gxn7gnhhh674fzwhhzwmawnxx5bn94dhizsqx3ix533vlw";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "0v4nv8d1v8fvsgb6mhxkymcbndjdc9qgx8kd5b2hpyqnppgib4vm";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "1i7siqyh0ds1g6w7vzsys6zdvgphs14hd4xxh66qn5s5zmrr0l83";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "02vf365r6mr0bghkj58f6d6ivkd4fcp6mxy9jz7ap8km8jjbiyky";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "0rjm6c6aw1kim61rgp8fkqgi9915d6kh1jk4kas064gkwwxl3q2p";
+}
+{
+  lang = "si";
+  saneName = "si";
+  sha256 = "12z8bvd1a0hzr9x05pv09lznnfh9mngxw86rhfyhx382zrbz1vha";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "16xbin5c8slxxdag7zl8xigmmklm6fl3icy4qdhaglvim07xf995";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "09flw3yr3slhqgjl3aq2p25rl46a90q7gd3p7812lmw3lwpcaxh6";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "1p4xlshvz6avnr9dc7yggn53lfh1i5hz14dr8i1ndwj8bhgrzy6m";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "10ma8f1csc2akg0vfwh1wmhj9bwwq0yfn1s5x5ighn67z4jxbp0s";
+}
+{
+  lang = "tg";
+  saneName = "tg";
+  sha256 = "065x638nr5wsxs9y0hldbdkp0wgyfnrjlsmyvhg96abrlbs4kgid";
+}
+{
+  lang = "th";
+  saneName = "th";
+  sha256 = "1qk9khh63qqj5pz92w6l1c1ailcm02mhka215b7qw3waackab3iq";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "1n7w8pmn4r4d3hqm88ya2j3phxsvgy8d57skym3lv30y4116yzkj";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "068s6ilx62l33iandrdisqd2405hhp5gpxpl7x95avrsy016ni1c";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "1jvs7bmppzzw1wahcmdy4cq7sblsl6vhrfz91ryc4jcr4klxy7k4";
+}
+{
+  lang = "vi";
+  saneName = "vi";
+  sha256 = "0knnc1f7pwfm10xiykajax1xp41psvak1n479n6dji3na0larf5s";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "0fw8d3ia3pxpkn6q03188z636z3gk2xciq3igkyjdyfmf14nbwv6";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "0s16ns3zjcabq3s27ak9isyqikd6gw5gyvxji5fly9mgcs1dkgmr";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "0fy6cib6c7xnacjybyizb3chynqd1fv70447glvjwls9v8avgcpl";
+}
+]

pkgs/desktops/kde-4.10/oxygen-icons.nix

@@ -3,7 +3,7 @@
 kde {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "10dpbgidn7rwdhm044ydd294dv97hrhaz7jakf1yncszqbhbxksc";
+  outputHash = "13fyib1v03n3fpq27n2q1yg130qjnz80kwdqccq46za96xb6yrs9";
 
   nativeBuildInputs = [ cmake ];
 

pkgs/desktops/kde-4.10/support/akonadi/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "akonadi-1.9.1";
+  name = "akonadi-1.9.2";
   
   src = fetchurl {
     url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
-    sha256 = "1w10kb4m8ri6yi1mii2j0sckj3vq11y6qkzijm3lbh4w0fi4kbjk";
+    sha256 = "1ndzc7a1q1hqy4pn9xnihq6ni02zsqfdyy6z6lwn27bkb7pg64p7";
   };
 
   buildInputs = [ qt4 soprano libxslt boost sqlite ];

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

@@ -13,9 +13,6 @@ cabal.mkDerivation (self: {
     description = "Command-line program for type-checking and compiling Agda programs";
     license = "unknown";
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })

pkgs/development/compilers/epic/default.nix

@@ -14,9 +14,6 @@ cabal.mkDerivation (self: {
     description = "Compiler for a simple functional language";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })

pkgs/development/compilers/go/1.1.nix

@@ -7,11 +7,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "go-1.1rc1";
+  name = "go-1.1";
 
   src = fetchurl {
-    url = http://go.googlecode.com/files/go1.1rc1.src.tar.gz;
-    sha1 = "c999c36e7bb5c9ef05d309b0bb4275feb62c44e3";
+    url = http://go.googlecode.com/files/go1.1.src.tar.gz;
+    sha1 = "a464704ebbbdd552a39b5f9429b059c117d165b3";
   };
 
   buildInputs = [ bison glibc bash makeWrapper ];
@@ -49,7 +49,7 @@ stdenv.mkDerivation {
     sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go
     # Disable the hostname test
     sed -i '/TestHostname/areturn' src/pkg/os/os_test.go
-    # Disable a failing icmp test
+    # Disable a failing icmp test (maybe because not being root?)
     sed -i '/ip[46]:.*icmp.*nil/d' src/pkg/net/ipraw_test.go
   '';
 

pkgs/development/compilers/haxe/default.nix

@@ -1,34 +1,27 @@
 { stdenv, fetchsvn, ocaml, zlib, neko }:
 
 stdenv.mkDerivation {
-  name = "haxe-2.10";
+  name = "haxe-3.00";
 
   buildInputs = [ocaml zlib neko];
 
-  srcs = fetchsvn {
-    url = "http://haxe.googlecode.com/svn/tags/v2-10";
-    sha256 = "0vwdlj0vmmf97bg6cish7yah36aca2q599vwzbr1m0jpjbvindkh";
-    ignoreExternals = true;
-  };
-
-  ocamllibs = fetchsvn {
-    url = "http://ocamllibs.googlecode.com/svn/trunk";
-    sha256 = "143s320xn2xalm0lnw46h1fvy48qg7my3j8cf66f0wwzv2fisr1q";
-    rev = 256;
-    ignoreExternals = true;
+  src = fetchsvn {
+    url = "http://haxe.googlecode.com/svn/trunk";
+    sha256 = "0hg8qailhgrcdk7r4k9kmwfl9d9ds0vy0l7wbv5wdrrc34qzifm4";
+    rev = 6706;
   };
 
   prePatch = ''
-    cp -r "$ocamllibs" libs
-    chmod -R u+w libs
     sed -i -e 's|com.class_path <- \[|&"'"$out/lib/haxe/std/"'";|' main.ml
   '';
 
   postBuild = ''
     find std/tools -name '*.n' -delete
-    rm std/tools/haxedoc/haxedoc std/tools/haxelib/haxelib
+    rm -f std/tools/haxedoc/haxedoc std/tools/haxelib/haxelib
   '';
 
+  buildFlags = [ "all" "tools" ];
+
   installPhase = ''
     install -vd "$out/bin" "$out/lib/haxe/std"
     install -vt "$out/bin" haxe haxelib haxedoc

pkgs/development/compilers/jdk/jdk6-linux.nix

@@ -1,6 +1,6 @@
 { swingSupport ? true
 , stdenv
-, fetchurl
+, requireFile
 , unzip
 , makeWrapper
 , xlibs ? null
@@ -32,13 +32,15 @@ stdenv.mkDerivation {
 
   src =
     if stdenv.system == "i686-linux" then
-      fetchurl {
-        url = http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-i586.bin;
+      requireFile {
+        name = "jdk-6u45-linux-i586.bin";
+        url = http://www.oracle.com/technetwork/java/javase/downloads/jdk6downloads-1902814.html;
         sha256 = "0mx3d2qlal5zyz1a7ld1yk2rs8pf9sjxs2jzasais3nq30jmlfym";
       }
     else if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-x64.bin;
+      requireFile {
+        name = "jdk-6u45-linux-x64.bin";
+        url = http://www.oracle.com/technetwork/java/javase/downloads/jdk6downloads-1902814.html;
         sha256 = "1s0j1pdr6y8c816d9i86rx4zp12nbhmas1rxksp0r53cn7m3ljbb";
       }
     else

pkgs/development/compilers/mentor/default.nix

@@ -0,0 +1,75 @@
+# Sourcery CodeBench Lite toolchain(s) (GCC) from Mentor Graphics
+
+{ stdenv, fetchurl, patchelf, ncurses }:
+
+let
+
+  buildToolchain =
+    { name, src, description }:
+
+    stdenv.mkDerivation rec {
+      inherit name src;
+
+      buildInputs = [ patchelf ];
+
+      buildCommand = ''
+        # Unpack tarball
+        mkdir -p "$out"
+        tar --strip-components=1 -xjf "$src" -C "$out"
+
+        # Patch binaries
+        interpreter="$(cat "$NIX_GCC"/nix-support/dynamic-linker)"
+        for file in "$out"/bin/* "$out"/libexec/gcc/*/*/* "$out"/*/bin/*; do
+            # Skip non-executable files
+            case "$file" in
+              *README.txt) echo "skipping $file"; continue;;
+              *liblto_plugin.so*) echo "skipping $file"; continue;;
+            esac
+
+            # Skip directories
+            test -d "$file" && continue
+
+            echo "patchelf'ing $file"
+            patchelf --set-interpreter "$interpreter" "$file"
+
+            # GDB needs ncurses
+            case "$file" in
+              *gdb) patchelf --set-rpath "${ncurses}/lib" "$file";;
+            esac
+        done
+      '';
+
+      meta = with stdenv.lib; {
+        inherit description;
+        homepage = http://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/;
+        license = licenses.gpl3;
+        platforms = platforms.linux;
+        maintainers = [ maintainers.bjornfor ];
+      };
+    };
+
+in
+
+{
+
+  armLinuxGnuEabi = let version = "2013.05-24"; in buildToolchain rec {
+    name = "sourcery-codebench-lite-arm-linux-gnueabi-${version}";
+    description = "Sourcery CodeBench Lite toolchain (GCC) for ARM GNU/Linux, from Mentor Graphics";
+    src = fetchurl {
+      url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${version}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2";
+      sha256 = "1xb075ia61c59cya2jl8zp4fvqpfnwkkc5330shvgdlg9981qprr";
+    };
+  };
+
+  armEabi = let version = "2013.05-23"; in buildToolchain rec {
+    name = "sourcery-codebench-lite-arm-eabi-${version}";
+    description = "Sourcery CodeBench Lite toolchain (GCC) for ARM EABI, from Mentor Graphics";
+    src = fetchurl {
+      url = "http://sourcery.mentor.com/public/gnu_toolchain/arm-none-eabi/arm-${version}-arm-none-eabi-i686-pc-linux-gnu.tar.bz2";
+      sha256 = "0nbvdwj3kcv9scx808gniqp0ncdiy2i7afmdvribgkz1lsfin923";
+    };
+  };
+
+  # TODO: Sourcery CodeBench is also available for MIPS, Power, SuperH,
+  # ColdFire (and more).
+}

pkgs/development/compilers/pakcs/adjust-buildsystem.patch

@@ -0,0 +1,44 @@
+diff -Naur pakcs-1.11.2-upstream/Makefile pakcs-1.11.2/Makefile
+--- pakcs-1.11.2-upstream/Makefile	2013-03-21 04:58:38.000000000 -0430
++++ pakcs-1.11.2/Makefile	2013-05-09 15:04:48.035646127 -0430
+@@ -55,7 +55,6 @@
+ #
+ .PHONY: install
+ install: installscripts
+-	$(MAKE) frontend
+ 	# pre-compile all libraries:
+ 	@cd lib && $(MAKE) fcy
+ 	# install the Curry2Prolog compiler as a saved system:
+@@ -66,11 +65,6 @@
+ 	@cd lib && $(MAKE) acy
+ 	# prepare for separate compilation by compiling all librariers to Prolog code:
+ 	@if [ -r bin/pakcs ] ; then cd lib && $(MAKE) pl ; fi
+-	# compile the Curry Port Name Server demon:
+-	@if [ -r bin/pakcs ] ; then cd cpns && $(MAKE) ; fi
+-	# compile the event handler demon for dynamic web pages:
+-	@if [ -r bin/pakcs ] ; then cd www && $(MAKE) ; fi
+-	$(MAKE) tools
+ 	$(MAKE) docs
+ 	chmod -R go+rX .
+ 
+diff -Naur pakcs-1.11.2-upstream/scripts/pakcs.sh pakcs-1.11.2/scripts/pakcs.sh
+--- pakcs-1.11.2-upstream/scripts/pakcs.sh	2013-03-21 04:52:59.000000000 -0430
++++ pakcs-1.11.2/scripts/pakcs.sh	2013-05-09 03:14:23.500876628 -0430
+@@ -16,7 +16,7 @@
+ # use readline wrapper rlwrap if it is installed and we have tty as stdin:
+ USERLWRAP=no
+ if tty -s ; then
+-  RLWRAP=`which rlwrap`
++  RLWRAP=`type -P rlwrap`
+   if [ -x "$RLWRAP" ] ; then
+     USERLWRAP=yes
+   fi
+@@ -29,7 +29,7 @@
+ done
+ 
+ if [ $USERLWRAP = yes ] ; then
+-  exec rlwrap -c -f "$PAKCSHOME/tools/rlwrap" "$REPL" ${1+"$@"}
++  exec rlwrap -a -c -f "$PAKCSHOME/tools/rlwrap" "$REPL" ${1+"$@"}
+ else
+   exec "$REPL" ${1+"$@"}
+ fi

pkgs/development/compilers/pakcs/default.nix

@@ -1,62 +1,101 @@
-{ stdenv, fetchurl, ghc, swiProlog, syb, mtl, makeWrapper, rlwrap, tk }:
+{ stdenv, fetchurl, cabal, swiProlog, mtl, syb, makeWrapper, rlwrap, tk }:
 
-stdenv.mkDerivation {
-  name = "pakcs-1.10.0";
+let
+  fname = "pakcs-1.11.2";
 
-  src = fetchurl {
-    url = "http://www.informatik.uni-kiel.de/~pakcs/download/pakcs_src.tar.gz";
-    sha256 = "6a4a45c9f3d0b61cfec8414943c2a852bec3665a7e2638b039193dd43e9802c4";
+  fsrc = fetchurl {
+    url = "http://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz";
+    sha256 = "1x23kn91v44my4rd8j3247pj8i2myz82rzgbq07asi1x21bpvvmy";
   };
 
-  buildInputs = [ ghc swiProlog syb mtl makeWrapper rlwrap tk ];
+in
+stdenv.mkDerivation rec {
 
-  prePatch = ''
-    # Remove copying pakcsrc into $HOME.
-    sed -i '/update-pakcsrc/d' Makefile
+  name = fname;
 
-    # Remove copying pakcsinitrc into $HOME
-    sed -i '68d' configure-pakcs
+  curryBase = cabal.mkDerivation(self: {
+    pname = "curryBase";
+    version = "local";
+    src = fsrc;
+    sourceRoot = "${name}/frontend/curry-base";
+    isLibrary = true;
+    buildDepends = [ mtl syb ];
+  });
+
+  curryFront = cabal.mkDerivation(self: {
+    pname = "curryFront";
+    version = "local";
+    src = fsrc;
+    sourceRoot = "${name}/frontend/curry-frontend";
+    isLibrary = true;
+    isExecutable = true;
+    buildDepends = [ mtl syb curryBase ];
+  });
+
+  src = fsrc;
+
+  buildInputs = [ swiProlog makeWrapper rlwrap tk ];
+
+  patches = [ ./adjust-buildsystem.patch ];
+
+  configurePhase = ''
+    # Phony HOME.
+    mkdir phony-home
+    export HOME=$(pwd)/phony-home
+
+    # SWI Prolog
+    sed -i 's@SWIPROLOG=@SWIPROLOG='${swiProlog}/bin/swipl'@' pakcsinitrc
   '';
 
-  patches = [ ./pakcs-ghc741.patch ];
-
-  preConfigure = ''
-    # Path to GHC and SWI Prolog
-    sed -i 's@GHC=@GHC=${ghc}/bin/ghc@' bin/.pakcs_variables
-    sed -i 's@SWIPROLOG=@SWIPROLOG=${swiProlog}/bin/swipl@' bin/.pakcs_variables
+  preBuild = ''
+    # Set up link to cymake, which has been built already.
+    ensureDir bin/.local
+    ln -s ${curryFront}/bin/cymake bin/.local/
   '';
 
-  postInstall = ''
-    cp pakcsrc $out/
-    cp update-pakcsrc $out/
-    cp -r bin/ $out/
-    cp -r cpns/ $out/
-    cp -r curry2prolog/ $out/
-    cp -r docs/ $out/
-    cp -r examples/ $out/
-    cp -r include/ $out/
-    cp -r lib/ $out/
-    cp -r mccparser/ $out/
-    cp -r tools/ $out/
-    cp -r www/ $out/
+  installPhase = ''
+    # Prepare PAKCSHOME directory.
+    ensureDir $out/pakcs
+    for d in bin curry2prolog currytools lib tools cpns include www examples docs ; do
+      cp -r $d $out/pakcs ;
+    done
+    cp pakcsrc.default $out/pakcs
+    cp pakcsinitrc $out/pakcs
 
-    # The Prolog sources must be built in their final directory.
-    (cd $out/curry2prolog/ ; make)
+    # Fixing PAKCSHOME and related paths.
+    sed -i 's@PAKCSHOME=/tmp/.*@PAKCSHOME='$out/pakcs'@' $out/pakcs/bin/{pakcs,makecurrycgi,parsecurry,.makesavedstate}
 
-    mkdir -p $out/share/emacs/site-lisp/curry-pakcs
-    for e in "$out/tools/emacs/"*.el ; do
-      ln -s $e $out/share/emacs/site-lisp/curry-pakcs/;
+    # Fix symbolic links into the tmp build dir.
+    ln -s ../currytools/CASS/cass $out/pakcs/bin/cass
+    ln -s ../currytools/currydoc/CurryDoc $out/pakcs/bin/currydoc
+
+    # The Prolog sources must be rebuilt in their final directory,
+    # to switch the embedded references to the tmp build directory.
+    export TEMP=/tmp
+    (cd $out/pakcs/curry2prolog/ ; rm c2p.state ; make)
+    cp Makefile $out/pakcs
+    (cd $out/pakcs ; make tools)
+    (cd $out/pakcs/cpns ; make)
+    (cd $out/pakcs/www ; make)
+
+    # Install bin.
+    ensureDir $out/bin
+    for b in makecurrycgi .makesavedstate pakcs parsecurry cleancurry \
+             addtypes cass currybrowse currycreatemake currydoc currytest \
+             dataToXml erd2curry ; do
+      ln -s $out/pakcs/bin/$b $out/bin/ ;
     done
 
-    sed -i 's@which@type -P@' $out/bin/.pakcs_wrapper
+    # Place emacs lisp files in expected locations.
+    ensureDir $out/share/emacs/site-lisp/curry-pakcs
+    for e in "tools/emacs/"*.el ; do
+      cp $e $out/share/emacs/site-lisp/curry-pakcs/ ;
+    done
 
-    # Get the program name from the environment instead of the calling wrapper (for rlwrap).
-    sed -i 's@progname=`basename "$0"`@progname=$PAKCS_PROGNAME@' $out/bin/.pakcs_wrapper
-
-    wrapProgram $out/bin/.pakcs_wrapper \
+    # Wrap for rlwrap and tk support.
+    wrapProgram $out/pakcs/bin/pakcs \
       --prefix PATH ":" "${rlwrap}/bin" \
       --prefix PATH ":" "${tk}/bin" \
-      --run 'export PAKCS_PROGNAME=`basename "$0"`'
   '';
 
   meta = {
@@ -77,6 +116,6 @@ stdenv.mkDerivation {
     '';
 
     maintainers = [ stdenv.lib.maintainers.kkallio ];
-    #platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/development/compilers/scala/default.nix

@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out
-    rm "bin/"*.bat
+    rm bin/*.bat
+    rm lib/scalacheck.jar
     mv * $out
   '';
 

pkgs/development/compilers/sdcc/default.nix

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     ${if gputils == null then "--disable-pic14-port --disable-pic16-port" else ""}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Small Device C Compiler";
     longDescription = ''
       SDCC is a retargettable, optimizing ANSI - C compiler suite that targets
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
       PIC18 targets. It can be retargeted for other microprocessors.
     '';
     homepage = http://sdcc.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [maintainers.bjornfor];
   };
 }

pkgs/development/compilers/yasm/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "yasm-1.1.0";
-  
+  name = "yasm-1.2.0";
+
   src = fetchurl {
     url = "http://www.tortall.net/projects/yasm/releases/${name}.tar.gz";
-    sha256 = "e5d56b582f3d0c30ed5c4fc221063e4175602307ea645520889458133671c232";
+    sha256 = "0cfg7ji3ia2in628w42wrfvw2ixmmm4rghwmv2k202mraysgm3vn";
   };
 
   meta = {

pkgs/development/interpreters/erlang/R15B03.nix

@@ -3,14 +3,14 @@
 
 assert wxSupport -> mesa != null && wxGTK != null && xlibs != null;
 
-let version = "15B02"; in
+let version = "15B03"; in
 
 stdenv.mkDerivation {
   name = "erlang-" + version;
 
   src = fetchurl {
-    url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz";
-    sha256 = "03eb0bd640916666ff83df1330912225fbf555e0c8cf58bb35d8307a314f1158";
+    url = "http://www.erlang.org/download/otp_src_R15B03-1.tar.gz";
+    sha256 = "4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c";
   };
 
   buildInputs =

pkgs/development/interpreters/php/5.3.nix

@@ -9,7 +9,7 @@ in
 
 composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.3.24";
+  version = "5.3.25";
 
   name = "php-${version}";
 
@@ -201,7 +201,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
 
   src = fetchurl {
     url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
-    sha256 = "00sphz1y6bjb2qshbcbadh5f2xvhfy82rfdc62qjfn6337gwlfzw";
+    sha256 = "15dwks0823m0vc3qv58yxfvchwx9ydg5gjvjy8kpc5w3syras76m";
     name = "php-${version}.tar.bz2";
   };
 

pkgs/development/interpreters/php/5.4.nix

@@ -9,7 +9,7 @@ in
 
 composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
 
-  version = "5.4.14";
+  version = "5.4.15";
 
   name = "php-${version}";
 
@@ -197,7 +197,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
 
   src = fetchurl {
     url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";
-    sha256 = "02p23g4gjijazq16r5kwbkval2lkw76g0086n0zynlf67f2g6l2l";
+    sha256 = "0dh159svdrakvm9nsyg3yyln7cqqzpxgs2163cqxplnc93d8a8id";
     name = "php-${version}.tar.bz2";
   };
 

pkgs/development/interpreters/racket/default.nix

@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   pname = "racket";
-  version = "5.3.3";
+  version = "5.3.4";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz";
-    sha256 = "1qp0fmsh4dkxvlj35xnwdcf4m97jcf927cwhnckjicqx1lfa0wj7";
+    sha256 = "0yrdmpdvzf092869y6zjjjxl6j2kypgiv7qrfkv7lj8w01pbh7sd";
   };
 
   # Various racket executables do run-time searches for these.

pkgs/development/libraries/attica/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "attica-0.4.0";
+  name = "attica-0.4.1";
   
   src = fetchurl {
     url = "mirror://kde/stable/attica/${name}.tar.bz2";
-    sha256 = "172d1z97aw9iscq6wh23i31s4hgq7mmhr3mk4xgifqv0hjcmzyhq";
+    sha256 = "1rnd861vy6waf25b1ilsr3rwb06dmmlnd8zq3l8y6r0lq5i2bl9n";
   };
   
   buildInputs = [ qt4 ];
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A library to access Open Collaboration Service providers";
     license = "LGPL";
-    maintainers = [ maintainers.sander maintainers.urkud ];
+    maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
     inherit (qt4.meta) platforms;
   };
 }

pkgs/development/libraries/audio/libbs2b/default.nix

@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, libsndfile }:
+
+stdenv.mkDerivation rec {
+  name = "libbs2b-${version}";
+  version = "3.1.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/bs2b/${name}.tar.bz2";
+    sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7";
+  };
+
+  buildInputs = [ pkgconfig libsndfile ];
+
+  meta = {
+    homepage = "http://bs2b.sourceforge.net/";
+    description = "Bauer stereophonic-to-binaural DSP library";
+    license = stdenv.lib.licenses.mit;
+  };
+}

pkgs/development/libraries/boost/1.49.nix

@@ -57,7 +57,7 @@ stdenv.mkDerivation {
   };
 
   # See <http://svn.boost.org/trac/boost/ticket/4688>.
-  patches = [ ./boost_filesystem_post_1_49_0.patch ./time_utc.patch ];
+  patches = [ ./boost_filesystem_post_1_49_0.patch ./time_utc.patch ] ++ (stdenv.lib.optional stdenv.isDarwin ./boost-149-darwin.patch );
 
   enableParallelBuilding = true;
 

pkgs/development/libraries/boost/boost-149-darwin.patch

@@ -0,0 +1,40 @@
+diff -rc boost_1_49_0/tools/build/v2/tools/darwin.jam boost_1_49_0-new/tools/build/v2/tools/darwin.jam
+*** boost_1_49_0/tools/build/v2/tools/darwin.jam	Mon Jun  6 22:36:21 2011
+--- boost_1_49_0-new/tools/build/v2/tools/darwin.jam	Thu May 23 22:07:45 2013
+***************
+*** 498,504 ****
+  flags darwin.compile OPTIONS <link>shared : -dynamic ;
+  
+  # Misc options.
+! flags darwin.compile OPTIONS : -no-cpp-precomp -gdwarf-2 -fexceptions ;
+  #~ flags darwin.link OPTIONS : -fexceptions ;
+  
+  # Add the framework names to use.
+--- 498,504 ----
+  flags darwin.compile OPTIONS <link>shared : -dynamic ;
+  
+  # Misc options.
+! flags darwin.compile OPTIONS : -gdwarf-2 -fexceptions ;
+  #~ flags darwin.link OPTIONS : -fexceptions ;
+  
+  # Add the framework names to use.
+diff -rc boost_1_49_0/tools/build/v2/tools/darwin.py boost_1_49_0-new/tools/build/v2/tools/darwin.py
+*** boost_1_49_0/tools/build/v2/tools/darwin.py	Wed Oct 28 08:47:51 2009
+--- boost_1_49_0-new/tools/build/v2/tools/darwin.py	Thu May 23 21:58:12 2013
+***************
+*** 37,43 ****
+  feature.feature ('framework', [], ['free'])
+  
+  toolset.flags ('darwin.compile', 'OPTIONS', '<link>shared', ['-dynamic'])
+! toolset.flags ('darwin.compile', 'OPTIONS', None, ['-Wno-long-double', '-no-cpp-precomp'])
+  toolset.flags ('darwin.compile.c++', 'OPTIONS', None, ['-fcoalesce-templates'])
+  
+  toolset.flags ('darwin.link', 'FRAMEWORK', '<framework>')
+--- 37,43 ----
+  feature.feature ('framework', [], ['free'])
+  
+  toolset.flags ('darwin.compile', 'OPTIONS', '<link>shared', ['-dynamic'])
+! toolset.flags ('darwin.compile', 'OPTIONS', None, ['-Wno-long-double'])
+  toolset.flags ('darwin.compile.c++', 'OPTIONS', None, ['-fcoalesce-templates'])
+  
+  toolset.flags ('darwin.link', 'FRAMEWORK', '<framework>')

pkgs/development/libraries/c-ares/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "c-ares-1.10.0";
+
+  src = fetchurl {
+    url = "http://c-ares.haxx.se/download/${name}.tar.gz";
+    sha256 = "1nyka87yf2jfd0y6sspll0yxwb8zi7kyvajrdbjmh4axc5s1cw1x";
+  };
+
+  meta = {
+    description = "A C library for asynchronous DNS requests";
+
+    homepage = http://c-ares.haxx.se;
+
+    license = stdenv.lib.licenses.mit;
+
+    maintainer = [ stdenv.lib.maintainers.shlevy ];
+  };
+}

pkgs/development/libraries/cyrus-sasl/default.nix

@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
                         )
   '';
 
+  installFlags = if stdenv.isDarwin then [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ] else null;
+
   meta = {
     homepage = "http://cyrusimap.web.cmu.edu/";
     description = "library for adding authentication support to connection-based protocols";

pkgs/development/libraries/enginepkcs11/default.nix

@@ -4,7 +4,10 @@ stdenv.mkDerivation rec {
   name = "engine_pkcs11-0.1.8";
   
   src = fetchurl {
-    url = "http://www.opensc-project.org/files/engine_pkcs11/${name}.tar.gz";
+    urls = [
+      "http://www.opensc-project.org/files/engine_pkcs11/${name}.tar.gz"
+      "http://www.openadk.org/distfiles/${name}.tar.gz"
+    ];
     sha256 = "1rd20rxy12rfx3kwwvk5sqvc1ll87z60rqak1ksfwbf4wx0pwzfy";
   };
   

pkgs/development/libraries/flann/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, unzip, cmake, python}:
 
 stdenv.mkDerivation {
-  name = "flann-1.6.8";
+  name = "flann-1.8.4";
   
   src = fetchurl {
-    url = http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.6.8-src.zip;
-    sha256 = "0ag9k821jy0983gjrfsjnqkl5axklcih0qkpfy72h3643nin0f50";
+    url = http://people.cs.ubc.ca/~mariusm/uploads/FLANN/flann-1.8.4-src.zip;
+    sha256 = "022w8hph7bli5zbpnk3z1qh1c2sl5hm8fw2ccim651ynn0hr7fyz";
   };
 
   buildInputs = [ unzip cmake python ];
@@ -14,5 +14,7 @@ stdenv.mkDerivation {
     homepage = http://people.cs.ubc.ca/~mariusm/flann/;
     license = "BSD";
     description = "Fast approximate nearest neighbor searches in high dimensional spaces";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/development/libraries/fox/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, x11 }:
+{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft }:
 
 let
   version = "1.7.9";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     md5 = "b5897e9c664967f5042e57070037ff18";
   };
 
-  buildInputs = [ x11 ];
+  buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ];
 
   doCheck = true;
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
         Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
       '';
     homepage = "http://fox-toolkit.org";
-    license = "LGPL";
+    license = "LGPLv3";
     maintainers = [ stdenv.lib.maintainers.bbenoist ];
     platforms = stdenv.lib.platforms.all;
   };

pkgs/development/libraries/fox/fox-1.6.nix

@@ -1,7 +1,8 @@
-{ stdenv, fetchurl, x11 }:
+{ stdenv, fetchurl, x11, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor
+, libXrandr, mesa, libXft, libXfixes, xinput }:
 
 let
-  version = "1.6.9";
+  version = "1.6.48";
 in
 
 stdenv.mkDerivation rec {
@@ -9,10 +10,11 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
-    md5 = "8ab8274237431865f57b2f5596374a65";
+    sha256 = "1i0q0357lrd41jjr2nkf2a7ls5ls2nwrkxbfc7202vy22942lb9k";
   };
 
-  buildInputs = [ x11 ];
+  buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr
+      libXft mesa libXfixes xinput ];
 
   doCheck = true;
 
@@ -27,7 +29,7 @@ stdenv.mkDerivation rec {
         Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
       '';
     homepage = "http://fox-toolkit.org";
-    license = "LGPL";
+    license = "LGPLv3";
     maintainers = [ stdenv.lib.maintainers.bbenoist ];
     platforms = stdenv.lib.platforms.all;
   };