about summary refs log tree commit diff
path: root/pkgs/applications/video
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2019-07-06 13:40:38 +0200
committerVladimír Čunát <v@cunat.cz>2019-07-06 13:44:40 +0200
commit0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4 (patch)
tree146620da711f1221bbc226b5ffa36407b50a3fc3 /pkgs/applications/video
parent8e97d0be6bf0b381935e3b8429430d645dc2e226 (diff)
parentd567c486ca5ac5f0c83bb0264c325204a479a5bb (diff)
downloadnixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar
nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.gz
nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.bz2
nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.lz
nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.xz
nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.zst
nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.zip
Merge branch 'master' into staging-next
There are several thousand rebuilds from master already.
Hydra nixpkgs: ?compare=1528940
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r--pkgs/applications/video/mkvtoolnix/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index a3d7512a2f6e..c13bf3480d25 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   pname = "mkvtoolnix";
-  version = "34.0.0";
+  version = "35.0.0";
 
   src = fetchFromGitLab {
     owner  = "mbunkus";
     repo   = "mkvtoolnix";
     rev    = "release-${version}";
-    sha256 = "189d23zqrk12w778x0cxp2mmc6gj9psb556ihkgs3r48jvs89sm6";
+    sha256 = "163msz6l1d5vwirr1c6cm820kwxcjinwh91svf8ddg5181nwhmrx";
   };
 
   nativeBuildInputs = [