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

2016-06-10 09:27:04 +00:00
parent 2a5e64b69c 656c48f141
commit 8031cba2ab
1116 changed files with 79612 additions and 24052 deletions
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {

  src = fetchgit {
    url = "git://github.com/UpstandingHackers/hammer";
-    sha256 = "18bb0p896ch4crhcfxpbvpc17wg8gzv8696pcc51i34mza76jiz9";
+    sha256 = "01l0wbhz7dymxlndacin2vi8sqwjlw81ds2i9xyi200w51nsdm38";
    rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533";
  };