diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-01-24 15:39:34 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-01-24 15:39:34 +0000 |
| commit | 1a60dd2adc7bc997efabc11274fc2d8f772731ae (patch) | |
| tree | 604b7796977b9dc0a3b9ed7f29ede0bbee0a277b /pkgs/tools/video | |
| parent | c0398d7617c0dee8fc7fde2101f3b3c8cef4e1c2 (diff) | |
| parent | 2f14e11f3a545130409c520909a64b86e92f737d (diff) | |
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts: pkgs/development/python-modules/cupy/default.nix pkgs/development/python-modules/staticjinja/default.nix
Diffstat (limited to 'pkgs/tools/video')
| -rw-r--r-- | pkgs/tools/video/svt-av1/default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index fd572fabae3ef..b094e223031f5 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "svt-av1"; - version = "0.8.7"; + version = "0.9.0"; src = fetchFromGitLab { owner = "AOMediaCodec"; repo = "SVT-AV1"; rev = "v${version}"; - sha256 = "1xlxb6kn6hqz9dxz0nd905m4i2mwjwq1330rbabwzmg4b66cdslg"; + sha256 = "sha256-kmFyJ5b0EiesWUN71rbULF2cQt2pICF0P/MeZ+h7W9U="; }; nativeBuildInputs = [ cmake nasm ]; @@ -26,11 +26,9 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; changelog = "https://gitlab.com/AOMediaCodec/SVT-AV1/-/blob/v${version}/CHANGELOG.md"; license = with licenses; [ + aom bsd2 - { - fullName = "Alliance for Open Media Patent License 1.0"; - url = "https://aomedia.org/license/patent-license/"; - } + bsd3 ]; platforms = platforms.unix; broken = stdenv.isAarch64; # undefined reference to `cpuinfo_arm_linux_init' |