Merge staging into closure-size

The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.

32 files changed, 221 insertions, 338 deletions

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index bc4c97d1f21..0b9cbe02999 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, lib, fetchurl, fetchpatch, SDL, boost, cmake, ffmpeg, gettext, glew
+{ stdenv, lib, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew
 , ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile
 , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
-, zlib, fftw
+, zlib, fftw, opensubdiv
 , jackaudioSupport ? false, libjack2
 , cudaSupport ? false, cudatoolkit
 , colladaSupport ? true, opencollada
@@ -10,17 +10,18 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "blender-2.75a";
+  name = "blender-2.76b";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "09lxb2li70p6fg7hbakin9ffy3b3101c1gdjqi3pykks5q3h9sq4";
+    sha256 = "0pb0mlj4vj0iir528ifqq67nsh3ca1942933d9cwlbpcja2jm1dx";
   };
 
   buildInputs =
     [ SDL boost cmake ffmpeg gettext glew ilmbase libXi
       libjpeg libpng libsamplerate libsndfile libtiff mesa openal
       opencolorio openexr openimageio /* openjpeg */ python zlib fftw
+      (opensubdiv.override { inherit cudaSupport; })
     ]
     ++ optional jackaudioSupport libjack2
     ++ optional cudaSupport cudatoolkit
@@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
       "-DWITH_GAMEENGINE=ON"
       "-DWITH_OPENCOLORIO=ON"
       "-DWITH_PLAYER=ON"
+      "-DWITH_OPENSUBDIV=ON"
       "-DPYTHON_LIBRARY=python${python.majorVersion}m"
       "-DPYTHON_LIBPATH=${python}/lib"
       "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index e3f3f25a071..6bd176d7357 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-${version}";
-  version = "2.38.0";
+  name = "calibre-${meta.version}";
 
   src = fetchurl {
-    url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "075axil53djss99fj9drfh5cvxdbjw6z5z5qk53vm13k5pw6bmhn";
+    url = "https://github.com/kovidgoyal/calibre/releases/download/v${meta.version}/${name}.tar.xz";
+    sha256 = "0d1sn2wc6h3c5girllsmnqg3jhmkal693ww3j6cj1mz2rraw45xr";
   };
 
   inherit python;
@@ -59,10 +58,11 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    version = "2.44.0";
     description = "Comprehensive e-book software";
     homepage = http://calibre-ebook.com;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ viric iElectric pSub ];
