From 52bec72f73a93c00726fed60c1364dfb6e4d4760 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 22 Jan 2022 22:10:20 +0100 Subject: [PATCH 1/2] licenses: add Alliance for Open Media Patent License 1.0 --- lib/licenses.nix | 5 +++++ pkgs/tools/video/svt-av1/default.nix | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index d305001a5c19..160b684330ef 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -67,6 +67,11 @@ in mkLicense lset) ({ free = false; }; + aom = { + fullName = "Alliance for Open Media Patent License 1.0"; + url = "https://aomedia.org/license/patent-license/"; + }; + apsl20 = { spdxId = "APSL-2.0"; fullName = "Apple Public Source License 2.0"; diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index fd572fabae3e..f040284dd6cc 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -26,11 +26,8 @@ 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/"; - } ]; platforms = platforms.unix; broken = stdenv.isAarch64; # undefined reference to `cpuinfo_arm_linux_init' From 7d1e58dff20c72844866e18bfaf1a1af9d9c47c9 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 22 Jan 2022 22:07:23 +0100 Subject: [PATCH 2/2] svt-av1: 0.8.7 -> 0.9.0 --- pkgs/tools/video/svt-av1/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index f040284dd6cc..b094e223031f 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 ]; @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { license = with licenses; [ aom bsd2 + bsd3 ]; platforms = platforms.unix; broken = stdenv.isAarch64; # undefined reference to `cpuinfo_arm_linux_init'