Merge remote-tracking branch 'origin/staging' into modular-stdenv

Conflicts: pkgs/stdenv/generic/default.nix
2014-08-22 00:07:05 +02:00
parent a8fc68a5c0 773595540b
commit 2c62a36b77
1133 changed files with 11930 additions and 2826 deletions
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, cmake, kdelibs, gettext }:

 stdenv.mkDerivation rec {
-  name = "kdiff3-0.9.97";
+  name = "kdiff3-0.9.98";
  src = fetchurl {
    url = "mirror://sourceforge/kdiff3/${name}.tar.gz";
-    sha256 = "0ajsnzfr0aqzdiv5wqssxsgfv87v4g5c2zl16264v0cw8jxiddz3";
+    sha256 = "0s6n1whkf5ck2r8782a9l8b736cj2p05and1vjjh7d02pax1lb40";
  };

  buildInputs = [ kdelibs ];