diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-11-30 19:45:46 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-11-30 19:45:46 +0100 |
| commit | 55a72926e1dee9cdb12036143899d7dfd5acb0b7 (patch) | |
| tree | 934a3dad30806121ab54f36d183e21861a695ced /pkgs/applications/video | |
| parent | ec7f139ad8ad92e0cbc0cd7e588c39d2bdab87c8 (diff) | |
| parent | a69ad18da9aa6a77b18986cc1f97b7bf6df44f08 (diff) | |
| download | nixpkgs-55a72926e1dee9cdb12036143899d7dfd5acb0b7.tar nixpkgs-55a72926e1dee9cdb12036143899d7dfd5acb0b7.tar.gz nixpkgs-55a72926e1dee9cdb12036143899d7dfd5acb0b7.tar.bz2 nixpkgs-55a72926e1dee9cdb12036143899d7dfd5acb0b7.tar.lz nixpkgs-55a72926e1dee9cdb12036143899d7dfd5acb0b7.tar.xz nixpkgs-55a72926e1dee9cdb12036143899d7dfd5acb0b7.tar.zst nixpkgs-55a72926e1dee9cdb12036143899d7dfd5acb0b7.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/mkvtoolnix/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/video/streamlink/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 153d0a20b6e..cef7ea1bf3c 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "38.0.0"; + version = "40.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0874rfslglywpa8ilhqv59zvn2hisdsbwd7r61psf5rd64v72ym4"; + sha256 = "103rvj6f6nlzybzbkqix7q5f2017bmzsn9z5g7bwnjjwgih5mrpq"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index b5ffdb018ff..ce22d8bed27 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,14 +1,14 @@ { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: pythonPackages.buildPythonApplication rec { - version = "1.2.0"; + version = "1.3.0"; pname = "streamlink"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = version; - sha256 = "0l8b9ipfmd6dic07ajqqml26jdydz0k046hvx32mqp64jl5jpznh"; + sha256 = "0f4qwwa5pxd4igvxq1qadqpphazlbs3c3cr29ybks2x5wajrvwah"; }; checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; |