Merge remote-tracking branch 'upstream/master' into hardened-stdenv

39 files changed, 434 insertions, 248 deletions

diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix
new file mode 100644
index 000000000000..cee4ec925c01
--- /dev/null
+++ b/pkgs/tools/misc/asciinema/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "asciinema-${version}";
+  version = "20160520-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "6683bdaa263d0ce3645b87fe54aa87276b89988a";
+
+  
+  goPackagePath = "github.com/asciinema/asciinema";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/asciinema/asciinema";
+    sha256 = "08jyvnjpd5jdgyvkly9fswac4p10bqim5v4rhmivpg4y8pbcmxkz";
+  };
+}
diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix
index 2dafaca1961b..eda2bfa0270d 100644
--- a/pkgs/tools/misc/cloc/default.nix
+++ b/pkgs/tools/misc/cloc/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cloc-${version}";
-  version = "1.66";
+  version = "1.68";
 
   src = fetchFromGitHub {
     owner = "AlDanial";
     repo = "cloc";
     rev = "v${version}";
-    sha256 = "1xj6d8x8zwijym5wznm0k1478z7zx3bfjsx20r3aqb1vhkvcjsm9";
+    sha256 = "17n6w7rd17h4q4cnjg4hxcfpx4plp40gd58bdyig9lsfbn6xcjxj";
   };
 
   sourceRoot = "cloc-v${version}-src/Unix";
diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix
index 4b4eb87b0ea7..5657703d3f22 100644
--- a/pkgs/tools/misc/cpuminer-multi/default.nix
+++ b/pkgs/tools/misc/cpuminer-multi/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     inherit rev;
     url = https://github.com/wolf9466/cpuminer-multi.git;
-    sha256 = "9c438c6cd9f40273822f3d3103a370e43e8a40368695ed5e01ae87297dce7843";
+    sha256 = "1lzaiwy2wk9awpzpfnp3d6dymnb4bvgw1vg2433plfqhi9jfdrqj";
   };
 
   buildInputs = [ autoconf automake curl jansson ];
diff --git a/pkgs/tools/misc/ddate/default.nix b/pkgs/tools/misc/ddate/default.nix
index 3626876ae97c..6dedb0b36a5b 100644
--- a/pkgs/tools/misc/ddate/default.nix
+++ b/pkgs/tools/misc/ddate/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = "https://github.com/bo0ts/ddate";
     rev = "refs/tags/v0.2.2";
-    sha256 = "1mv7x8g6ddzspcxghzz5dsxrj0x7bw5hc9yvqbl9va9z7nahwv80";
+    sha256 = "1qchxnxvghbma6gp1g78wnjxsri0b72ha9axyk31cplssl7yn73f";
   };
 
   buildInputs = [ cmake ];
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index 3818b1be1341..b05d21b66c84 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.16.4";
+  version = "2.16.5";
   name = "debian-devscripts-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
-    sha256 = "0hxvxf8fc76lmrf57l9liwx1xjbxk2ldamln8xnwqlg37laxi3v2";
+    sha256 = "0jyg7abfar4rc3zmdzz4k8kk081ll93v508kdnxg30snavri7f02";
   };
 
   buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile 
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index b916b91d5d23..1687c9fffafc 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec {
   src = fetchgit {
     url = "git://anonscm.debian.org/reproducible/diffoscope.git";
     rev = "refs/tags/${version}";
-    sha256 = "1a22abvjs8f8c4anrcfhn02xw7m2gl701b9csxy06c5ymib0npxd";
+    sha256 = "18nqsd51rc0rldyxnjmzn86154asianhv415llhbxpr1a6zwqis6";
   };
 
   patches =
diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix
index e113bd86bac3..ba1abb7c86df 100644
--- a/pkgs/tools/misc/duc/default.nix
+++ b/pkgs/tools/misc/duc/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, tokyocabinet, cairo, pango, ncurses }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, tokyocabinet, cairo, pango, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "duc-${version}";
-  version = "1.3.3";
+  version = "1.4.1";
 
