Merge branch 'master' into staging

22 files changed, 380 insertions, 254 deletions

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index d86aee50bb90..d4786017a473 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -15,7 +15,11 @@ stdenv.mkDerivation rec {
 
   inherit python;
 
-  patches = stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
+  patches = [
+    # Patch from Debian that switches the version update change from
+    # enabled by default to disabled by default.
+    ./no_updates_dialog.patch
+  ] ++ stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
 
   prePatch = ''
     sed -i "/pyqt_sip_dir/ s:=.*:= '${pyqt5}/share/sip':"  \
diff --git a/pkgs/applications/misc/calibre/no_updates_dialog.patch b/pkgs/applications/misc/calibre/no_updates_dialog.patch
new file mode 100644
index 000000000000..52364f64dac7
--- /dev/null
+++ b/pkgs/applications/misc/calibre/no_updates_dialog.patch
@@ -0,0 +1,16 @@
+# Description: Disable update check by default.
+Index: calibre/src/calibre/gui2/main.py
+===================================================================
+--- calibre.orig/src/calibre/gui2/main.py	2014-02-02 10:41:28.470954623 +0100
++++ calibre/src/calibre/gui2/main.py	2014-02-02 10:41:56.546954247 +0100
+@@ -37,8 +37,8 @@
+                       help=_('Start minimized to system tray.'))
+     parser.add_option('-v', '--verbose', default=0, action='count',
+                       help=_('Ignored, do not use. Present only for legacy reasons'))
+-    parser.add_option('--no-update-check', default=False, action='store_true',
+-            help=_('Do not check for updates'))
++    parser.add_option('--update-check', dest='no_update_check', default=True, action='store_false',
++            help=_('Check for updates'))
+     parser.add_option('--ignore-plugins', default=False, action='store_true',
+             help=_('Ignore custom plugins, useful if you installed a plugin'
+                 ' that is preventing calibre from starting'))
diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix
index 1891c4f21749..ce35593d91d1 100644
--- a/pkgs/applications/misc/dfilemanager/default.nix
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchgit, cmake, file, qtbase, qttools, qtx11extras, solid }:
 
 let
-  version = "git-2015-07-25";
+  version = "git-2016-01-10";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "dfilemanager-${version}";
   src = fetchgit {
     url = "git://git.code.sf.net/p/dfilemanager/code";
-    rev = "99afcde199378eb0d499c49a9e28846c22e27483";
-    sha256 = "1dd21xl24xvxs100j8nzhpaqfqk8srqs92al9c03jmyjlk31s6lf";
+    rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4";
+    sha256 = "1qwhnlcc2j8sr1f3v63sxs3m7q7w1xy6c2jqsnznjgm23b5h3hxd";
   };
 
-  buildInputs = [ cmake qtbase qttools qtx11extras file solid ];
+  buildInputs = [ cmake qtbase qttools file solid ];
 
   cmakeFlags = "-DQT5BUILD=true";
 
diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index dead3b83dcf8..04d3b7874b44 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, bash, jre8 }:
+{ fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }:
 
 stdenv.mkDerivation rec {
   name = "gpsprune-${version}";
@@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ jre8 ];
 
+  desktopItem = makeDesktopItem {
+    name = "gpsprune";
+    exec = "gpsprune";
+    icon = "gpsprune";
+    desktopName = "GpsPrune";
+    genericName = "GPS Data Editor";
+    comment = meta.description;
+    categories = "Education;Geoscience;";
+  };
+
   installPhase = ''
     mkdir -p $out/bin $out/share/java
     cp -v $src $out/share/java/gpsprune.jar
