diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 01:47:08 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-10-03 01:47:08 +0200 |
| commit | b3fcd9375d89060979ce67d13c6714ebc3e1c002 (patch) | |
| tree | e5120c8684e77b7b579c5fd348915cecdca66c57 /pkgs/applications/video | |
| parent | 3a4658ea04d66e849aa29c1f747ab8becc14949c (diff) | |
| parent | 3dc58eda52ef935313cd0418264abd1d30d6b4d3 (diff) | |
| download | nixpkgs-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar nixpkgs-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.gz nixpkgs-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.bz2 nixpkgs-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.lz nixpkgs-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.xz nixpkgs-b3fcd9375d89060979ce67d13c6714ebc3e1c002.tar.zst nixpkgs-b3fcd9375d89060979ce67d13c6714ebc3e1c002.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/obs-studio/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/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 5e7cf9353b2..72aa59571bf 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -37,13 +37,13 @@ let optional = stdenv.lib.optional; in mkDerivation rec { pname = "obs-studio"; - version = "23.2.1"; + version = "24.0.1"; src = fetchFromGitHub { owner = "jp9000"; repo = "obs-studio"; rev = version; - sha256 = "05brixq2z98mvn1q2rgdl27xj798509nv8yh6h0yzqyk9gly4anz"; + sha256 = "056s0hs1ds3c57sc0gy39dxaxvwlakl3w25jxgawh0fs99211ar5"; }; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index e33610ac416..b5ffdb018ff 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.1.1"; + version = "1.2.0"; pname = "streamlink"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = version; - sha256 = "1vyf0pifdqygg98azdkfhy5fdckb0w2ca7c46mkrj452gkvmcq33"; + sha256 = "0l8b9ipfmd6dic07ajqqml26jdydz0k046hvx32mqp64jl5jpznh"; }; checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; |