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

3 files changed, 110 insertions, 0 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/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/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 ];
+  };
+}