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
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
  src = fetchgit {
    inherit rev;
    url = https://github.com/ruediger/VobSub2SRT.git;
-    sha256 = "8e867a021ac529e7607627d5944b95bb9f1378ffabd8837e7a028663a8ce5adf";
+    sha256 = "1rpanrv8bgdh95v2320qbd44xskncvq6y84cbbfc86gw0qxpd9cb";
  };

  buildInputs = [ cmake libtiff pkgconfig ];