-  src = fetchurl {
-    url = "http://duc.zevv.nl/release/${name}.tar.gz";
-    sha256 = "09mp8cq6s43sfhvms4mwhx3lw51vkaxgg34fbfbimafyjh4jdx3k";
+  src = fetchFromGitHub {
+    owner = "zevv";
+    repo = "duc";
+    rev = "${version}";
+    sha256 = "0rnar2zacsb9rvdmp1a62xixhy69s5vh0nwgrklqxhb19qkzhdp7";
   };
 
-  buildInputs = [ pkgconfig tokyocabinet cairo pango ncurses ];
+  buildInputs = [ autoreconfHook pkgconfig tokyocabinet cairo pango ncurses ];
 
   meta = with stdenv.lib; {
     homepage = http://duc.zevv.nl/;
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index 1726afca0d02..f34c9b6db230 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/execline";
     rev = "refs/tags/v${version}";
-    sha256 = "1k4db9iyskrqf6wbc4dkiqgpn0wb43qc9rf1br7kvy9rrzq3yrj0";
+    sha256 = "01hfh2gmap3qd9qc5ncp1sxagrsi8q6cdjxxspwpmrc4d4cmzcr0";
   };
 
   dontDisableStatic = true;
diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock
index 4f51d365513a..581fa6e169ae 100644
--- a/pkgs/tools/misc/fluentd/Gemfile.lock
+++ b/pkgs/tools/misc/fluentd/Gemfile.lock
@@ -1,45 +1,48 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    cool.io (1.3.0)
-    elasticsearch (1.0.8)
-      elasticsearch-api (= 1.0.7)
-      elasticsearch-transport (= 1.0.7)
-    elasticsearch-api (1.0.7)
+    cool.io (1.4.4)
+    elasticsearch (1.0.17)
+      elasticsearch-api (= 1.0.17)
+      elasticsearch-transport (= 1.0.17)
+    elasticsearch-api (1.0.17)
       multi_json
-    elasticsearch-transport (1.0.7)
+    elasticsearch-transport (1.0.17)
       faraday
       multi_json
-    faraday (0.9.1)
+    excon (0.49.0)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    fluent-plugin-elasticsearch (0.7.0)
+    fluent-plugin-elasticsearch (1.5.0)
       elasticsearch
+      excon
       fluentd (>= 0.10.43)
-      patron (~> 0)
-    fluent-plugin-record-reformer (0.6.0)
+    fluent-plugin-record-reformer (0.8.1)
       fluentd
-    fluentd (0.12.6)
-      cool.io (>= 1.2.2, < 2.0.0)
+    fluentd (0.14.0)
+      cool.io (>= 1.4.3, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
       json (>= 1.4.3)
-      msgpack (>= 0.5.11, < 0.6.0)
+      msgpack (>= 0.7.0)
+      serverengine (>= 1.6.4)
       sigdump (~> 0.2.2)
-      string-scrub (>= 0.0.3)
+      strptime (>= 0.1.7)
       tzinfo (>= 1.0.0)
       tzinfo-data (>= 1.0.0)
       yajl-ruby (~> 1.0)
     http_parser.rb (0.6.0)
-    json (1.8.2)
-    msgpack (0.5.11)
-    multi_json (1.11.0)
+    json (1.8.3)
+    msgpack (0.7.6)
+    multi_json (1.12.1)
     multipart-post (2.0.0)
-    patron (0.4.20)
-    sigdump (0.2.2)
-    string-scrub (0.0.5)
+    serverengine (1.6.4)
+      sigdump (~> 0.2.2)
+    sigdump (0.2.4)
+    strptime (0.1.8)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    tzinfo-data (1.2015.1)
+    tzinfo-data (1.2016.4)
       tzinfo (>= 1.0.0)
     yajl-ruby (1.2.1)
 
@@ -50,3 +53,6 @@ DEPENDENCIES
   fluent-plugin-elasticsearch
   fluent-plugin-record-reformer
   fluentd
+
+BUNDLED WITH
+   1.11.2
diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix
index 1a1871e22da6..4c5de7448409 100644
--- a/pkgs/tools/misc/fluentd/default.nix
+++ b/pkgs/tools/misc/fluentd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, bundlerEnv, ruby, curl }:
 
 bundlerEnv {
-  name = "fluentd-0.12.6";
+  name = "fluentd-0.14.0";
 
   inherit ruby;
   gemfile = ./Gemfile;
diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/tools/misc/fluentd/gemset.nix
index 84577c03587d..e6b03fadfd36 100644
--- a/pkgs/tools/misc/fluentd/gemset.nix
+++ b/pkgs/tools/misc/fluentd/gemset.nix
@@ -1,181 +1,166 @@
 {
   "cool.io" = {
-    version = "1.3.0";
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ycc8qdvpba8bf6da8nsna34md86mk527j4qizxh059vqm3521sb";
       type = "gem";
-      sha256 = "1s3x0a32gbr6sg4lb0yk5irh48z4260my6g5ssifyl54rh4b6lzh";
     };
+    version = "1.4.4";
   };
-  "elasticsearch" = {
-    version = "1.0.8";
+  elasticsearch = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g7vax396l68w5mrrfbsaly39zkc4rrvljz9717mxyn82m5f66w5";
       type = "gem";
-      sha256 = "0kfiza9p98gchqgd0a64ryw77wgy42b7hhy89ba1s2jy2kcm3ahl";
     };
-    dependencies = [
-      "elasticsearch-api"
-      "elasticsearch-transport"
-    ];
+    version = "1.0.17";
   };
-  "elasticsearch-api" = {
-    version = "1.0.7";
+  elasticsearch-api = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08bb63raz381fmspijwjc4ksvrrgavmwrymjms1b9mg4qkic87jx";
       type = "gem";
-      sha256 = "0fb7pmzhfl48zxkbx3ayc61x1gv3qvvs4xcp4yf1rxflz1iw6ck9";
     };
-    dependencies = [
-      "multi_json"
-    ];
+    version = "1.0.17";
   };