+    maintainers = with maintainers; [ viric iElectric pSub AndersonTorres ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index 9f97e1eccee..890bc2c016b 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, makeWrapper, qtbase, qtquick1, qmltermwidget }:
+{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget }:
 
 stdenv.mkDerivation rec {
   version = "1.0.0";
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
     sed -i -e '/qmltermwidget/d' cool-retro-term.pro
   '';
 
-  buildInputs = [ makeWrapper qtbase qtquick1 qmltermwidget ];
+  buildInputs = [ qtbase qtquick1 qmltermwidget ];
+  nativeBuildInputs = [ makeQtWrapper ];
 
   configurePhase = "qmake PREFIX=$out";
 
diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix
index 1ba3ee5268f..ac1852cd893 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@@ -1,35 +1,28 @@
-{stdenv, fetchurl, libX11, libXinerama, enableXft, libXft, zlib}:
-
-with stdenv.lib;
+{stdenv, fetchurl, libX11, libXinerama, libXft, zlib}:
 
 stdenv.mkDerivation rec {
-  name = "dmenu-4.5";
+  name = "dmenu-4.6";
 
   src = fetchurl {
     url = "http://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "0l58jpxrr80fmyw5pgw5alm5qry49aw6y049745wl991v2cdcb08";
-  };
-
-  xftPatch = fetchurl {
-    url = "http://tools.suckless.org/dmenu/patches/${name}-xft.diff";
-    sha256 = "efb4095d65e5e86f9dde97294732174409c24f319bdd4824cc22fa1404972b4f";
+    sha256 = "1cwnvamqqlgczvd5dv5rsgqbhv8kp0ddjnhmavb3q732i8028yja";
   };
 
-  buildInputs = [ libX11 libXinerama ] ++ optionals enableXft [zlib libXft];
-
-  patches = optional enableXft xftPatch;
+  buildInputs = [ libX11 libXinerama zlib libXft ];
 
   postPatch = ''
     sed -ri -e 's!\<(dmenu|stest)\>!'"$out/bin"'/&!g' dmenu_run
   '';
 
-  preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ];
+  preConfigure = ''
+    sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk
+  '';
 
-  meta = { 
-      description = "a generic, highly customizable, and efficient menu for the X Window System";
+  meta = with stdenv.lib; {
+      description = "A generic, highly customizable, and efficient menu for the X Window System";
       homepage = http://tools.suckless.org/dmenu;
-      license = stdenv.lib.licenses.mit;
-      maintainers = with stdenv.lib.maintainers; [viric];
-      platforms = with stdenv.lib.platforms; all;
+      license = licenses.mit;
+      maintainers = with maintainers; [ viric pSub ];
+      platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index 4324a33d238..d81061f3207 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = with maintainers; [ viric ];
     platforms = with platforms; linux;
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index ed37b0d96bc..4ac4c93471e 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   name = "electrum-${version}";
-  version = "2.4.3";
+  version = "2.5.1";
 
   src = fetchurl {
     url = "https://download.electrum.org/Electrum-${version}.tar.gz";
-    sha256 = "00z02rdlhasryccjsw1j7563xl76i6x40ah1lnn9asad1gp6520f";
+    sha256 = "0wjqf2ifw1ww6iyj0h0i63zjmy0yhmzl91sgc5hc4j2x5bd2c3am";
   };
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/applications/misc/gnuradio-nacl/default.nix b/pkgs/applications/misc/gnuradio-nacl/default.nix
new file mode 100644
index 00000000000..6298e083617
--- /dev/null
+++ b/pkgs/applications/misc/gnuradio-nacl/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, uhd
+, makeWrapper, libsodium, cppunit
+, pythonSupport ? true, python, swig
+}:
+
+assert pythonSupport -> python != null && swig != null;
+
+stdenv.mkDerivation rec {
+  name = "gnuradio-nacl-${version}";
+  version = "2015-11-05";
+
+  src = fetchFromGitHub {
+    owner = "stwunsch";
+    repo = "gr-nacl";
+    rev = "d6dd3c02dcda3f601979908b61b1595476f6bf95";
+    sha256 = "0q28lgkndcw9921hm6cw5ilxd83n65hjajwl78j50mh6yc3bim35";
+  };
+
+  buildInputs = [
+    cmake pkgconfig boost gnuradio uhd makeWrapper libsodium cppunit
+  ] ++ stdenv.lib.optionals pythonSupport [ python swig ];
+
+  postInstall = ''
+    for prog in "$out"/bin/*; do
+        wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out")
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Gnuradio block for encryption";
+    homepage = https://github.com/stwunsch/gr-nacl;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ mog ];
+  };
+}
diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index a5cc1ae0932..ab02238606a 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnuradio-${version}";
-  version = "3.7.7.1";
+  version = "3.7.8.1";
 
   src = fetchurl {
     url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz";
-    sha256 = "0kjqav1rdyi60vq85djmigyrgh606ga625icwj15iarlqwzv29rb";
+    sha256 = "1ap5gbgisnbny3jbnm2i5wm2sy6qkbhz747av3sjxp2z12fz81l4";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index eafa5c10405..4c0e091bf65 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gphoto2-2.5.5";
+  name = "gphoto2-2.5.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "1d0lvp5gsrss72597wixhgh8prcw4g7izfg3zdzzsswjgnlsxsal";
+    sha256 = "0kgfql6c64ha1gahjdwlqhmkslnfywmc2fkys4c5682zv4awvax9";
   };
 
   nativeBuildInputs = [ pkgconfig gettext ];
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index 6cd50406ed7..0625219c276 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -1,19 +1,17 @@
-{ fetchurl, stdenv, zlib, expat, which }:
+{ stdenv, fetchurl, zlib, qt5, which }:
 
-let version = "1.4.3"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "gpsbabel-${version}";
+  version = "1.5.2";
 
   src = fetchurl {
     # gpgbabel.org makes it hard to get the source tarball automatically, so
     # get it from elsewhere.
     url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz";
-    sha256 = "1s31xa36ivf836h89m1f3qiaz3c3znvqjdm0bnh8vr2jjlrz9jdi";
+    sha256 = "0xf7wmy2m29g2lm8lqc74yf8rf7sxfl3cfwbk7dpf0yf42pb0b6w";
   };
 
-  # FIXME: Would need libxml2 for one of the tests, but that in turns require
-  # network access for the XML schemas.
-  buildInputs = [ zlib expat which ];
+  buildInputs = [ zlib qt5.base which ];
 
   /* FIXME: Building the documentation, with "make doc", requires this:
 
@@ -25,10 +23,14 @@ stdenv.mkDerivation {
   configureFlags = [ "--with-zlib=system" ];
 
   doCheck = true;
+  preCheck = ''
+    patchShebangs testo
+    substituteInPlace testo \
+      --replace "-x /usr/bin/hexdump" ""
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Convert, upload and download data from GPS and Map programs";
-
     longDescription = ''
       GPSBabel converts waypoints, tracks, and routes between popular
       GPS receivers and mapping programs.  It also has powerful
@@ -47,12 +49,9 @@ stdenv.mkDerivation {
       process data that may (or may not be) placed on a map, such as
       waypoints, tracks, and routes.
     '';
-
     homepage = http://www.gpsbabel.org/;
-
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;         # arbitrary choice
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.rycee ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/grass/default.nix b/pkgs/applications/misc/grass/default.nix
deleted file mode 100644
index 467fcc21cdf..00000000000
--- a/pkgs/applications/misc/grass/default.nix
+++ /dev/null
@@ -1,190 +0,0 @@
-{ config, libXmu, libXext, libXp, libX11, libXt, libSM, libICE, libXpm
-   , libXaw, libXrender
-  , composableDerivation, stdenv, fetchurl
-   , lib, flex, bison, cairo, fontconfig
-   , gdal, zlib, ncurses, gdbm, proj, pkgconfig, swig
-   , blas, liblapack, libjpeg, libpng, mysql, unixODBC, mesa, postgresql, python
-   , readline, sqlite, tcl, tk, libtiff, freetype, makeWrapper, wxGTK, ffmpeg, fftw
-   , wxPython, motif, opendwg }@a:
-
-# You can set gui by exporting GRASS_GUI=..
-# see http://grass.itc.it/gdp/html_grass64/g.gui.html
-# defaulting to wxpython because this is used in the manual
-let inherit (builtins) getAttr;
-    inherit (a.composableDerivation) edf wwf;
-    inherit (a.stdenv.lib) maybeAttr optionalString;
-
-    # wrapper for wwf call
-    # lib: the lib whose include and lib paths should be passed
-    # {}@args: additional args being merged before passing everything to wwf
-    wwfp = lib: {name, ...}@args:
-      let mbEnable = maybeAttr "enable" {} args;
-      in wwf (args // {
-      enable =  mbEnable // {
-        buildInputs = [ lib ]
-          ++ maybeAttr "buildInputs" [] mbEnable;
-        configureFlags = [
-          "--with-${name}-libs=${lib}/lib"
-          "--with-${name}-includes=${lib}/include"
-        ] ++ maybeAttr "configureFlags" [] mbEnable;
-      };
-    });
-in
-a.composableDerivation.composableDerivation {} (fix: {
-
-  name = "grass-6.4.0RC6";
-
-  buildInputs = [
-    # gentoos package depends on gmath ?
-    a.pkgconfig
-    a.flex a.bison a.libXmu a.libXext a.libXp a.libX11 a.libXt a.libSM a.libICE
-    a.libXpm a.libXaw a.flex a.bison a.gdbm
-    a.makeWrapper
-  ];
-
-  cfg = {
-    _64bitSupport = config.grass."64bitSupport" or true;
-    cursesSupport = config.grass.curses or true;
-    gdalSupport = config.grass.gdal or true;
-    pythonSupport = config.grass.python or true;
-    wxwidgetsSupport = config.grass.wxwidgets or true;
-    readlineSupport = config.grass.readline or true;
-    jpegSupport = config.grass.jpeg or true;
-    tiffSupport = config.grass.tiff or true;
-    pngSupport = config.grass.png or true;
-    tcltkSupport = config.grass.tcltk or true;
-    postgresSupport = config.grass.postgres or true;
-    mysqlSupport = config.grass.mysql or true;
-    sqliteSupport = config.grass.sqlite or true;
-    ffmpegSupport = config.grass.ffmpeg or true;
-    openglSupport = config.grass.opengl or true;
-    odbcSupport = config.grass.odbc or false; # fails to find libodbc - why ?
-    fftwSupport = config.grass.fftw or true;
-    blasSupport = config.grass.blas or true;
-    lapackSupport = config.grass.lapack or true;
-    cairoSupport = config.grass.cairo or true;
-    motifSupport = config.grass.motif or true;
-    freetypeSupport = config.grass.freetype or true;
-    projSupport = config.grass.proj or true;
-    opendwgSupport = config.grass.dwg or false;
-    largefileSupport = config.grass.largefile or true;
-  };
-
-  # ?? NLS support:                no
-  # ?? GLw support:                no
-  # ?? DWG support:                no
-  flags = {
-
-    python = {
-      configureFlags = [ "--with-python=${a.python}/bin/python-config" ];
-      buildInputs = [a.python a.swig];
-    };
-
-  }
-  // edf { name = "_64bit"; feat = "64bit"; }
-  // wwfp a.ncurses { name = "curses"; }
-  // wwfp a.gdal { name = "gdal"; }
-  // wwfp a.wxGTK { name = "wxwidgets"; value = "${a.wxGTK}/bin/wx-config"; }
-  // wwfp a.readline { name = "readline"; }
-  // wwfp a.libjpeg { name = "jpeg"; }
-  // wwfp a.libtiff { name = "tiff"; }
-  // wwfp a.libpng { name = "png"; }
-  // wwfp a.tk { name = "tcltk"; enable.buildInputs = [ a.tcl ]; }
-  // wwfp a.postgresql { name = "postgres"; }
-  // wwf {
-    name = "mysql";
-    enable = {
-      buildInputs = [ a.mysql.lib ];
-      configureFlags = [
-        "--with-mysql-libs=${a.mysql.lib}/lib/mysql"
-        "--with-mysql-includes=${a.mysql.lib}/include/mysql"
-      ];
-    };
-  }
-  // wwfp a.sqlite { name = "sqlite"; }
-  // wwf {
-    name = "ffmpeg";
-    enable = {
-      configureFlags = [
-        "--with-ffmpeg-libs=${a.ffmpeg.out}/lib"
-        "--with-ffmpeg-includes=${a.ffmpeg.dev}/include"
-      ];
-      # is there a nicer way to pass additional include directories?
-      # this should work: --with-ffmpeg-includes=/usr/include/lib[av|sw]*
-      # I did not try
-      preConfigure = ''
-        for dir in ${a.ffmpeg.dev}/include/*; do
-          if [ -d $dir ]; then
-            NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$dir"
-          fi
-        done
-      '';
-      buildInputs = [a.ffmpeg];
-    };
-  }
-  // wwfp a.mesa { name = "opengl"; }
-  // wwfp a.unixODBC { name = "odbc"; }
-  // wwfp a.fftw { name = "fftw"; }
-  // wwf {
-    name = "blas";
-    enable.configureFlags = [ "--with-blas-libs=${a.blas}/lib" ];
-  }
-  // wwf {
-    name = "lapack";
-    enable.configureFlags = [ "--with-lapack-libs=${a.liblapack}/lib" ];
-  }
-  // wwfp a.cairo {
-    name = "cairo";
-    enable.buildInputs = [ a.fontconfig a.libXrender ];
-  }
-  // wwfp a.motif { name = "motif"; }
-  // wwf {
-    name="freetype";
-    enable = {
-      buildInputs = [ a.freetype ];
-      configureFlags = [
-        "--with-freetype-libs=${a.freetype}/lib"
-        "--with-freetype-includes=${a.freetype}/include/freetype2"
-      ];
-    };
-  }
-  // wwfp a.proj { name = "proj"; enable.configureFlags = [ "--with-proj-share=${a.proj}/share"]; }
-  // wwfp a.opendwg { name = "opendwg"; }
-  // edf {
-    name = "largefile";
-  };
-  /* ?
-  // wwf {
-    name = "x";
-    enable.buildInputs = [];
-  };
-  */
-
-  src = a.fetchurl {
-    url = "http://grass.itc.it/grass64/source/grass-6.4.0RC6.tar.gz";
-    sha256 = "043cxa224rd4q1x2mq7sl7ylnxv2vvb4k8laycgcjnp60nzhlmaz";
-  };
-
-  postInstall = ''
-    e=$(echo $out/bin/grass*)
-    mv $out/bin/{,.}$(basename $e)
-    cat >> $e << EOF
-    #!/bin/sh
-    export PATH=${a.python}/bin:\$PATH
-    export GRASS_WISH=\${a.tk}/bin/wish
-    export GRASS_GUI=\''${GRASS_GUI:-wxpython}
-    export SHELL=/bin/sh
-    ${optionalString fix.fixed.cfg.wxwidgetsSupport ''export PYTHONPATH=\$PYTHONPATH\''${PYTHONPATH:+:}:$(toPythonPath ${a.wxPython})''}
-    exec $out/bin/.$(basename $e)
-    EOF
-    chmod +x $e
-  '';
-
-  meta = {
-    description = "free Geographic Information System (GIS) software used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization";
-    homepage = http://grass.itc.it/index.php;
-    license = "GPL";
-    broken = true;
-  };
-
-})
diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix
index b815884a29c..efe7c96b608 100644
--- a/pkgs/applications/misc/hackrf/default.nix
+++ b/pkgs/applications/misc/hackrf/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     description = "An open source SDR platform";
     homepage = http://greatscottgadgets.com/hackrf/;
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = with maintainers; [ sjmackenzie the-kenny ];
   };
 }
diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix
index 3a94456e6cc..52298e6c297 100644
--- a/pkgs/applications/misc/hamster-time-tracker/default.nix
+++ b/pkgs/applications/misc/hamster-time-tracker/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchzip, buildPythonPackage, docbook2x, libxslt, gnome_doc_utils
 , intltool, dbus_glib, pygobject, pygtk, pyxdg, gnome_python, dbus, sqlite3
+, hicolor_icon_theme
 }:
 
 # TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes
@@ -17,7 +18,9 @@ buildPythonPackage rec {
     sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g";
   };
 
-  buildInputs = [ docbook2x libxslt gnome_doc_utils intltool dbus_glib ];
+  buildInputs = [
+    docbook2x libxslt gnome_doc_utils intltool dbus_glib hicolor_icon_theme
+  ];
 
   propagatedBuildInputs = [ pygobject pygtk pyxdg gnome_python dbus sqlite3 ];
 
diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix
new file mode 100644
index 00000000000..1a46b7c7afb
--- /dev/null
+++ b/pkgs/applications/misc/jp2a/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, libjpeg }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.6";
+  name = "jp2a-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/jp2a/${name}.tar.gz";
+    sha256 = "076frk3pa16s4r1b10zgy81vdlz0385zh3ykbnkaij25jn5aqc09";
+  };
+
+  makeFlags = "PREFIX=$(out)";
+
+  buildInputs = [ libjpeg ];
+
+  meta = with stdenv.lib; {
+    homepage = https://csl.name/jp2a/;
+    description = "A small utility that converts JPG images to ASCII.";
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/applications/misc/keybase/default.nix b/pkgs/applications/misc/keybase/default.nix
index fb1c492b48e..dea0e9062df 100644
--- a/pkgs/applications/misc/keybase/default.nix
+++ b/pkgs/applications/misc/keybase/default.nix
@@ -11,11 +11,11 @@ let
 
 in nodePackages.buildNodePackage rec {
   name = "keybase-${version}";
-  version = "0.7.8";
+  version = "0.8.22";
 
   src = [(fetchurl {
     url = "https://github.com/keybase/node-client/archive/v${version}.tar.gz";
-    sha256 = "1ak27bd7jwyss85i7plnfr5al33ykfifqknncyx1ir2r2ldagzc7";
+    sha256 = "1dvwz2iqcybd687hp6zbw6lkpx27vp8ah6kk251147vxvwfjb422";
   })];
 
   deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index f1e2467362c..ac566c9609b 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgs, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "0.6.0";
+  version = "0.6.3";
   name = "khard-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
-    sha256 = "1ag6p416iibwgvijjc8bwyrssxw3s3j559700xfgp10vj0nqk1hb";
+    sha256 = "1dn1v4ycgqbq8vknz1dy710asq8cizxmzaynn69xknwkpgda7fm9";
   };
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/applications/misc/librecad/2.0.nix b/pkgs/applications/misc/librecad/2.0.nix
deleted file mode 100644
index b8419d32fed..00000000000
--- a/pkgs/applications/misc/librecad/2.0.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, qt4, muparser, which, boost, pkgconfig }:
-
-stdenv.mkDerivation {
-  name = "librecad-2.0.7";
-
-  src = fetchurl {
-    url = https://github.com/LibreCAD/LibreCAD/tarball/2.0.7;
-    name = "librecad-2.0.7.tar.gz";
-    sha256 = "0r6d7fk9jl8368rbxzk9rwv0mciw28hlv77z29jf36amc42n6z4d";
-  };
-
-  patchPhase = ''
-    sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh
-    sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp
-  '';
-
-  configurePhase = ''
-    qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost.dev}
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin $out/share
-    cp -R unix/librecad $out/bin
-    cp -R unix/resources $out/share/librecad
-  '';
-
-  buildInputs = [ qt4 muparser which boost ];
-  nativeBuildInputs = [ pkgconfig ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "A 2D CAD package based upon Qt";
-    homepage = http://librecad.org;
-    repositories.git = git://github.com/LibreCAD/LibreCAD.git;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index b2960e9f47d..135291a1490 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -1,20 +1,23 @@
-{ stdenv, fetchurl, qt4, muparser, which}:
+{ stdenv, fetchurl, qt4, muparser, which, boost, pkgconfig }:
 
-stdenv.mkDerivation {
-  name = "librecad-1.0.4";
+stdenv.mkDerivation rec {
+  version = "2.0.8";
+  name = "librecad-${version}";
 
   src = fetchurl {
-    url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.4;
-    name = "librecad-1.0.4.tar.gz";
-    sha256 = "00nzbijw7pn1zkj4256da501xcm6rkcvycpa79y6dr2p6c43yc6m";
+    url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}";
+    name = name + ".tar.gz";
+    sha256 = "110vn1rvzidg8k6ifz1zws2wsn4cd05xl5ha0hbff2ln7izy84zc";
   };
 
   patchPhase = ''
     sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh
-    sed -i -e s,/usr/share,$out/share, src/lib/engine/rs_system.cpp
+    sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp
   '';
 
-  configurePhase = "qmake PREFIX=$out";
+  configurePhase = ''
+    qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost.dev}
+  '';
 
   installPhase = ''
     mkdir -p $out/bin $out/share
@@ -22,11 +25,15 @@ stdenv.mkDerivation {
     cp -R unix/resources $out/share/librecad
   '';
 
-  buildInputs = [ qt4 muparser which ];
+  buildInputs = [ qt4 muparser which boost ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  enableParallelBuilding = true;
 
   meta = {
     description = "A 2D CAD package based upon Qt";
     homepage = http://librecad.org;
+    repositories.git = git://github.com/LibreCAD/LibreCAD.git;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 55de1425787..a7dfac1eb0d 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.77";
+  version = "0.7.79";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0n15z1jlj5s69pwk3mdv4r5c8ncfy7qjbdw5wfwynwypkl5382pn";
+    sha256 = "0qwb3msw9gfzdymlirpvzah0lcszc2p67jg8k5ca2camymnfcvx3";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 5c6f3f9a148..560e0ef1433 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.77";
+  version = "0.7.79";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0n15z1jlj5s69pwk3mdv4r5c8ncfy7qjbdw5wfwynwypkl5382pn";
+    sha256 = "0qwb3msw9gfzdymlirpvzah0lcszc2p67jg8k5ca2camymnfcvx3";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ];
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index 221b459f84a..a270dca910c 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, qt4, boost, proj, gdal_1_11_2}:
+{stdenv, fetchurl, qt4, boost, proj, gdal_1_11}:
 
 stdenv.mkDerivation rec {
   name = "merkaartor-0.18.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     qmake -makefile PREFIX=$out
   '';
 
-  buildInputs = [ qt4 boost proj gdal_1_11_2 ];
+  buildInputs = [ qt4 boost proj gdal_1_11 ];
 
   meta = {
     description = "An openstreetmap editor";
diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix
index d6a0bfcd120..b407c739c70 100644
--- a/pkgs/applications/misc/printrun/default.nix
+++ b/pkgs/applications/misc/printrun/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, python27Packages, fetchgit }:
-let
-  py = python27Packages;
-in
-py.buildPythonPackage rec {
-  name = "printrun";
+{ stdenv, python27Packages, fetchFromGitHub }:
 
-  src = fetchgit {
-    url = "https://github.com/kliment/Printrun";
-    rev = "2299962bb338d3f4335b97211ee609ebaea008f7"; # printrun-20140801
-    sha256 = "19nay7xclm36x56hpm87gw4ca6rnygpqaw5ypbmrz0hyxx140abj";
+python27Packages.buildPythonPackage rec {
+  name = "printrun-20150310";
+
+  src = fetchFromGitHub {
+    owner = "kliment";
+    repo = "Printrun";
+    rev = name;
+    sha256 = "09ijv8h4k5h15swg64s7igamvynawz7gdi7hiymzrzywdvr0zwsa";
   };
 
-  propagatedBuildInputs = with py; [ wxPython30 pyserial dbus psutil
-    numpy pyopengl pyglet cython ];
+  propagatedBuildInputs = with python27Packages; [
+    wxPython30 pyserial dbus psutil numpy pyopengl pyglet cython
+  ];
 
   doCheck = false;
 
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index e768a692f59..39cd5530bf4 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "qtpass-${version}";
-  version = "1.0.1";
+  version = "1.0.4";
 
   src = fetchurl {
     url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz";
-    sha256 = "1mmncvamvwr3hizc1jgpb5kscl9idmrfd2785jhwi87q11wjrwxz";
+    sha256 = "c6bcb1792f22c48844b49c5bd05f3bf5c1c2ebad249246797a273383c9f08f8c";
   };
 
   buildInputs = [ git gnupg makeWrapper pass qt5.base ];
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 454bc48afe9..5899708a682 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchurl, autoconf, automake, pkgconfig
-, libX11, libXinerama, libXft, pango
-, i3Support ? false, i3
+, libX11, libXinerama, libXft, pango, cairo
+, libstartup_notification, i3Support ? false, i3
 }:
 
 stdenv.mkDerivation rec {
   name = "rofi-${version}";
-  version = "0.15.8";
+  version = "0.15.10";
 
   src = fetchurl {
     url = "https://github.com/DaveDavenport/rofi/archive/${version}.tar.gz";
-    sha256 = "1qhj8xrxfnzy16g577w0zxg1cy885rbqydlbbxgfk0dpjvq70lq6";
+    sha256 = "0wwdc9dj8qfmqv4pcllq78h38hqmz9s3hqf71fsk71byiid69ln9";
   };
 
   buildInputs = [ autoconf automake pkgconfig libX11 libXinerama libXft pango
+                  cairo libstartup_notification
                 ] ++ stdenv.lib.optional i3Support i3;
 
   preConfigure = ''
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
index 6a1acca48d9..03a505591b7 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
 
-stdenv.mkDerivation {
-  name = "urxvt-perls-2015-03-28";
+stdenv.mkDerivation rec {
+  name = "urxvt-perls-${version}";
+  version = "2.2";
 
-  src = fetchgit {
-    url = "git://github.com/muennich/urxvt-perls";
-    rev = "e4dbde31edd19e2f4c2b6c91117ee91e2f83ddd7";
-    sha256 = "1f8a27c3d54377fdd4ab0be2f4efb8329d4900bb1c792b306dc23b5ee59260b1";
+  src = fetchFromGitHub {
+    owner = "muennich";
+    repo = "urxvt-perls";
+    rev = version;
+    sha256 = "1cb0jbjmwfy2dlq2ny8wpc04k79jp3pz9qhbmgagsxs3sp1jg2hz";
   };
 
   installPhase = ''
diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
index bfbc66cc0b9..1a5fa03c54c 100644
--- a/pkgs/applications/misc/slic3r/default.nix
+++ b/pkgs/applications/misc/slic3r/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.7";
+  version = "1.2.9";
   name = "slic3r-${version}";
 
   src = fetchgit {
     url = "git://github.com/alexrj/Slic3r";
     rev = "refs/tags/${version}";
-    sha256 = "1bybbl8b0lfh9wkn1k9cxd11hlc5064wzh0fk6zdmc9vnnay399i";
+    sha256 = "1xwl8ay5m6pwrrnhbmnmpwyh4wc8hsi4ldzgq98f4bh6szj6jh4z";
   };
 
   buildInputs = with perlPackages; [ perl makeWrapper which
diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix
index 8086e8ca56d..7dce7c7fbcd 100644
--- a/pkgs/applications/misc/synapse/default.nix
+++ b/pkgs/applications/misc/synapse/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee
-, keybinder3, json_glib, zeitgeist, vala
+, keybinder3, json_glib, zeitgeist, vala, hicolor_icon_theme
 }:
 
 with stdenv.lib;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     intltool pkgconfig glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist 
-    vala
+    vala hicolor_icon_theme
   ];
 
   meta = { 
diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index 7f3ca422323..97acc18211e 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "taskwarrior-${version}";
-  version = "2.4.4";
+  version = "2.5.0";
 
   enableParallelBuilding = true;
 
   src = fetchurl {
     url = "http://www.taskwarrior.org/download/task-${version}.tar.gz";
-    sha256 = "7ff406414e0be480f91981831507ac255297aab33d8246f98dbfd2b1b2df8e3b";
+    sha256 = "0dj66c4pwdmfnzdlm1r23gqim6banycyzvmq266114v9b90ng3jd";
   };
 
   nativeBuildInputs = [ cmake libuuid gnutls ];
diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix
index 6cd2ea4cbeb..43b7312cda6 100644
--- a/pkgs/applications/misc/tilda/default.nix
+++ b/pkgs/applications/misc/tilda/default.nix
@@ -6,11 +6,11 @@
 stdenv.mkDerivation rec {
 
   name = "tilda-${version}";
-  version = "1.2.2";
+  version = "1.2.4";
 
   src = fetchurl {
     url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz";
-    sha256 = "1mzly0llsrxpc2yd1hml3gmwm023my2j3aszjw383pp34dab2nl5";
+    sha256 = "1f7b52c5d8cfd9038ad2e41fc633fce935f420fa657ed15e3942722c8570751e";
   };
 
   buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ];
diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix
index c338a101563..b116a176aed 100644
--- a/pkgs/applications/misc/vue/default.nix
+++ b/pkgs/applications/misc/vue/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "vue-${version}";
-  version = "3.2.2";
+  version = "3.3.0";
   src = fetchurl {
-    url = "releases.atech.tufts.edu/jenkins/job/VUE/64/deployedArtifacts/download/artifact.2";
-    sha256 = "0sb1kgan8fvph2cqfxk3906cwx5wy83zni2vlz4zzi6yg4zvfxld";
+    url = "releases.atech.tufts.edu/jenkins/job/VUE/116/deployedArtifacts/download/artifact.1";
+    sha256 = "0yfzr80pw632lkayg4qfmwzrqk02y30yz8br7isyhmgkswyp5rnx";
   };
 
   phases = "installPhase";
diff --git a/pkgs/applications/misc/wcalc/default.nix b/pkgs/applications/misc/wcalc/default.nix
new file mode 100644
index 00000000000..1c6dc8f63c2
--- /dev/null
+++ b/pkgs/applications/misc/wcalc/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, mpfr, readline }:
+
+stdenv.mkDerivation rec {
+  name = "wcalc-${version}";
+  version = "2.5";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/w-calc/${name}.tar.bz2";
+    sha256 = "1vi8dl6rccqiq1apmpwawyg2ywx6a1ic1d3cvkf2hlwk1z11fb0f";
+  };
+
+  buildInputs = [ mpfr readline ];
+
+  meta = with stdenv.lib; {
+    description = "A command line calculator";
+    homepage = http://w-calc.sourceforge.net;
+    license = licenses.gpl2;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix
new file mode 100644
index 00000000000..91e6c33310d
--- /dev/null
+++ b/pkgs/applications/misc/zscroll/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, lib, python3, python3Packages, fetchFromGitHub }:
+
+let version = "1.0"; in
+
+python3Packages.buildPythonPackage {
+  name = "zscroll-${version}";
+  # don't prefix with python version
+  namePrefix = "";
+
+  src = fetchFromGitHub {
+    owner = "noctuid";
+    repo = "zscroll";
+    rev = "v${version}";
+    sha256 = "0rf9m1czy19hzpcp8dq9c5zawk0nhwfzzjxlhk9r2n06lhb81ig5";
+  };
+
+  doCheck = false;
+
+  propogatedBuildInputs = [ python3 ];
+
+  meta = with stdenv.lib; {
+    description = "A text scroller for use with panels and shells";
+    homepage = https://github.com/noctuid/zscroll;
+    license = licenses.bsd2;
+    platforms = platforms.all;
+  };
+}