From a8464accca62c00b3dc6ea69e6a206577c98b78f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Dec 2023 03:57:00 +0000 Subject: [PATCH 1/2] darktable: 4.4.2 -> 4.6.0 --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index bdf12444b216..538bb8b04e05 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -57,12 +57,12 @@ }: stdenv.mkDerivation rec { - version = "4.4.2"; + version = "4.6.0"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "c11d28434fdf2e9ce572b9b1f9bc4e64dcebf6148e25080b4c32eb51916cfa98"; + sha256 = "sha256-cksn4yBNGCLebcU+oJCmsc5V98MiJtNGQmiXdcaKrMI="; }; nativeBuildInputs = [ cmake ninja llvmPackages_13.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ] From 9270b0b4e0afe5a996bf815b2e81353ac215d751 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 3 Jan 2024 02:45:00 +0100 Subject: [PATCH 2/2] darktable: migrate to llvm 16 --- pkgs/applications/graphics/darktable/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 538bb8b04e05..8983b14cb446 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -10,7 +10,6 @@ , ninja , curl , perl -, llvmPackages_13 , desktop-file-utils , exiv2 , glib @@ -65,9 +64,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-cksn4yBNGCLebcU+oJCmsc5V98MiJtNGQmiXdcaKrMI="; }; - nativeBuildInputs = [ cmake ninja llvmPackages_13.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ] - # LLVM Clang C compiler version 11.1.0 is too old and is unsupported. Version 12+ is required. - ++ lib.optionals stdenv.isDarwin [ llvmPackages_13.clang ]; + nativeBuildInputs = [ cmake ninja llvmPackages.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; buildInputs = [ cairo