-  "elasticsearch-transport" = {
-    version = "1.0.7";
+  elasticsearch-transport = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07r798g3lnzr3zabk2ks2j5jnxdga23bc8wrr7mcqzn8q0yv82bz";
       type = "gem";
-      sha256 = "0p5yzbvgpw84asfj8ifbqckw6qbssc6xrw086qfh58kxpfnin0zc";
     };
-    dependencies = [
-      "faraday"
-      "multi_json"
-    ];
+    version = "1.0.17";
   };
-  "faraday" = {
-    version = "0.9.1";
+  excon = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jmdgc4lhlbxccpg79a32vn3qngqipcaaq8bxa0ivfw5mvz0zc0z";
       type = "gem";
-      sha256 = "1h33znnfzxpscgpq28i9fcqijd61h61zgs3gabpdgqfa1043axsn";
     };
-    dependencies = [
-      "multipart-post"
-    ];
+    version = "0.49.0";
   };
-  "fluent-plugin-elasticsearch" = {
-    version = "0.7.0";
+  faraday = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6";
       type = "gem";
-      sha256 = "1jav4lqf9j3w014ksgl3zr05kg62lkc58xnhjjriqp3c1412vwpy";
     };
-    dependencies = [
-      "elasticsearch"
-      "fluentd"
-      "patron"
-    ];
+    version = "0.9.2";
   };
-  "fluent-plugin-record-reformer" = {
-    version = "0.6.0";
+  fluent-plugin-elasticsearch = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kgv62s51y9x98qk0b6wrg4a73jfbhw50vg5z36hr0bh9rh2rq4y";
       type = "gem";
-      sha256 = "1h43xx7dypbrhdw22c28jsp3054g4imic2wd12rl5nf1k85phfkk";
     };
-    dependencies = [
-      "fluentd"
-    ];
+    version = "1.5.0";
   };
-  "fluentd" = {
-    version = "0.12.6";
+  fluent-plugin-record-reformer = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ca09msvcdgrjv0xdjxh0nhxx8crp3h9nz5qw90c75s5hss2ws9b";
       type = "gem";
-      sha256 = "04lrr133ci6m3j85cj2rhhjkw3b1r12fxcymk943lsdlrip0brr1";
     };
-    dependencies = [
-      "cool.io"
-      "http_parser.rb"
-      "json"
-      "msgpack"
-      "sigdump"
-      "string-scrub"
-      "tzinfo"
-      "tzinfo-data"
-      "yajl-ruby"
-    ];
+    version = "0.8.1";
   };
-  "http_parser.rb" = {
-    version = "0.6.0";
+  fluentd = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v6c8g6fv9s710lrl0jy9ihbb8af37gvw3klk7csr5whp1mhwb8f";
       type = "gem";
-      sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
     };
+    version = "0.14.0";
   };
-  "json" = {
-    version = "1.8.2";
+  "http_parser.rb" = {
     source = {
+      sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
       type = "gem";
-      sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5";
     };
+    version = "0.6.0";
   };
-  "msgpack" = {
-    version = "0.5.11";
+  json = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
       type = "gem";
-      sha256 = "1jmi0i3j8xfvidx6ivbcbdwpyf54r0d7dc4rrq1jbvhd1ffvr79w";
     };
+    version = "1.8.3";
   };
-  "multi_json" = {
-    version = "1.11.0";
+  msgpack = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fn2riiaygiyvmr0glgm1vx995np3jb2hjf5i0j78vncd2wbwdw5";
       type = "gem";
-      sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl";
     };
+    version = "0.7.6";
   };
-  "multipart-post" = {
-    version = "2.0.0";
+  multi_json = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
       type = "gem";
-      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
     };
+    version = "1.12.1";
   };
-  "patron" = {
-    version = "0.4.20";
+  multipart-post = {
     source = {
+      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
       type = "gem";
-      sha256 = "0wdgjazzyllnajkzgdh55q60mlczq8h5jhwpzisrj2i8izrq45zb";
     };
+    version = "2.0.0";
   };
-  "sigdump" = {
-    version = "0.2.2";
+  serverengine = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16sy6yissv8h2vla5ba4msqzsjy0cm0x8q2llssx3kl3bwysrbrp";
       type = "gem";
-      sha256 = "1h4d4vfg1g3wbbmqahmk7khzhswk5mjv4hwbs7bhmp808h8mz973";
     };
+    version = "1.6.4";
   };
-  "string-scrub" = {
-    version = "0.0.5";
+  sigdump = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mqf06iw7rymv54y7rgbmfi6ppddgjjmxzi3hrw658n1amp1gwhb";
       type = "gem";
-      sha256 = "0fy4qby2az268qzmf00mb3p0hiqgshz9g6kvgl5vg76y90hl178g";
     };
+    version = "0.2.4";
   };
