From ea6a0610bbb600ffd62b29dd8b60cf5c315095ef Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 19 Oct 2026 11:21:17 -0400 Subject: [PATCH 1/3] ccache: 4.14.1 -> 4.14.2 --- pkgs/by-name/cc/ccache/package.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index 7ad5402cb553..f1d8af0626d3 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -12,17 +12,18 @@ xxhash, zstd, bashInteractive, - doctest, - xcodebuild, - makeWrapper, ctestCheckHook, + elfutils, writableTmpDirAsHomeHook, + xcodebuild, + doctest, + makeWrapper, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "ccache"; - version = "4.14.1"; + version = "4.14.2"; src = fetchFromGitHub { owner = "ccache"; @@ -41,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { exit 1 fi ''; - hash = "sha256-Di37jkZ8w0/FOFxFbUUT34HjOoPxUxwoqPJWeVds1Vo="; + hash = "sha256-DGanom9sfn/UoBJAlvyViusZyc+7c9v0UKwIr8IvYrk="; }; outputs = [ @@ -90,6 +91,7 @@ stdenv.mkDerivation (finalAttrs: { # bashInteractive, but not bash. bashInteractive ctestCheckHook + elfutils # eu-elfcmp writableTmpDirAsHomeHook ] ++ lib.optional stdenv.hostPlatform.isDarwin xcodebuild; @@ -98,6 +100,13 @@ stdenv.mkDerivation (finalAttrs: { doctest ]; + # Some tests require running $CC -march=native + # Test artifacts aren't installed to $out, so this shouldn't affect + # reproducibility + preCheck = '' + export NIX_ENFORCE_NO_NATIVE=0 + ''; + disabledTests = [ "test.fileclone" # flaky on hydra, also seems to fail on zfs "test.trim_dir" # flaky on hydra (possibly filesystem-specific?) From 562fabd1c1c1c2f905bdb6adf4ccbea82f93e91c Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 19 Oct 2026 20:26:42 -0400 Subject: [PATCH 2/3] ccache: add versionCheckHook --- pkgs/by-name/cc/ccache/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index f1d8af0626d3..b01ab23e3880 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -14,6 +14,7 @@ bashInteractive, ctestCheckHook, elfutils, + versionCheckHook, writableTmpDirAsHomeHook, xcodebuild, doctest, @@ -92,6 +93,7 @@ stdenv.mkDerivation (finalAttrs: { bashInteractive ctestCheckHook elfutils # eu-elfcmp + versionCheckHook writableTmpDirAsHomeHook ] ++ lib.optional stdenv.hostPlatform.isDarwin xcodebuild; From 260e108bc8b158ecea3f036a49aad90a426b5eee Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 19 Oct 2026 20:43:53 -0400 Subject: [PATCH 3/3] ccache: install docs to separate output --- pkgs/by-name/cc/ccache/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix index b01ab23e3880..685a90b11e97 100644 --- a/pkgs/by-name/cc/ccache/package.nix +++ b/pkgs/by-name/cc/ccache/package.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" + "doc" "man" ];