From 2944aeb2c64d9e8eb060e14ae1762e208c53b3bb Mon Sep 17 00:00:00 2001 From: Nano Twerpus Date: Fri, 31 May 2024 06:11:31 -0400 Subject: [PATCH] ccache: 4.9.1 -> 4.10 Dependencies now necessary to compile `ccache` added: `doctest`, `fmt`, `hiredis`, `xxHash`. --- pkgs/by-name/cc/ccache/package.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index 393857f1fe4d..5ac81019e111 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -5,23 +5,27 @@ , binutils , asciidoctor , cmake +, doctest +, fmt +, hiredis , perl , zstd , bashInteractive , xcodebuild +, xxHash , makeWrapper , nix-update-script }: stdenv.mkDerivation (finalAttrs: { pname = "ccache"; - version = "4.9.1"; + version = "4.10"; src = fetchFromGitHub { owner = "ccache"; repo = "ccache"; rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-n0MTq8x6KNkgwhJQG7F+e3iCOS644nLkMsiRztJe8QU="; + sha256 = "sha256-0T9iJXnDX8LffhB/5hsfBNyZQ211f0lL/7dvTrjmiE0="; }; outputs = [ "out" "man" ]; @@ -39,14 +43,11 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + strictDeps = true; nativeBuildInputs = [ asciidoctor cmake perl ]; - buildInputs = [ zstd ]; + buildInputs = [ fmt hiredis xxHash zstd ]; - cmakeFlags = [ - # Build system does not autodetect redis library presence. - # Requires explicit flag. - "-DREDIS_STORAGE_BACKEND=OFF" - ]; + cmakeFlags = lib.optional (!finalAttrs.finalPackage.doCheck) "-DENABLE_TESTING=OFF"; doCheck = true; nativeCheckInputs = [ @@ -55,6 +56,10 @@ stdenv.mkDerivation (finalAttrs: { bashInteractive ] ++ lib.optional stdenv.isDarwin xcodebuild; + checkInputs = [ + doctest + ]; + checkPhase = let badTests = [