From 13995fbc6868909bb0fc3a1312b32ba69a7acac7 Mon Sep 17 00:00:00 2001 From: Mica Semrick Date: Sun, 1 Sep 2024 12:04:10 -0700 Subject: [PATCH 1/6] aces-container: init at 1.0.2 --- lib/licenses.nix | 5 ++++ pkgs/by-name/ac/aces-container/package.nix | 31 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/by-name/ac/aces-container/package.nix diff --git a/lib/licenses.nix b/lib/licenses.nix index 333d32deded3c..e009b0655a373 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -92,6 +92,11 @@ lib.mapAttrs mkLicense ({ free = false; }; + ampas = { + spdxId = "AMPAS"; + fullName = "Academy of Motion Picture Arts and Sciences BSD"; + }; + aom = { fullName = "Alliance for Open Media Patent License 1.0"; url = "https://aomedia.org/license/patent-license/"; diff --git a/pkgs/by-name/ac/aces-container/package.nix b/pkgs/by-name/ac/aces-container/package.nix new file mode 100644 index 0000000000000..0295d2ceba24d --- /dev/null +++ b/pkgs/by-name/ac/aces-container/package.nix @@ -0,0 +1,31 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation rec { + pname = "aces-container"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "ampas"; + repo = "aces_container"; + rev = "v${version}"; + hash = "sha256-luMqXqlJ6UzoawEDmbK38lm3GHosaZm/mFJntBF54Y4="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = { + description = "Reference Implementation of SMPTE ST2065-4"; + homepage = "https://github.com/ampas/aces_container"; + license = lib.licenses.ampas; + maintainers = with lib.maintainers; [ paperdigits ]; + mainProgram = "aces-container"; + platforms = lib.platforms.all; + }; +} From 99ee5b80d5b9ca6ce2f9359f371bf96321cc4cb1 Mon Sep 17 00:00:00 2001 From: Mica Semrick Date: Tue, 10 Sep 2024 18:55:35 -0700 Subject: [PATCH 2/6] color-transformation-language: init at 1.5.3 --- .../color-transformation-language/package.nix | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/co/color-transformation-language/package.nix diff --git a/pkgs/by-name/co/color-transformation-language/package.nix b/pkgs/by-name/co/color-transformation-language/package.nix new file mode 100644 index 0000000000000..0568552dc30b2 --- /dev/null +++ b/pkgs/by-name/co/color-transformation-language/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ilmbase, + openexr_3, + libtiff, + aces-container, +}: + +stdenv.mkDerivation rec { + pname = "ctl"; + version = "1.5.3"; + + src = fetchFromGitHub { + owner = "ampas"; + repo = "CTL"; + rev = "ctl-${version}"; + hash = "sha256-jG+38jsPw+4CEAbOG+hudfPBPbZLG+Om7PszkFa6DuI="; + }; + + nativeBuildInputs = [ + cmake + ilmbase + openexr_3 + libtiff + aces-container + ]; + + meta = { + description = "Programming language for digital color management"; + homepage = "https://github.com/ampas/CTL"; + changelog = "https://github.com/ampas/CTL/blob/${src.rev}/CHANGELOG"; + license = lib.licenses.ampas; + maintainers = with lib.maintainers; [ paperdigits ]; + mainProgram = "ctl"; + platforms = lib.platforms.all; + }; +} From 4539588dd5b28ddcae1f39544b9a000abf475e94 Mon Sep 17 00:00:00 2001 From: Mica Semrick Date: Tue, 10 Sep 2024 18:55:50 -0700 Subject: [PATCH 3/6] art: update dependencies. --- pkgs/by-name/ar/art/package.nix | 35 +++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix index 67f9032faebb4..f563ef00b67e6 100644 --- a/pkgs/by-name/ar/art/package.nix +++ b/pkgs/by-name/ar/art/package.nix @@ -3,6 +3,15 @@ , fetchFromBitbucket , cmake , pkg-config +, util-linux +, libselinux +, libsepol +, libthai +, libdatrie +, lerc +, libxkbcommon +, libepoxy +, libXtst , wrapGAppsHook3 , makeWrapper , pixman @@ -11,10 +20,11 @@ , libXau , libXdmcp , lcms2 +, libraw , libiptcdata , fftw , expat -, pcre +, pcre2 , libsigcxx , lensfun , librsvg @@ -22,6 +32,10 @@ , exiv2 , exiftool , mimalloc +, openexr_3 +, ilmbase +, opencolorio +, color-transformation-language }: stdenv.mkDerivation rec { @@ -42,16 +56,26 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + util-linux + libselinux + libsepol + libthai + libdatrie + lerc + libxkbcommon + libepoxy + libXtst pixman libpthreadstubs gtkmm3 libXau libXdmcp lcms2 + libraw libiptcdata fftw expat - pcre + pcre2 libsigcxx lensfun librsvg @@ -59,11 +83,18 @@ stdenv.mkDerivation rec { exiftool libcanberra-gtk3 mimalloc + openexr_3 + ilmbase + opencolorio + color-transformation-language ]; cmakeFlags = [ "-DPROC_TARGET_NUMBER=2" "-DCACHE_NAME_SUFFIX=\"\"" + "-DENABLE_OCIO=True" + "-DENABLE_CTL=1" + "-DCTL_INCLUDE_DIR=${color-transformation-language}/include/CTL" ]; CMAKE_CXX_FLAGS = toString [ From e66e11ce7d0b442eff6fe3c0f3878188dfb42496 Mon Sep 17 00:00:00 2001 From: Mica Date: Tue, 24 Sep 2024 21:20:07 -0700 Subject: [PATCH 4/6] Update pkgs/by-name/ac/aces-container/package.nix Co-authored-by: Connor Baker --- pkgs/by-name/ac/aces-container/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ac/aces-container/package.nix b/pkgs/by-name/ac/aces-container/package.nix index 0295d2ceba24d..0d55b2e74a30c 100644 --- a/pkgs/by-name/ac/aces-container/package.nix +++ b/pkgs/by-name/ac/aces-container/package.nix @@ -5,14 +5,14 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aces-container"; version = "1.0.2"; src = fetchFromGitHub { owner = "ampas"; repo = "aces_container"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-luMqXqlJ6UzoawEDmbK38lm3GHosaZm/mFJntBF54Y4="; }; @@ -28,4 +28,4 @@ stdenv.mkDerivation rec { mainProgram = "aces-container"; platforms = lib.platforms.all; }; -} +}) From 338c0472b7a7ef14ba917227327b5cf7979471c0 Mon Sep 17 00:00:00 2001 From: Mica Date: Tue, 24 Sep 2024 21:20:20 -0700 Subject: [PATCH 5/6] Update pkgs/by-name/co/color-transformation-language/package.nix Co-authored-by: Connor Baker --- pkgs/by-name/co/color-transformation-language/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/color-transformation-language/package.nix b/pkgs/by-name/co/color-transformation-language/package.nix index 0568552dc30b2..cccc877c10dc5 100644 --- a/pkgs/by-name/co/color-transformation-language/package.nix +++ b/pkgs/by-name/co/color-transformation-language/package.nix @@ -9,14 +9,14 @@ aces-container, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ctl"; version = "1.5.3"; src = fetchFromGitHub { owner = "ampas"; repo = "CTL"; - rev = "ctl-${version}"; + rev = "ctl-${finalAttrs.version}"; hash = "sha256-jG+38jsPw+4CEAbOG+hudfPBPbZLG+Om7PszkFa6DuI="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { mainProgram = "ctl"; platforms = lib.platforms.all; }; -} +}) From 7ae28b00b62e5822313a9d9802b50f7786d69495 Mon Sep 17 00:00:00 2001 From: Mica Date: Thu, 26 Sep 2024 17:48:24 -0700 Subject: [PATCH 6/6] Update pkgs/by-name/co/color-transformation-language/package.nix Co-authored-by: Connor Baker --- pkgs/by-name/co/color-transformation-language/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/color-transformation-language/package.nix b/pkgs/by-name/co/color-transformation-language/package.nix index cccc877c10dc5..7fe0b5c661bea 100644 --- a/pkgs/by-name/co/color-transformation-language/package.nix +++ b/pkgs/by-name/co/color-transformation-language/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Programming language for digital color management"; homepage = "https://github.com/ampas/CTL"; - changelog = "https://github.com/ampas/CTL/blob/${src.rev}/CHANGELOG"; + changelog = "https://github.com/ampas/CTL/blob/${finalAttrs.src.rev}/CHANGELOG"; license = lib.licenses.ampas; maintainers = with lib.maintainers; [ paperdigits ]; mainProgram = "ctl";