public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #92049 from r-ryantm/auto-update/libvmaf 

libvmaf: 1.5.1 -> 1.5.2
This commit is contained in:
Ryan Mulligan 2020-07-02 21:42:45 -07:00 committed by GitHub
parent a25f75c390 f02b4c2e84
commit 73019d65bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/licenses.nix
View File

@ -95,6 +95,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
fullName = ''BSD 2-clause "Simplified" License''; fullName = ''BSD 2-clause "Simplified" License'';
}; };
bsd2Patent = spdx {
spdxId = "BSD-2-Clause-Patent";
fullName = ''BSD-2-Clause Plus Patent License'';
};
bsd3 = spdx { bsd3 = spdx {
spdxId = "BSD-3-Clause"; spdxId = "BSD-3-Clause";
fullName = ''BSD 3-clause "New" or "Revised" License''; fullName = ''BSD 3-clause "New" or "Revised" License'';

6
pkgs/development/libraries/libvmaf/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libvmaf"; pname = "libvmaf";
version = "1.5.1"; version = "1.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "netflix"; owner = "netflix";
repo = "vmaf"; repo = "vmaf";
rev = "v${version}"; rev = "v${version}";
sha256 = "10fw53k9k4aq4p2qi5qkfjfnhldw4p5bbmxggf8220gfa95nvyl3"; sha256 = "18w0z3w90fdbzsqaa4diwvq0xmvg0aiw4hi3aaa4pq0zgnb8g3mk";
}; };
sourceRoot = "source/libvmaf"; sourceRoot = "source/libvmaf";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/Netflix/vmaf"; homepage = "https://github.com/Netflix/vmaf";
description = "Perceptual video quality assessment based on multi-method fusion (VMAF)"; description = "Perceptual video quality assessment based on multi-method fusion (VMAF)";
platforms = platforms.unix; platforms = platforms.unix;
license = licenses.asl20; license = licenses.bsd2Patent;
maintainers = [ maintainers.cfsmp3 maintainers.marsam ]; maintainers = [ maintainers.cfsmp3 maintainers.marsam ];
}; };