Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.

10 files changed, 204 insertions, 4 deletions

diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix
new file mode 100644
index 000000000000..f4a14155d689
--- /dev/null
+++ b/pkgs/tools/system/awstats/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchurl, perlPackages, jdk }:
+
+perlPackages.buildPerlPackage rec {
+  name = "awstats-${version}";
+  version = "7.4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/awstats/${name}.tar.gz";
+    sha256 = "0mdbilsl8g9a84qgyws4pakhqr3mfhs5g5dqbgsn9gn285rzxas3";
+  };
+
+  postPatch = ''
+    substituteInPlace wwwroot/cgi-bin/awstats.pl \
+      --replace /usr/share/awstats/ "$out/wwwroot/cgi-bin/"
+  '';
+
+  outputs = [ "out" "bin" "doc" ];
+
+  buildInputs = with perlPackages; [ ]; # plugins will need some
+
+  preConfigure = ''
+    touch Makefile.PL
+    patchShebangs .
+  '';
+
+  # build our own JAR
+  preBuild = ''
+    (
+      cd wwwroot/classes/src
+      rm ../*.jar
+      PATH="${jdk}/bin" "$(type -P perl)" Makefile.pl
+      test -f ../*.jar
+    )
+  '';
+
+  doCheck = false;
+
+  installPhase = ''
+    mkdir "$out"
+    mv wwwroot "$out/wwwroot"
+    rm -r "$out/wwwroot/classes/src/"
+
+    mkdir -p "$bin/bin"
+    ln -s "$out/wwwroot/cgi-bin/awstats.pl" "$bin/bin/awstats"
+
+    mkdir -p "$doc/share/"
+    mv README.md docs/
+    mv docs "$doc/share/awstats"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Real-time logfile analyzer to get advanced statistics";
+    homepage = http://awstats.org;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index a1d676d708df..5f42e39871a4 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -30,9 +30,9 @@
 , varnish ? null
 , yajl ? null
 }:
-
 stdenv.mkDerivation rec {
-  name = "collectd-5.5.0";
+  version = "5.5.0";
+  name = "collectd-${version}";
 
   src = fetchurl {
     url = "http://collectd.org/files/${name}.tar.bz2";
diff --git a/pkgs/tools/system/foreman/Gemfile b/pkgs/tools/system/foreman/Gemfile
new file mode 100644
index 000000000000..e25e6d790fc0
--- /dev/null
+++ b/pkgs/tools/system/foreman/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "foreman"
diff --git a/pkgs/tools/system/foreman/Gemfile.lock b/pkgs/tools/system/foreman/Gemfile.lock
new file mode 100644
index 000000000000..8fa9a213ab28
--- /dev/null
+++ b/pkgs/tools/system/foreman/Gemfile.lock
@@ -0,0 +1,15 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    foreman (0.78.0)
+      thor (~> 0.19.1)
+    thor (0.19.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  foreman
+
+BUNDLED WITH
+   1.11.2
diff --git a/pkgs/tools/system/foreman/default.nix b/pkgs/tools/system/foreman/default.nix
new file mode 100644
index 000000000000..594947c265a3
--- /dev/null
+++ b/pkgs/tools/system/foreman/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, ruby, bundlerEnv, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "foreman-${env.gems.foreman.version}";
+
+  env = bundlerEnv {
+    inherit ruby;
+    name = "${name}-gems";
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+  };
+
+  phases = ["installPhase"];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${env}/bin/foreman $out/bin/foreman
+  '';
+
+  meta = with lib; {
+    description = "Process manager for applications with multiple components";
+    homepage = https://github.com/ddollar/foreman;
+    license = licenses.mit;
+    maintainers = with maintainers; [ zimbatm ];
+    platforms = ruby.meta.platforms;
+  };
+}
diff --git a/pkgs/tools/system/foreman/gemset.nix b/pkgs/tools/system/foreman/gemset.nix
new file mode 100644
index 000000000000..b35bd15c9749
--- /dev/null
+++ b/pkgs/tools/system/foreman/gemset.nix
@@ -0,0 +1,18 @@
+{
+  thor = {
+    version = "0.19.1";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
+    };
+  };
+  foreman = {
+    version = "0.78.0";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq";
+    };
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix
new file mode 100644
index 000000000000..9301107d2db9
--- /dev/null
+++ b/pkgs/tools/system/htop/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchurl, stdenv, ncurses,
+IOKit }:
+
+stdenv.mkDerivation rec {
+  name = "htop-${version}";
+  version = "2.0.1";
+
+  src = fetchurl {
+    sha256 = "0rjn9ybqx5sav7z4gn18f1q6k23nmqyb6yydfgghzdznz9nn447l";
+    url = "http://hisham.hm/htop/releases/${version}/${name}.tar.gz";
+  };
+
+  buildInputs =
+    [ ncurses ] ++
+    lib.optionals stdenv.isDarwin [ IOKit ];
+
+  meta = with stdenv.lib; {
+    description = "An interactive process viewer for Linux";
+    homepage = https://hisham.hm/htop/;
+    license = licenses.gpl2Plus;
+    platforms = with platforms; linux ++ freebsd ++ openbsd ++ darwin;
+    maintainers = with maintainers; [ rob simons relrod nckx ];
+  };
+}
diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/tools/system/rowhammer-test/default.nix
new file mode 100644
index 000000000000..728b15bb2988
--- /dev/null
+++ b/pkgs/tools/system/rowhammer-test/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  name = "rowhammer-test-20150811";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "rowhammer-test";
+    rev = "c1d2bd9f629281402c10bb10e52bc1f1faf59cc4"; # 2015-08-11
+    sha256 = "1fbfcnm5gjish47wdvikcsgzlb5vnlfqlzzm6mwiw2j5qkq0914i";
+  };
+
+  buildPhase = "sh -e make.sh";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp rowhammer_test double_sided_rowhammer $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Test DRAM for bit flips caused by the rowhammer problem";
+    homepage = https://github.com/google/rowhammer-test;
+    license = licenses.asl20;
+    maintainers = [ maintainers.viric ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix
index ff2fdfefb059..8e65eda8f540 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/pkgs/tools/system/ts/default.nix
@@ -3,7 +3,7 @@ sendmailPath ? "/var/setuid-wrappers/sendmail" }:
 
 stdenv.mkDerivation rec {
 
-  name = "ts-0.7.4";
+  name = "ts-0.7.6";
 
   installPhase=''make install "PREFIX=$out"'';
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://viric.name/~viric/soft/ts/${name}.tar.gz";
-    sha256 = "042r9a09300v4fdrw4r60g5xi25v5m6g12kvvr6pcsm9qnfqyqqs";
+    sha256 = "07b61sx3hqpdxlg5a1xrz9sxww9yqdix3bmr0sm917r3rzk87lwk";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/system/yeshup/default.nix b/pkgs/tools/system/yeshup/default.nix
new file mode 100644
index 000000000000..806d6cc5b945
--- /dev/null
+++ b/pkgs/tools/system/yeshup/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "yeshup-${builtins.substring 0 7 rev}";
+  rev = "5461a8f957c686ccd0240be3f0fd8124d7381b08";
+
+  src = fetchFromGitHub {
+    owner = "RhysU";
+    repo  = "yeshup";
+    inherit rev;
+    sha256 = "1wwbc158y46jsmdi1lp0m3dlbr9kvzvwxfvzj6646cpy9d6h21v9";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -v yeshup $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/RhysU/yeshup;
+    platforms = platforms.all;
+    license = licenses.cc-by-sa-30; # From Stackoverflow answer
+    maintainers = with maintainers; [ obadz ];
+  };
+}