Merge 'master' into staging

(relatively simple conflicts)

11 files changed, 126 insertions, 90 deletions

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index e01490782715..80d9d2d98efb 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -26,11 +26,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "collectd-5.4.1";
+  name = "collectd-5.4.2";
 
   src = fetchurl {
     url = "http://collectd.org/files/${name}.tar.bz2";
-    sha256 = "1q365zx6d1wyhv7n97bagfxqnqbhj2j14zz552nhmjviy8lj2ibm";
+    sha256 = "14z3qkqbmfjvqvcb2v17480f7c8j7wa49myk0zlxpd9qq40fk2cp";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index c408c0f34ea8..5d6e322faccc 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -1,15 +1,25 @@
-{ stdenv, fetchgit, libaio }:
+{ stdenv, fetchFromGitHub, libaio, zlib }:
+
+let version = "2.2.7"; in
 
 stdenv.mkDerivation rec {
-  name = "fio-2.0.8";
-  
-  src = fetchgit {
-    url = git://git.kernel.dk/fio.git;
-    rev = "cf9a74c8bd63d9db5256f1362885c740e11a1fe5";
-    sha256 = "b34de480bbbb9cde221d0c4557ead91790feb825a1e31c4013e222ee7f43e937";
+  name = "fio-${version}";
+
+  src = fetchFromGitHub {
+    owner = "axboe";
+    repo = "fio";
+    rev = "fio-${version}";
+    sha256 = "02k528n97xp1ly3d0mdn0lgwqlpn49b644696m75kcr0hn07382v";
   };
-  
-  buildInputs = [ libaio ];
+
+  buildInputs = [ libaio zlib ];
+
+  enableParallelBuilding = true;
+
+  configurePhase = ''
+    substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio
+    ./configure
+  '';
 
   installPhase = ''
     make install prefix=$out
diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix
new file mode 100644
index 000000000000..baaa97b4b243
--- /dev/null
+++ b/pkgs/tools/system/foremost/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl }:
+
+let version = "1.5.7"; in
+stdenv.mkDerivation rec {
+  name = "foremost-${version}";
+
+  src = fetchurl {
+    sha256 = "0d2zxw0ijg8cd3ksgm8cf8jg128zr5x7z779jar90g9f47pm882h";
+    url = "http://foremost.sourceforge.net/pkg/${name}.tar.gz";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Recover files based on their contents";
+    longDescription = ''
+      Foremost is a console program to recover files based on their headers,
+      footers, and internal data structures. Foremost can work on image files, such
+      as those generated by dd, Safeback, Encase, etc, or directly on a drive.
+      The headers and footers can be specified by a configuration file or you can
+      use command line switches to specify built-in file types. These built-in types
+      look at the data structures of a given file format allowing for a more
+      reliable and faster recovery.
+    '';
+    homepage = http://foremost.sourceforge.net/;
+    license = with licenses; publicDomain;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  patches = [ ./makefile.patch ];
+
+  makeFlags = "PREFIX=$(out)";
+
+  enableParallelBuilding = true;
+
+  preInstall = ''
+    mkdir -p $out/{bin,share/man/man8}
+  '';
+}
diff --git a/pkgs/tools/system/foremost/makefile.patch b/pkgs/tools/system/foremost/makefile.patch
new file mode 100644
index 000000000000..6626c9520ec1
--- /dev/null
+++ b/pkgs/tools/system/foremost/makefile.patch
@@ -0,0 +1,23 @@
+--- a/Makefile	2015-04-21 00:40:46.949266581 +0200
++++ b/Makefile	2015-04-21 00:41:38.637165883 +0200
+@@ -24,9 +24,9 @@
+ RAW_FLAGS += -DVERSION=\"$(VERSION)\"
+ 
+ # Where we get installed
+-BIN = /usr/local/bin
+-MAN = /usr/share/man/man8
+-CONF= /usr/local/etc
++BIN = $(PREFIX)/bin
++MAN = $(PREFIX)/share/man/man8
++CONF= $(PREFIX)/etc
+ # Setup for compiling and cross-compiling for Windows
+ # The CR_ prefix refers to cross compiling from OSX to Windows
+ CR_CC = $(CR_BASE)/gcc
+@@ -120,7 +120,6 @@
+ install: goals
+ 	install -m 755 $(NAME) $(BIN)
+ 	install -m 444 $(MAN_PAGES) $(MAN)
+-	install -m 444 foremost.conf $(CONF)
+ macinstall: BIN = /usr/local/bin/
+ macinstall: MAN = /usr/share/man/man1/
+ macinstall: CONF = /usr/local/etc/
diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix
index 1c231e90db49..6bf2a995a24c 100644
--- a/pkgs/tools/system/honcho/default.nix
+++ b/pkgs/tools/system/honcho/default.nix
@@ -22,7 +22,7 @@ let honcho = buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "A Python clone of Foreman, a tool for managing Procfile-based applications.";
     license = licenses.mit;
-    homePage = https://github.com/nickstenning/honcho;
+    homepage = https://github.com/nickstenning/honcho;
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix
index 932b68197ce6..54721f7ce73d 100644
--- a/pkgs/tools/system/ioping/default.nix
+++ b/pkgs/tools/system/ioping/default.nix
@@ -1,47 +1,20 @@
-x@{builderDefsPackage
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="ioping";
-    version = "0.9";
-    name="${baseName}-${version}";
-    url="https://docs.google.com/uc?id=0B_PlDc2qaehFWWtLZ3Z3N1ltdm8&export=download";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    name = "${sourceInfo.name}.tar.gz";
+stdenv.mkDerivation rec {
+  name = "ioping-${version}";
+  version = "0.9";
+  src = fetchurl {
+    url = "https://github.com/koct9i/ioping/releases/download/v${version}/${name}.tar.gz";
     sha256 = "0pbp7b3304y9yyv2w41l3898h5q8w77hnnnq1vz8qz4qfl4467lm";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  makeFlags = "PREFIX=$(out)";
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doMakeInstall"];
-  makeFlags = [
-    ''PREFIX="$out"''
-  ];
-      
-  meta = {
-    description = "Filesystem IO delay time measurer";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.gpl3Plus;
-    homepage = "http://code.google.com/p/ioping/";
-    inherit version;
+  meta = with stdenv.lib; {
+    description = "Disk I/O latency measuring tool";
+    maintainers = with maintainers; [ raskin ];
+    platforms = with platforms; unix;
+    license = licenses.gpl3Plus;
+    homepage = https://github.com/koct9i/ioping;
   };
-}) x
-
+}
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 32f48eb7e141..a9fdcf6fa64d 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libestr, json_c, zlib, pythonPackages
-, krb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null
+, krb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null
 , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null
 , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null
 , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
@@ -11,19 +11,19 @@ let
   mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
 in
 stdenv.mkDerivation rec {
-  name = "rsyslog-8.8.0";
+  name = "rsyslog-8.9.0";
 
   src = fetchurl {
     url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz";
-    sha256 = "1sx0j5icp172rzcpybjpfw53aj34w8j7k3f1ga0pmbv58r3pwyhl";
+    sha256 = "1p3saxfs723479rbsdyvqwfrblcp0bw6mkz2ncrxvnccfn70xc7a";
   };
 
   buildInputs = [
     pkgconfig libestr json_c zlib pythonPackages.docutils
-    krb5 jemalloc postgresql libdbi net_snmp libuuid curl gnutls
+    krb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls
     libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka
     libmongo-client czmq rabbitmq-c hiredis
-  ] ++ stdenv.lib.optional stdenv.isLinux systemd ++ stdenv.lib.optional (mysql != null) mysql.lib;
+  ] ++ stdenv.lib.optional stdenv.isLinux systemd;
 
   configureFlags = [
     "--sysconfdir=/etc"
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     (mkFlag (jemalloc != null)        "jemalloc")
     (mkFlag true                      "unlimited-select")
     (mkFlag true                      "usertools")
-    (mkFlag (mysql != null)           "mysql")
+    (mkFlag (libmysql != null)        "mysql")
     (mkFlag (postgresql != null)      "pgsql")
     (mkFlag (libdbi != null)          "libdbi")
     (mkFlag (net_snmp != null)        "snmp")
diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix
index 28a0fa52d277..28c68f52aaf6 100644
--- a/pkgs/tools/system/runit/default.nix
+++ b/pkgs/tools/system/runit/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "UNIX init scheme with service supervision";
     license = licenses.bsd3;
-    homePage = "http://smarden.org/runit";
+    homepage = "http://smarden.org/runit";
     maintainers = with maintainers; [ rickynils ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index 46cbde74a032..a65213839c8c 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, attr }:
 
-let version = "0.03.20"; in
+let version = "0.03.22"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "0j1nppja56cgsd7vg3465y9kbxy3hl8mbyzc254qqm4z9ij1m3dg";
+    sha256 = "0byhaqw332894vg4rkc8mwxyzh6ggx4l7qnzzk1m3b2j52m908mn";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 
+  buildInputs = [ attr ];
+
   patchPhase = ''
     substituteInPlace Makefile --replace "/usr" ""
   '';
@@ -18,6 +20,7 @@ stdenv.mkDerivation rec {
   installFlags = [ "DESTDIR=$(out)" ];
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Stress test a computer system";
     longDescription = ''
       Stress test a system in various selectable ways, exercising both various
diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix
index 3b19c711410c..62f7280a54ae 100644
--- a/pkgs/tools/system/suid-chroot/default.nix
+++ b/pkgs/tools/system/suid-chroot/default.nix
@@ -1,34 +1,22 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl }:
+
+let version = "1.0.2"; in
+stdenv.mkDerivation rec {
+  name = "suid-chroot-${version}";
 
-  version = a.lib.attrByPath ["version"] "1.0.1" a; 
-  buildInputs = with a; [
-    
-  ];
-in
-rec {
   src = fetchurl {
-    url = "http://myweb.tiscali.co.uk/scottrix/linux/download/suid-chroot-${version}.tar.bz2";
-    sha256 = "15gs09md4lyym47ipzffm1ws8jkg028x0cgwxxs9qkdqbl5zb777";
+    sha256 = "1a9xqhck0ikn8kfjk338h9v1yjn113gd83q0c50k78xa68xrnxjx";
+    url = "http://myweb.tiscali.co.uk/scottrix/linux/download/${name}.tar.bz2";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["replacePaths" "doMakeInstall"];
-
-  installFlags = "PREFIX=$out";
+  postPatch = ''
+    substituteInPlace Makefile --replace /usr $out
+  '';
 
-  replacePaths = a.fullDepEntry (''
-    sed -e "s@/usr/@$out/@g" -i Makefile
-  '') ["minInit" "doUnpack"];
-      
-  name = "suid-chroot-" + version;
-  meta = {
+  meta = with stdenv.lib; {
+    inherit version;
     description = "Setuid-safe wrapper for chroot";
-    maintainers = [
-    ];
+    license = with licenses; gpl2Plus;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index 63850454b3df..c513e475e580 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   meta = {
     description = "";
     license = stdenv.lib.licenses.gpl3;
-    homePage = "http://thinkfan.sourceforge.net/";
+    homepage = "http://thinkfan.sourceforge.net/";
     maintainers = with stdenv.lib.maintainers; [ iElectric ];
     platforms = stdenv.lib.platforms.linux;
   };