-  "thread_safe" = {
-    version = "0.3.5";
+  strptime = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lkadizgdls9ya4sbf3bg5i1z6g2kxfw1r5ja0wkc9711zxjilx2";
       type = "gem";
-      sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr";
     };
+    version = "0.1.8";
   };
-  "tzinfo" = {
-    version = "1.2.2";
+  thread_safe = {
     source = {
+      sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr";
       type = "gem";
-      sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx";
     };
-    dependencies = [
-      "thread_safe"
-    ];
+    version = "0.3.5";
   };
-  "tzinfo-data" = {
-    version = "1.2015.1";
+  tzinfo = {
+    dependencies = ["thread_safe"];
     source = {
+      sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx";
       type = "gem";
-      sha256 = "1x6fa8ayd2kal397d5gdsdg0fjqynfqv1n9n0q702mq839dw593h";
     };
-    dependencies = [
-      "tzinfo"
-    ];
+    version = "1.2.2";
   };
-  "yajl-ruby" = {
-    version = "1.2.1";
+  tzinfo-data = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bxfljd5i7g89s7jc5l4a3ddykfsvvp0gm02805r1q77ahn1gp33";
       type = "gem";
+    };
+    version = "1.2016.4";
+  };
+  yajl-ruby = {
+    source = {
       sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf";
+      type = "gem";
     };
+    version = "1.2.1";
   };
 }
\ No newline at end of file
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
new file mode 100644
index 000000000000..eaf1f1869d6e
--- /dev/null
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "fzf-${version}";
+  version = "0.12.2";
+  rev = "${version}";
+
+  goPackagePath = "github.com/junegunn/fzf";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "junegunn";
+    repo = "fzf";
+    sha256 = "02qqcnijv8z3736iczbx082yizpqk02g5k746k7sdgfkgyxydppk";
+  };
+
+  buildInputs = [ ncurses ];
+
+  goDeps = ./deps.json;
+  
+  patchPhase = ''
+    sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf'|'$bin/bin/fzf'|" plugin/fzf.vim
+    sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim
+  '';
+
+  postInstall= ''
+    cp $src/bin/fzf-tmux $bin/bin
+    mkdir -p $out/share/vim-plugins
+    ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name}
+  '';
+}
diff --git a/pkgs/tools/misc/fzf/deps.json b/pkgs/tools/misc/fzf/deps.json
new file mode 100644
index 000000000000..a856d2d5fa81
--- /dev/null
+++ b/pkgs/tools/misc/fzf/deps.json
@@ -0,0 +1,20 @@
+[
+  {
+    "goPackagePath": "github.com/junegunn/go-runewidth",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/junegunn/go-runewidth",
+      "rev": "63c378b851290989b19ca955468386485f118c65",
+      "sha256": "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d"
+    }
+  },
+  {
+    "goPackagePath": "github.com/junegunn/go-shellwords",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/junegunn/go-shellwords",
+      "rev": "35d512af75e283aae4ca1fc3d44b159ed66189a4",
+      "sha256": "08la0axabk9hiba9mm4ypp6a116qhvdlxa1jvkxhv3d4zpjsp4n7"
+    }
+  }
+]
diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix
new file mode 100644
index 000000000000..6e3fe1223fc4
--- /dev/null
+++ b/pkgs/tools/misc/gawp/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, lib, buildGoPackage, fetchgit }:
+
+with builtins;
+
+buildGoPackage rec {
+  name = "gawp-${version}";
+  version = "20160121-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "5db2d8faa220e8d6eaf8677354bd197bf621ff7f";
+  
+  goPackagePath = "github.com/martingallagher/gawp";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/martingallagher/gawp";
+    sha256 = "0bbmbb1xxdgvqvg1ssn9d4j213li7bbbx3y42iz4fs10xv7x4r0c";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/tools/misc/gawp/deps.json b/pkgs/tools/misc/gawp/deps.json
new file mode 100644
index 000000000000..28b9216ca007
--- /dev/null
+++ b/pkgs/tools/misc/gawp/deps.json
@@ -0,0 +1,10 @@
+[
+    {
+        "include": "../../../../development/go-modules/libs.json",
+        "packages": [
+            "golang.org/x/sys",
+            "gopkg.in/yaml.v2",
+            "gopkg.in/fsnotify.v1"
+        ]
+    }
+]
diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix
index b9310db0ee86..4b352f512082 100644
--- a/pkgs/tools/misc/goaccess/default.nix
+++ b/pkgs/tools/misc/goaccess/default.nix
@@ -1,16 +1,13 @@
 { stdenv, fetchurl, pkgconfig, geoipWithDatabase, ncurses, glib }:
 
-let
-  version = "0.9.4";
-  mainSrc = fetchurl {
-    url = "http://tar.goaccess.io/goaccess-${version}.tar.gz";
-    sha256 = "1kn5yvgzrzjlxd0zhr2d2gbjdin9j9vmfbk5gkrwqc4kd9zicvla";
-  };
-in
-
 stdenv.mkDerivation rec {
+  version = "1.0";
   name = "goaccess-${version}";
-  src = mainSrc;
+
+  src = fetchurl {
+    url = "http://tar.goaccess.io/goaccess-${version}.tar.gz";
+    sha256 = "1zma9p0gwxwl9kgq47i487fy1q8567fqnpik0zacjhgmpnzry3h0";
+  };
 
   configureFlags = [
     "--enable-geoip"
@@ -29,6 +26,6 @@ stdenv.mkDerivation rec {
     homepage    = http://goaccess.prosoftcorp.com;
     license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ ederoyd46 ];
+    maintainers = with stdenv.lib.maintainers; [ ederoyd46 garbas ];
   };
 }
diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index 3613625b3a2f..fc56c58f138c 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.1";
+  version = "2.0.2";
   name = "graylog-${version}";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "0i9nng361qnnws7jnk5m91nj5ifg4h78yayahsfjn37665rsrdga";
+    sha256 = "08w8s33cfk7bi6g8wshqchhl0ayld647wvg4xngclc22d7l94rrm";
   };
 
   dontBuild = true;
diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix
index fc8784decc5f..377d6faefa01 100644
--- a/pkgs/tools/misc/grub/trusted.nix
+++ b/pkgs/tools/misc/grub/trusted.nix
@@ -35,12 +35,12 @@ stdenv.mkDerivation rec {
         then fetchgit {
           url = "https://github.com/Sirrix-AG/TrustedGRUB2";
           rev = "ab483d389bda3115ca0ae4202fd71f2e4a31ad41";
-          sha256 = "4b715837f8632278720d8b29aec06332f5302c6ba78183ced5f48d3c376d89c0";
+          sha256 = "1760d9hsnqkdvlag9nn8f613mqhnsxmidgvdkpmb37b0yi7p6lhz";
         }
         else fetchgit {
           url = "https://github.com/Sirrix-AG/TrustedGRUB2";
           rev = "1ff54a5fbe02ea01df5a7de59b1e0201e08d4f76";
-          sha256 = "8c17bd7e14dd96ae9c4e98723f4e18ec6b21d45ac486ecf771447649829d0b34";
+          sha256 = "0yrfwx67gpg9gij5raq0cfbx3jj769lkg3diqgb7i9n86hgcdh4k";
         };
 
   nativeBuildInputs = [ autogen flex bison python autoconf automake ];
diff --git a/pkgs/tools/misc/gummiboot/default.nix b/pkgs/tools/misc/gummiboot/default.nix
deleted file mode 100644
index 7946a3b062fc..000000000000
--- a/pkgs/tools/misc/gummiboot/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, gnu-efi, unzip, pkgconfig, utillinux, libxslt, docbook_xsl, docbook_xml_dtd_42 }:
-
-stdenv.mkDerivation rec {
-  name = "gummiboot-48";
-
-  buildInputs = [ gnu-efi pkgconfig libxslt utillinux ];
-
-  hardeningDisable = [ "stackprotector" ];
-
-  # Sigh, gummiboot should be able to find this in buildInputs
-  configureFlags = [
-    "--with-efi-includedir=${gnu-efi}/include"
-    "--with-efi-libdir=${gnu-efi}/lib"
-    "--with-efi-ldsdir=${gnu-efi}/lib"
-  ];
-
-  src = fetchurl {
-    url = http://pkgs.fedoraproject.org/repo/pkgs/gummiboot/gummiboot-48.tar.xz/05ef3951e8322b76c31f2fd14efdc185/gummiboot-48.tar.xz;
-    sha256 = "1bzygyglgglhb3aj77w2qcb0dz9sxgb7lq5krxf6417431h198rg";
-  };
-
-  meta = {
-    description = "A simple UEFI boot manager which executes configured EFI images";
-
-    homepage = http://freedesktop.org/wiki/Software/gummiboot;
-
-    license = stdenv.lib.licenses.lgpl21Plus;
-
-    platforms = [ "x86_64-linux" "i686-linux" ];
-  };
-}
diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix
new file mode 100644
index 000000000000..1cda3149bb42
--- /dev/null
+++ b/pkgs/tools/misc/i3cat/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "i3cat-${version}";
+  version = "20150321-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "b9ba886a7c769994ccd8d4627978ef4b51fcf576";
+
+  goPackagePath = "github.com/vincent-petithory/i3cat";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/vincent-petithory/i3cat";
+    sha256 = "1xlm5c9ajdb71985nq7hcsaraq2z06przbl6r4ykvzi8w2lwgv72";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/tools/misc/i3cat/deps.json b/pkgs/tools/misc/i3cat/deps.json
new file mode 100644
index 000000000000..cd4c703aed65
--- /dev/null
+++ b/pkgs/tools/misc/i3cat/deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/vincent-petithory/structfield"
+    ]
+  }
+]
diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix
index e96d38d8dfe0..6ee14a0ce937 100644
--- a/pkgs/tools/misc/ipxe/default.nix
+++ b/pkgs/tools/misc/ipxe/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = git://git.ipxe.org/ipxe.git;
-    sha256 = "22f427df9141a2bbb319b51bdca4f2b7d3a4cbb5d1b2dcb35a43460eac59d305";
+    sha256 = "0wiy3kag6x8a2a71pc9za9izmac8gdz90vaqp2mwgih6p2lz01zq";
     inherit rev;
   };
 
diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index 75e00635320a..910b4963f012 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -1,17 +1,15 @@
-{ stdenv, fetchurl, ncurses }:
+{ stdenv, fetchurl, ncurses, lessSecure ? false }:
 
 stdenv.mkDerivation rec {
-  name = "less-481";
+  name = "less-483";
 
   src = fetchurl {
     url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz";
-    sha256 = "19fxj0h10y5bhr3a1xa7kqvnwl44db3sdypz8jxl1q79yln8z8rz";
+    sha256 = "07z43kwbmba2wh3q1gps09l72p8izfagygmqq1izi50s2h51mfvy";
   };
 
-  # Look for ‘sysless’ in /etc.
-  configureFlags = "--sysconfdir=/etc";
-
-  preConfigure = "chmod +x ./configure";
+  configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc.
+    ++ stdenv.lib.optional lessSecure [ "--with-secure" ];
 
   buildInputs = [ ncurses ];
 
diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix
index 0329581bfaab..cf28fa051326 100644
--- a/pkgs/tools/misc/ltunify/default.nix
+++ b/pkgs/tools/misc/ltunify/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "https://git.lekensteyn.nl/ltunify.git";
     rev = "c3a263ff97bcd31e96abbfed33d066f8d2778f58";
-    sha256 = "0zjw064fl9f73ppl9c37wsfhp6296yx65m1gis2n2ia6arlnh45q";
+    sha256 = "04g7mmljkx8643k53yd9x4k2ndrr98w7fbq10qn8ll6didkph3v8";
   };
 
   makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ];
diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix
index 777fc7bfd16d..2dd90e4bcaf4 100644
--- a/pkgs/tools/misc/mdbtools/git.nix
+++ b/pkgs/tools/misc/mdbtools/git.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = "http://github.com/brianb/mdbtools.git";
     rev = "9ab40e83e6789015c965c92bdb62f92f8cdd0dbd";
-    sha256 = "18j1a9y9xhl7hhx30zvmx2n4w7dc8c7sdr6722sf3mh5230mvv59";
+    sha256 = "0hlf5lk86xm0bpdlpk4a1zyfvbim76dhvmybxga2p7mbb1jc825l";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix
new file mode 100644
index 000000000000..113b8b2b4cec
--- /dev/null
+++ b/pkgs/tools/misc/mongodb-tools/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+let
+  tools = [
+    "bsondump" "mongodump" "mongoexport" "mongofiles" "mongoimport"
+    "mongooplog" "mongorestore" "mongostat" "mongotop"
+  ];
+in
+buildGoPackage rec {
+  name = "mongo-tools-${version}";
+  version = "3.0.12";
+  rev = "r${version}";
+
+  goPackagePath = "github.com/mongodb/mongo-tools";
+  subPackages = map (t: t + "/main") tools;
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "mongodb";
+    repo = "mongo-tools";
+    sha256 = "142vxgniri1mfy2xmfgxhbdp6k6h8c5milv454krv1b51v43hsbm";
+  };
+
+  goDeps = ./deps.json;
+
+  # Mongodb incorrectly names all of their binaries main
+  # Let's work around this with our own installer
+  preInstall = ''
+    mkdir -p $bin/bin
+  '' + toString (map (t: ''
+      go install $goPackagePath/${t}/main
+      mv go/bin/main $bin/bin/${t}
+  ''
+  ) tools) + ''  
+    rm -r go/bin
+  '';
+}
diff --git a/pkgs/tools/misc/mongodb-tools/deps.json b/pkgs/tools/misc/mongodb-tools/deps.json
new file mode 100644
index 000000000000..1489b9e57adb
--- /dev/null
+++ b/pkgs/tools/misc/mongodb-tools/deps.json
@@ -0,0 +1,12 @@
+[
+  {
+    "include": "../../../go-modules/libs.json",
+    "packages": [
+      "github.com/howeyc/gopass",
+      "github.com/jessevdk/go-flags",
+      "golang.org/x/crypto",
+      "gopkg.in/mgo.v2",
+      "gopkg.in/tomb.v2"
+    ]
+  }
+]
diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index d7e529dea9e3..a232028976dc 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "moreutils-${version}";
-  version = "0.58";
+  version = "0.59";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_${version}.orig.tar.gz";
-    sha256 = "02n00vqp6jxbxr5v3rdjxmzp6kxxjdkjgcclam6wrw8qamsbljww";
+    sha256 = "1d6ik3j4lwp90vb93p7yv60k6vk2chz448d1z9xrmxvv371i33m4";
   };
 
   preBuild = ''
diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix
index fd73eecacde1..e111cda9cd1b 100644
--- a/pkgs/tools/misc/opentsdb/default.nix
+++ b/pkgs/tools/misc/opentsdb/default.nix
@@ -2,11 +2,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "opentsdb-${version}";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchurl {
-    url = "https://github.com/OpenTSDB/opentsdb/releases/download/${version}/opentsdb-${version}.tar.gz";
-    sha256 = "17wbdvrv83dr18dqxxsk73c1a7jlbw19algvz0hsz9a1k7aiy29b";
+    url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "1dfzfsagpviqbifz81pik7pzvadz71kls1idi7jiq7z27vcd92an";
   };
 
   buildInputs = [ autoconf automake curl jdk makeWrapper nettools python ];
diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index 3c3f8c864396..e962bcb0155d 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -4,11 +4,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "rmlint-${version}";
-  version = "2.4.2";
+  version = "2.4.4";
 
   src = fetchurl {
     url = "https://github.com/sahib/rmlint/archive/v${version}.tar.gz";
-    sha256 = "0rfgzamrw89z67jxg8b5jqjmvql00304n0ai4a81bfl90gybyncf";
+    sha256 = "1g38wmf58m9lbdngfsbz3dbkd44yqxppzvgi5mwag0w7r7khhir9";
   };
 
   configurePhase = "scons config";