@@ -21,6 +31,11 @@ stdenv.mkDerivation rec {
     exec ${jre8}/bin/java -jar $out/share/java/gpsprune.jar "\$@"
     EOF
     chmod 755 $out/bin/gpsprune
+
+    mkdir -p $out/share/applications
+    cp $desktopItem/share/applications"/"* $out/share/applications
+    mkdir -p $out/share/pixmaps
+    ${unzip}/bin/unzip -p $src tim/prune/gui/images/window_icon_64.png > $out/share/pixmaps/gpsprune.png
   '';
 
   meta = with stdenv.lib; {
@@ -28,5 +43,6 @@ stdenv.mkDerivation rec {
     homepage = http://activityworkshop.net/software/gpsprune/;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.rycee ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/inspectrum/default.nix b/pkgs/applications/misc/inspectrum/default.nix
new file mode 100644
index 000000000000..1736581a30f1
--- /dev/null
+++ b/pkgs/applications/misc/inspectrum/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, fftwFloat, qt5 }:
+
+stdenv.mkDerivation rec {
+  name = "inspectrum-${version}";
+  version = "20160103";
+
+  src = fetchFromGitHub {
+    owner = "miek";
+    repo = "inspectrum";
+    rev = "a60d711b46130d37b7c05074285558cd67a28820";
+    sha256 = "1q7izpyi7c9qszygiaq0zs3swihxlss3n52q7wx2jq97hdi2hmzy";
+  };
+
+  buildInputs = [ pkgconfig cmake qt5.qtbase fftwFloat ];
+  
+  meta = with stdenv.lib; {
+    description = "Tool for analysing captured signals from sdr receivers";
+    homepage = https://github.com/miek/inspectrum;
+    maintainers = with maintainers; [ mog ];
+    platforms = platforms.linux;
+    license = licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/applications/misc/jekyll/Gemfile b/pkgs/applications/misc/jekyll/Gemfile
index 0a5688503cac..060f7e6a1ff0 100644
--- a/pkgs/applications/misc/jekyll/Gemfile
+++ b/pkgs/applications/misc/jekyll/Gemfile
@@ -1,5 +1,4 @@
-source "https://rubygems.org"
-
+source 'https://rubygems.org'
 gem 'jekyll'
 gem 'rdiscount'
 gem 'RedCloth'
diff --git a/pkgs/applications/misc/jekyll/Gemfile.lock b/pkgs/applications/misc/jekyll/Gemfile.lock
index ec81bc703c68..7bd270732dab 100644
--- a/pkgs/applications/misc/jekyll/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/Gemfile.lock
@@ -2,68 +2,34 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    blankslate (2.1.2.4)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    classifier-reborn (2.0.3)
-      fast-stemmer (~> 1.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.9.1.1)
     colorator (0.1)
-    execjs (2.5.2)
-    fast-stemmer (1.0.2)
-    ffi (1.9.8)
-    hitimes (1.2.2)
-    jekyll (2.5.3)
-      classifier-reborn (~> 2.0)
+    ffi (1.9.10)
+    jekyll (3.0.1)
       colorator (~> 0.1)
-      jekyll-coffeescript (~> 1.0)
-      jekyll-gist (~> 1.0)
-      jekyll-paginate (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
-      liquid (~> 2.6.1)
+      liquid (~> 3.0)
       mercenary (~> 0.3.3)
-      pygments.rb (~> 0.6.0)
-      redcarpet (~> 3.1)
+      rouge (~> 1.7)
       safe_yaml (~> 1.0)
-      toml (~> 0.1.0)
-    jekyll-coffeescript (1.0.1)
-      coffee-script (~> 2.2)
-    jekyll-gist (1.2.1)
-    jekyll-paginate (1.1.0)
-    jekyll-sass-converter (1.3.0)
-      sass (~> 3.2)
-    jekyll-watch (1.2.1)
-      listen (~> 2.7)
-    kramdown (1.7.0)
-    liquid (2.6.2)
-    listen (2.10.0)
-      celluloid (~> 0.16.0)
+    jekyll-sass-converter (1.4.0)
+      sass (~> 3.4)
+    jekyll-watch (1.3.0)
+      listen (~> 3.0)
+    kramdown (1.9.0)
+    liquid (3.0.6)
+    listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     mercenary (0.3.5)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    posix-spawn (0.3.11)
-    pygments.rb (0.6.3)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.2.0)
-    rb-fsevent (0.9.4)
+    rb-fsevent (0.9.7)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rdiscount (2.1.8)
-    redcarpet (3.2.3)
+    rouge (1.10.1)
     safe_yaml (1.0.4)
-    sass (3.4.13)
-    timers (4.0.1)
-      hitimes
-    toml (0.1.2)
-      parslet (~> 1.5.0)
-    yajl-ruby (1.2.1)
+    sass (3.4.20)
 
 PLATFORMS
   ruby
diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index e11e7361ffa3..e9536055ca3b 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, lib, bundlerEnv, ruby_2_1, curl }:
+{ stdenv, lib, bundlerEnv, ruby_2_2, curl }:
 
-bundlerEnv {
-  name = "jekyll-2.5.3";
+bundlerEnv rec {
+  name = "jekyll-${version}";
+  version = "3.0.1";
 
-  ruby = ruby_2_1;
+  ruby = ruby_2_2;
   gemfile = ./Gemfile;
   lockfile = ./Gemfile.lock;
   gemset = ./gemset.nix;
diff --git a/pkgs/applications/misc/jekyll/gemset.nix b/pkgs/applications/misc/jekyll/gemset.nix
index f6ad34fcad98..6d45aef5e545 100644
--- a/pkgs/applications/misc/jekyll/gemset.nix
+++ b/pkgs/applications/misc/jekyll/gemset.nix
@@ -6,51 +6,6 @@
       sha256 = "06pahxyrckhgb7alsxwhhlx1ib2xsx33793finj01jk8i054bkxl";
     };
   };
-  "blankslate" = {
-    version = "2.1.2.4";
-    source = {
-      type = "gem";
-      sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx";
-    };
-  };
-  "celluloid" = {
-    version = "0.16.0";
-    source = {
-      type = "gem";
-      sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3";
-    };
-    dependencies = [
-      "timers"
-    ];
-  };
-  "classifier-reborn" = {
-    version = "2.0.3";
-    source = {
-      type = "gem";
-      sha256 = "0vca8jl7nbgzyb7zlvnq9cqgabwjdl59jqlpfkwzv6znkri7cpby";
-    };
-    dependencies = [
-      "fast-stemmer"
-    ];
-  };
-  "coffee-script" = {
-    version = "2.4.1";
-    source = {
-      type = "gem";
-      sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2";
-    };
-    dependencies = [
-      "coffee-script-source"
-      "execjs"
-    ];
-  };
-  "coffee-script-source" = {
-    version = "1.9.1.1";
-    source = {
-      type = "gem";
-      sha256 = "1arfrwyzw4sn7nnaq8jji5sv855rp4c5pvmzkabbdgca0w1cxfq5";
-    };
-  };
   "colorator" = {
     version = "0.1";
     source = {
@@ -58,123 +13,71 @@
       sha256 = "09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs";
     };
   };
-  "execjs" = {
-    version = "2.5.2";
-    source = {
-      type = "gem";
-      sha256 = "0y2193yhcyz9f97m7g3wanvwzdjb08sllrj1g84sgn848j12vyl0";
-    };
-  };
-  "fast-stemmer" = {
-    version = "1.0.2";
-    source = {
-      type = "gem";
-      sha256 = "0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh";
-    };
-  };
   "ffi" = {
-    version = "1.9.8";
-    source = {
-      type = "gem";
-      sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879";
-    };
-  };
-  "hitimes" = {
-    version = "1.2.2";
+    version = "1.9.10";
     source = {
       type = "gem";
-      sha256 = "17y3ggqxl3m6x9gqpgdn39z0pxpmw666d40r39bs7ngdmy680jn4";
+      sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj";
     };
   };
   "jekyll" = {
-    version = "2.5.3";
+    version = "3.0.1";
     source = {
       type = "gem";
-      sha256 = "1ad3d62yd5rxkvn3xls3xmr2wnk8fiickjy27g098hs842wmw22n";
+      sha256 = "107svn6r7pvkg9wwfi4r44d2rqppysjf9zf09h7z1ajsy8k2s65a";
     };
     dependencies = [
-      "classifier-reborn"
       "colorator"
-      "jekyll-coffeescript"
-      "jekyll-gist"
-      "jekyll-paginate"
       "jekyll-sass-converter"
       "jekyll-watch"
       "kramdown"
       "liquid"
       "mercenary"
-      "pygments.rb"
-      "redcarpet"
+      "rouge"
       "safe_yaml"
-      "toml"
-    ];
-  };
-  "jekyll-coffeescript" = {
-    version = "1.0.1";
-    source = {
-      type = "gem";
-      sha256 = "19nkqbaxqbzqbfbi7sgshshj2krp9ap88m9fc5pa6mglb2ypk3hg";
-    };
-    dependencies = [
-      "coffee-script"
     ];
   };
-  "jekyll-gist" = {
-    version = "1.2.1";
-    source = {
-      type = "gem";
-      sha256 = "10hywgdwqafa21nwa5br54wvp4wsr3wnx64v8d81glj5cs17f9bv";
-    };
-  };
-  "jekyll-paginate" = {
-    version = "1.1.0";
-    source = {
-      type = "gem";
-      sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8";
-    };
-  };
   "jekyll-sass-converter" = {
-    version = "1.3.0";
+    version = "1.4.0";
     source = {
       type = "gem";
-      sha256 = "1xqmlr87xmzpalf846gybkbfqkj48y3fva81r7c7175my9p4ykl1";
+      sha256 = "095757w0pg6qh3wlfg1j1mw4fsz7s89ia4zai5f2rhx9yxsvk1d8";
     };
     dependencies = [
       "sass"
     ];
   };
   "jekyll-watch" = {
-    version = "1.2.1";
+    version = "1.3.0";
     source = {
       type = "gem";
-      sha256 = "0p9mc8m4bggsqlq567g1g67z5fvzlm7yyv4l8717l46nq0d52gja";
+      sha256 = "1mqwvrd2hm6ah5zsxqsv2xdp31wl94pl8ybb1q324j79z8pvyarg";
     };
     dependencies = [
       "listen"
     ];
   };
   "kramdown" = {
-    version = "1.7.0";
+    version = "1.9.0";
     source = {
       type = "gem";
-      sha256 = "070r81kz88zw28c8bs5p0p92ymn1nldci2fm1arkas0bnqrd3rna";
+      sha256 = "12sral2xli39mnr4b9m2sxdlgam4ni0a1mkxawc5311z107zj3p0";
     };
   };
   "liquid" = {
-    version = "2.6.2";
+    version = "3.0.6";
     source = {
       type = "gem";
-      sha256 = "1k7lx7szwnz7vv3hqpdb6bgw8p73sa1ss9m1m5h0jaqb9xkqnfzb";
+      sha256 = "033png37ym4jrjz5bi7zb4ic4yxacwvnllm1xxmrnr4swgyyygc2";
     };
   };
   "listen" = {
-    version = "2.10.0";
+    version = "3.0.5";
     source = {
       type = "gem";
-      sha256 = "131pgi5bsqln2kfkp72wpi0dfz5i124758xcl1h3c5gz75j0vg2i";
+      sha256 = "182wd2pkf690ll19lx6zbk01a3rqkk5lwsyin6kwydl7lqxj5z3g";
     };
     dependencies = [
-      "celluloid"
       "rb-fsevent"
       "rb-inotify"
     ];
@@ -186,39 +89,11 @@
       sha256 = "0ls7z086v4xl02g4ia5jhl9s76d22crgmplpmj0c383liwbqi9pb";
     };
   };
-  "parslet" = {
-    version = "1.5.0";
-    source = {
-      type = "gem";
-      sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3";
-    };
-    dependencies = [
-      "blankslate"
-    ];
-  };
-  "posix-spawn" = {
-    version = "0.3.11";
-    source = {
-      type = "gem";
-      sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr";
-    };
-  };
-  "pygments.rb" = {
-    version = "0.6.3";
-    source = {
-      type = "gem";
-      sha256 = "160i761q2z8kandcikf2r5318glgi3pf6b45wa407wacjvz2966i";
-    };
-    dependencies = [
-      "posix-spawn"
-      "yajl-ruby"
-    ];
-  };
   "rb-fsevent" = {
-    version = "0.9.4";
+    version = "0.9.7";
     source = {
       type = "gem";
-      sha256 = "12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7";
+      sha256 = "1xlkflgxngwkd4nyybccgd1japrba4v3kwnp00alikj404clqx4v";
     };
   };
   "rb-inotify" = {
@@ -238,11 +113,11 @@
       sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v";
     };
   };
-  "redcarpet" = {
-    version = "3.2.3";
+  "rouge" = {
+    version = "1.10.1";
     source = {
       type = "gem";
-      sha256 = "0l6zr8wlqb648z202kzi7l9p89b6v4ivdhif5w803l1rrwyzvj0m";
+      sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz";
     };
   };
   "safe_yaml" = {
@@ -253,37 +128,10 @@
     };
   };
   "sass" = {
-    version = "3.4.13";
-    source = {
-      type = "gem";
-      sha256 = "0wxkjm41xr77pnfi06cbwv6vq0ypbni03jpbpskd7rj5b0zr27ig";
-    };
-  };
-  "timers" = {
-    version = "4.0.1";
-    source = {
-      type = "gem";
-      sha256 = "03ahv07wn1f2g3c5843q7sf03a81518lq5624s9f49kbrswa2p7l";
-    };
-    dependencies = [
-      "hitimes"
-    ];
-  };
-  "toml" = {
-    version = "0.1.2";
-    source = {
-      type = "gem";
-      sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v";
-    };
-    dependencies = [
-      "parslet"
-    ];
-  };
-  "yajl-ruby" = {
-    version = "1.2.1";
+    version = "3.4.20";
     source = {
       type = "gem";
-      sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf";
+      sha256 = "04rpdcp258arh2wgdk9shbqnzd6cbbbpi3wpi9a0wby8awgpxmyf";
     };
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 275cc8ff2adb..9bd7bbb4385c 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -1,18 +1,28 @@
-{ fetchurl, stdenv, bash, jre8 }:
+{ fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }:
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "9060";
+  version = "9329";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "0c1q0bs3x1j9wzmb52xnppdyvni4li5khbfja7axn2ml09hqa0j2";
+    sha256 = "084a3pizmz09abn2n7brhx6757bq9k3xq3jy8ip2ifbl2hcrw7pq";
   };
 
   phases = [ "installPhase" ];
 
   buildInputs = [ jre8 ];
 
+  desktopItem = makeDesktopItem {
+    name = "josm";
+    exec = "josm";
+    icon = "josm";
+    desktopName = "JOSM";
+    genericName = "OpenStreetMap Editor";
+    comment = meta.description;
+    categories = "Education;Geoscience;Maps;";
+  };
+
   installPhase = ''
     mkdir -p $out/bin $out/share/java
     cp -v $src $out/share/java/josm.jar
@@ -21,6 +31,11 @@ stdenv.mkDerivation rec {
     exec ${jre8}/bin/java -jar $out/share/java/josm.jar "\$@"
     EOF
     chmod 755 $out/bin/josm
+
+    mkdir -p $out/share/applications
+    cp $desktopItem/share/applications"/"* $out/share/applications
+    mkdir -p $out/share/pixmaps
+    ${unzip}/bin/unzip -p $src images/logo_48x48x32.png > $out/share/pixmaps/josm.png
   '';
 
   meta = with stdenv.lib; {
@@ -28,5 +43,6 @@ stdenv.mkDerivation rec {
     homepage = https://josm.openstreetmap.de/;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.rycee ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/kgocode/default.nix b/pkgs/applications/misc/kgocode/default.nix
index 5e72b02045c7..aa184cbe1a48 100644
--- a/pkgs/applications/misc/kgocode/default.nix
+++ b/pkgs/applications/misc/kgocode/default.nix
@@ -12,7 +12,12 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    description = "a plugin for KTextEditor (Kate, KDevelop, among others) that provides basic code completion for the Go programming language. Uses gocode as completion provider";
+    description = "Go code completion for Kate, KDevelop and others";
+    longDescription = ''
+      A plugin for KTextEditor (Kate, KDevelop, among others) that provides
+      basic code completion for the Go programming language.
+      Uses gocode as completion provider.
+    '';
     homepage    = https://bitbucket.org/lucashnegri/kgocode/overview;
     maintainers = with maintainers; [ qknight ];
     license = licenses.gpl3Plus;
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 9bed20c0c736..687584de553d 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.80";
+  version = "0.7.81";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "12iwiw4vcmyi8l04j540kbqifmr1wnlfw5cway185iqia43s6c10";
+    sha256 = "1aah8y4kqhghqhcfm6ydgf3hj6q05dllfh0m1lbaij0y8yrrwz07";
   };
 
   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 b45bee56de04..50454308fd20 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.80";
+  version = "0.7.81";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "12iwiw4vcmyi8l04j540kbqifmr1wnlfw5cway185iqia43s6c10";
+    sha256 = "1aah8y4kqhghqhcfm6ydgf3hj6q05dllfh0m1lbaij0y8yrrwz07";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ];
diff --git a/pkgs/applications/misc/pt/.bundle/config b/pkgs/applications/misc/pt/.bundle/config
new file mode 100644
index 000000000000..88cb2d529351
--- /dev/null
+++ b/pkgs/applications/misc/pt/.bundle/config
@@ -0,0 +1,2 @@
+---
+BUNDLE_NO_INSTALL: true
diff --git a/pkgs/applications/misc/pt/Gemfile b/pkgs/applications/misc/pt/Gemfile
new file mode 100644
index 000000000000..ed2136ea5b85
--- /dev/null
+++ b/pkgs/applications/misc/pt/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem 'pt'
diff --git a/pkgs/applications/misc/pt/Gemfile.lock b/pkgs/applications/misc/pt/Gemfile.lock
new file mode 100644
index 000000000000..db023c59d7fd
--- /dev/null
+++ b/pkgs/applications/misc/pt/Gemfile.lock
@@ -0,0 +1,45 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (3.2.2)
+    colored (1.2)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    domain_name (0.5.25)
+      unf (>= 0.0.5, < 1.0.0)
+    highline (1.7.8)
+    hirb (0.7.3)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    mime-types (2.99)
+    mini_portile2 (2.0.0)
+    netrc (0.11.0)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri-happymapper (0.5.9)
+      nokogiri (~> 1.5)
+    pivotal-tracker (0.5.13)
+      builder
+      crack
+      nokogiri (>= 1.5.5)
+      nokogiri-happymapper (>= 0.5.4)
+      rest-client (>= 1.8.0)
+    pt (0.7.3)
+      colored (>= 1.2)
+      highline (>= 1.6.1)
+      hirb (>= 0.4.5)
+      pivotal-tracker (>= 0.4.1)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    safe_yaml (1.0.4)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  pt
diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/applications/misc/pt/default.nix
new file mode 100644
index 000000000000..d85a3266bdf8
--- /dev/null
+++ b/pkgs/applications/misc/pt/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, lib, bundlerEnv, ruby }:
+
+bundlerEnv {
+  name = "pt-0.7.3";
+
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  meta = with lib; {
+    description = "Minimalist command-line Pivotal Tracker client";
+    homepage    = http://www.github.com/raul/pt;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ ebzzry ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/misc/pt/gemset.nix b/pkgs/applications/misc/pt/gemset.nix
new file mode 100644
index 000000000000..cde3c386fb5c
--- /dev/null
+++ b/pkgs/applications/misc/pt/gemset.nix
@@ -0,0 +1,164 @@
+{
+  "builder" = {
+    version = "3.2.2";
+    source = {
+      type = "gem";
+      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
+    };
+  };
+  "colored" = {
+    version = "1.2";
+    source = {
+      type = "gem";
+      sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx";
+    };
+  };
+  "crack" = {
+    version = "0.4.3";
+    source = {
+      type = "gem";
+      sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
+    };
+    dependencies = [
+      "safe_yaml"
+    ];
+  };
+  "domain_name" = {
+    version = "0.5.25";
+    source = {
+      type = "gem";
+      sha256 = "16qvfrmcwlzz073aas55mpw2nhyhjcn96s524w0g1wlml242hjav";
+    };
+    dependencies = [
+      "unf"
+    ];
+  };
+  "highline" = {
+    version = "1.7.8";
+    source = {
+      type = "gem";
+      sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
+    };
+  };
+  "hirb" = {
+    version = "0.7.3";
+    source = {
+      type = "gem";
+      sha256 = "0mzch3c2lvmf8gskgzlx6j53d10j42ir6ik2dkrl27sblhy76cji";
+    };
+  };
+  "http-cookie" = {
+    version = "1.0.2";
+    source = {
+      type = "gem";
+      sha256 = "0cz2fdkngs3jc5w32a6xcl511hy03a7zdiy988jk1sf3bf5v3hdw";
+    };
+    dependencies = [
+      "domain_name"
+    ];
+  };
+  "mime-types" = {
+    version = "2.99";
+    source = {
+      type = "gem";
+      sha256 = "1hravghdnk9qbibxb3ggzv7mysl97djh8n0rsswy3ssjaw7cbvf2";
+    };
+  };
+  "mini_portile2" = {
+    version = "2.0.0";
+    source = {
+      type = "gem";
+      sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l";
+    };
+  };
+  "netrc" = {
+    version = "0.11.0";
+    source = {
+      type = "gem";
+      sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
+    };
+  };
+  "nokogiri" = {
+    version = "1.6.7.1";
+    source = {
+      type = "gem";
+      sha256 = "12nwv3lad5k2k73aa1d1xy4x577c143ixks6rs70yp78sinbglk2";
+    };
+    dependencies = [
+      "mini_portile2"
+    ];
+  };
+  "nokogiri-happymapper" = {
+    version = "0.5.9";
+    source = {
+      type = "gem";
+      sha256 = "0xv5crnzxdbd0ykx1ikfg1h0yw0h70lk607x1g45acsb1da97mkq";
+    };
+    dependencies = [
+      "nokogiri"
+    ];
+  };
+  "pivotal-tracker" = {
+    version = "0.5.13";
+    source = {
+      type = "gem";
+      sha256 = "0vxs69qb0k4g62250zbf5x78wpkhpj98clg2j09ncy3s8yklr0pd";
+    };
+    dependencies = [
+      "builder"
+      "crack"
+      "nokogiri"
+      "nokogiri-happymapper"
+      "rest-client"
+    ];
+  };
+  "pt" = {
+    version = "0.7.3";
+    source = {
+      type = "gem";
+      sha256 = "0bf821yf0zq5bhs65wmx339bm771lcnd6dlsljj3dnisjj068dk8";
+    };
+    dependencies = [
+      "colored"
+      "highline"
+      "hirb"
+      "pivotal-tracker"
+    ];
+  };
+  "rest-client" = {
+    version = "1.8.0";
+    source = {
+      type = "gem";
+      sha256 = "1m8z0c4yf6w47iqz6j2p7x1ip4qnnzvhdph9d5fgx081cvjly3p7";
+    };
+    dependencies = [
+      "http-cookie"
+      "mime-types"
+      "netrc"
+    ];
+  };
+  "safe_yaml" = {
+    version = "1.0.4";
+    source = {
+      type = "gem";
+      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
+    };
+  };
+  "unf" = {
+    version = "0.1.4";
+    source = {
+      type = "gem";
+      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+    };
+    dependencies = [
+      "unf_ext"
+    ];
+  };
+  "unf_ext" = {
+    version = "0.0.7.1";
+    source = {
+      type = "gem";
+      sha256 = "0ly2ms6c3irmbr1575ldyh52bz2v0lzzr2gagf0p526k12ld2n5b";
+    };
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 3d45ef6884c4..940aa8eb4bf4 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.5";
+  version = "1.0.6";
 
   src = fetchurl {
     url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz";
-    sha256 = "0c07bd1eb9e5336c0225f891e5b9a9df103f218619cf7ec6311edf654e8db281";
+    sha256 = "ccad9a06e3efa23278fa3e958185bf24fb3800874d8165be4ae6649706a2ab1c";
   };
 
   buildInputs = [ git gnupg makeWrapper pass qtbase qttools ];
diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 5fcb028f0cd9..3c13623af948 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, python, w3m }:
+{ stdenv, fetchurl, buildPythonPackage, python, w3m, file }:
 
 buildPythonPackage rec {
   name = "ranger-1.7.1";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     sha256 = "11nznx2lqv884q9d2if63101prgnjlnan8pcwy550hji2qsn3c7q";
   };
 
-  propagatedBuildInputs = with python.modules; [ curses ];
+  propagatedBuildInputs = [ python.modules.curses file ];
 
   preConfigure = ''
     substituteInPlace ranger/ext/img_display.py \
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 5899708a6825..6d8edec91031 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, autoconf, automake, pkgconfig
-, libX11, libXinerama, libXft, pango, cairo
+, libX11, libXinerama, pango, cairo
 , libstartup_notification, i3Support ? false, i3
 }:
 
 stdenv.mkDerivation rec {
   name = "rofi-${version}";
-  version = "0.15.10";
+  version = "0.15.12";
 
   src = fetchurl {
     url = "https://github.com/DaveDavenport/rofi/archive/${version}.tar.gz";
-    sha256 = "0wwdc9dj8qfmqv4pcllq78h38hqmz9s3hqf71fsk71byiid69ln9";
+    sha256 = "112fgx2awsw1xf1983bmy3jvs33qwyi8qj7j59jqc4gx07nv1rp5";
   };
 
-  buildInputs = [ autoconf automake pkgconfig libX11 libXinerama libXft pango
+  buildInputs = [ autoconf automake pkgconfig libX11 libXinerama pango
                   cairo libstartup_notification
                 ] ++ stdenv.lib.optional i3Support i3;
 
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index c1d74c247cef..d30c2761f73c 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -4,7 +4,7 @@
 
 let
   name = "rxvt-unicode";
-  version = "9.20";
+  version = "9.21";
   n = "${name}-${version}";
 in
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation (rec {
 
   src = fetchurl {
     url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";
-    sha256 = "e73e13fe64b59fd3c8e6e20c00f149d388741f141b8155e4700d3ed40aa94b4e";
+    sha256 = "0swmi308v5yxsddrdhvi4cch88k2bbs2nffpl5j5m2f55gbhw9vm";
   };
 
   buildInputs =