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 {
  src = fetchgit {
    url = git://github.com/MeanEYE/Disk-Indicator.git;
    rev = "51ef4afd8141b8d0659cbc7dc62189c56ae9c2da";
-    sha256 = "0f8mxl3wqlap8zajdk6r9liliayp8w4xs4jy8jbwanmmppwz0nb9";
+    sha256 = "10jx6mx9qarn21p2l2jayxkn1gmqhvck1wymgsr4jmbwxl8ra5kd";
  };

  buildInputs = [ libX11 ];