diff --git a/pkgs/tools/misc/sam-ba/default.nix b/pkgs/tools/misc/sam-ba/default.nix
new file mode 100644
index 000000000000..1b7315ebedf6
--- /dev/null
+++ b/pkgs/tools/misc/sam-ba/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchzip, libX11, libXScrnSaver, libXext, libXft, libXrender
+, freetype, zlib, fontconfig
+}:
+
+let
+  maybe64 = if stdenv.isx86_64 then "_64" else "";
+  libPath = stdenv.lib.makeLibraryPath
+    [ stdenv.cc.cc.lib libX11 libXScrnSaver libXext libXft libXrender freetype
+      zlib fontconfig
+    ];
+in
+stdenv.mkDerivation rec {
+  version = "2.16";
+  name = "sam-ba-${version}";
+
+  src = fetchzip {
+    url = "http://www.atmel.com/dyn/resources/prod_documents/sam-ba_${version}_linux.zip";
+    sha256 = "18lsi4747900cazq3bf0a87n3pc7751j5papj9sxarjymcz9vks4";
+  };
+
+  # Pre-built binary package. Install everything to /opt/sam-ba to not mess up
+  # the internal directory structure. Then create wrapper in /bin. Attemts to
+  # use "patchelf --set-rpath" instead of setting LD_PRELOAD_PATH failed.
+  installPhase = ''
+    mkdir -p "$out/bin/" \
+             "$out/opt/sam-ba/"
+    cp -a . "$out/opt/sam-ba/"
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/opt/sam-ba/sam-ba${maybe64}"
+    cat > "$out/bin/sam-ba" << EOF
+    export LD_LIBRARY_PATH="${libPath}"
+    exec "$out/opt/sam-ba/sam-ba${maybe64}"
+    EOF
+    chmod +x "$out/bin/sam-ba"
+  '';
+
+  # Do our own thing
+  dontPatchELF = true;
+
+  meta = with stdenv.lib; {
+    description = "Programming tools for Atmel SAM3/7/9 ARM-based microcontrollers";
+    longDescription = ''
+      Atmel SAM-BA software provides an open set of tools for programming the
+      Atmel SAM3, SAM7 and SAM9 ARM-based microcontrollers.
+    '';
+    homepage = "http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools";
+    # License in <source>/doc/readme.txt
+    license = "BSD-like (partly binary-only)";  # according to Buildroot
+    platforms = [ "i686-linux" "x86_64-linux" ];
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/tools/misc/tmuxinator/Gemfile b/pkgs/tools/misc/tmuxinator/Gemfile
deleted file mode 100644
index 5fa4859adfc1..000000000000
--- a/pkgs/tools/misc/tmuxinator/Gemfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gem 'tmuxinator'
diff --git a/pkgs/tools/misc/tmuxinator/Gemfile.lock b/pkgs/tools/misc/tmuxinator/Gemfile.lock
deleted file mode 100644
index 6f05b475ff2a..000000000000
--- a/pkgs/tools/misc/tmuxinator/Gemfile.lock
+++ /dev/null
@@ -1,14 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    erubis (2.7.0)
-    thor (0.19.1)
-    tmuxinator (0.6.9)
-      erubis (~> 2.6)
-      thor (~> 0.19, >= 0.15.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  tmuxinator
diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix
index f5ac891d8e64..5e8966108661 100644
--- a/pkgs/tools/misc/tmuxinator/default.nix
+++ b/pkgs/tools/misc/tmuxinator/default.nix
@@ -1,12 +1,33 @@
-{ stdenv, lib, bundlerEnv, ruby }:
+{ lib, buildRubyGem, makeWrapper, ruby }:
 
-bundlerEnv {
-  name = "tmuxinator-0.6.9";
+# Cannot use bundleEnv because bundleEnv create stub with
+# BUNDLE_FROZEN='1' environment variable set, which broke everything
+# that rely on Bundler that runs under Tmuxinator.
 
+buildRubyGem rec {
   inherit ruby;
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
+  name = "${gemName}-${version}";
+  gemName = "tmuxinator";
+  version = "0.8.1";
+  sha256 = "1cpmlfa684j9r1hjya70nfcl5lzdbzmbi9hqbs5nhxha97b77qs5";
+
+  erubis = buildRubyGem rec {
+    inherit ruby;
+    name = "ruby${ruby.version}-${gemName}-${version}";
+    gemName = "erubis";
+    version = "2.7.0";
+    sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
+  };
+
+  thor = buildRubyGem rec {
+    inherit ruby;
+    name = "ruby${ruby.version}-${gemName}-${version}";
+    gemName = "thor";
+    version = "0.19.1";
+    sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
+  };
+
+  propagatedBuildInputs = [ erubis thor ];
 
   meta = with lib; {
     description = "Manage complex tmux sessions easily";
@@ -15,4 +36,4 @@ bundlerEnv {
     maintainers = with maintainers; [ auntie ];
     platforms   = platforms.unix;
   };
-}
+}
\ No newline at end of file
diff --git a/pkgs/tools/misc/tmuxinator/gemset.nix b/pkgs/tools/misc/tmuxinator/gemset.nix
deleted file mode 100644
index 1b5b1605c4cc..000000000000
--- a/pkgs/tools/misc/tmuxinator/gemset.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "erubis" = {
-    version = "2.7.0";
-    source = {
-      type = "gem";
-      sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
-    };
-  };
-  "thor" = {
-    version = "0.19.1";
-    source = {
-      type = "gem";
-      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
-    };
-  };
-  "tmuxinator" = {
-    version = "0.6.9";
-    source = {
-      type = "gem";
-      sha256 = "0q0ld82dznjsan7ciblfsxz59brcc16fwmvr9n3c7vdcndj8rd27";
-    };
-    dependencies = [
-      "erubis"
-      "thor"
-    ];
-  };
-}
\ No newline at end of file
diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix
new file mode 100644
index 000000000000..d02e2865c8f5
--- /dev/null
+++ b/pkgs/tools/misc/upower-notify/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+# To use upower-notify, the maintainer suggests adding something like this to your configuration.nix:
+#
+# service.xserver.displayManager.sessionCommands = ''
+#   ${pkgs.dunst}/bin/dunst -shrink -geometry 0x0-50-50 -key space & # ...if don't already have a dbus notification display app
+#   (sleep 3; exec ${pkgs.yeshup}/bin/yeshup ${pkgs.go-upower-notify}/bin/upower-notify) &
+# '';
+buildGoPackage rec {
+  name = "upower-notify-${version}";
+  version = "20160310-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "14c581e683a7e90ec9fa6d409413c16599a5323c";
+  
+  goPackagePath = "github.com/omeid/upower-notify";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/omeid/upower-notify";
+    sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/tools/misc/upower-notify/deps.json b/pkgs/tools/misc/upower-notify/deps.json
new file mode 100644
index 000000000000..3a254084ae36
--- /dev/null
+++ b/pkgs/tools/misc/upower-notify/deps.json
@@ -0,0 +1,8 @@
+[
+  {
+    "include": "../../../go-modules/libs.json",
+    "packages": [
+      "github.com/godbus/dbus"
+    ]
+  }
+]
diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix
index 93a2707d1e98..56d16fbd9055 100644
--- a/pkgs/tools/misc/xburst-tools/default.nix
+++ b/pkgs/tools/misc/xburst-tools/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = git://projects.qi-hardware.com/xburst-tools.git;
     rev = "c71ce8e15db25fe49ce8702917cb17720882e341";
-    sha256 = "abe4c4591183f2bc5ca6363451d1cd7d966c080b4f5bfb0fedf7e9a4f70267a4";
+    sha256 = "1hzdngs1l5ivvwnxjwzc246am6w1mj1aidcf0awh9yw0crzcjnjr";
   };
 
   preConfigure = ''
diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix
index b0395b83e7db..cf6890cf2572 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = "git://oss.sgi.com/xfs/cmds/xfstests.git";
     rev = "dfe582dd396f16ddce1909baab7376e00af07792";
-    sha256 = "0hbgccmhcxn5nm87nq13kpi3rcbjadlj65kd03bfjqxhm4gx732q";
+    sha256 = "1pvqzw4f0r63lzhcw2lii72bp4dwqd50xshv8ch7v529z0f5icwa";
   };
 
   buildInputs = [ acl autoreconfHook attr gawk libaio libuuid libxfs openssl perl ];