diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2021-08-25 02:02:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-24 21:02:32 -0400 |
commit | 0cc67d775fba1af56eea9420c81e524f94376564 (patch) | |
tree | 2c4d04e2527c6f3c2b28e050e596d2ff6f8c57cb /pkgs/development/tools/misc/ccache | |
parent | 638bf9a0b27d04860379aeffc0ebd9d6238d3dff (diff) | |
download | nixpkgs-0cc67d775fba1af56eea9420c81e524f94376564.tar nixpkgs-0cc67d775fba1af56eea9420c81e524f94376564.tar.gz nixpkgs-0cc67d775fba1af56eea9420c81e524f94376564.tar.bz2 nixpkgs-0cc67d775fba1af56eea9420c81e524f94376564.tar.lz nixpkgs-0cc67d775fba1af56eea9420c81e524f94376564.tar.xz nixpkgs-0cc67d775fba1af56eea9420c81e524f94376564.tar.zst nixpkgs-0cc67d775fba1af56eea9420c81e524f94376564.zip |
ccache: 4.3 -> 4.4 (#135527)
Added `test.trim_dir` to exclude list on Darwin as reported by @r-burns.
Diffstat (limited to 'pkgs/development/tools/misc/ccache')
-rw-r--r-- | pkgs/development/tools/misc/ccache/default.nix | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 909a160c7ee..3b1b54e6547 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,10 +1,9 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , substituteAll , binutils -, asciidoc +, asciidoctor , cmake , perl , zstd @@ -15,13 +14,13 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.3"; + version = "4.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-ZBxDTMUZiZJLIYbvACTFwvlss+IZiMjiL0khfM5hFCM="; + hash = "sha256-ZewR1srksfKCxehhAg3i8m+0OvmOSF+24njbtcc1GQY="; }; outputs = [ "out" "man" ]; @@ -35,16 +34,17 @@ let ccache = stdenv.mkDerivation rec { src = ./force-objdump-on-darwin.patch; objdump = "${binutils.bintools}/bin/objdump"; }) - # Fix clang C++ modules test (remove in next release) - (fetchpatch { - url = "https://github.com/ccache/ccache/commit/8b0c783ffc77d29a3e3520345b776a5c496fd892.patch"; - sha256 = "13qllx0qhfrdila6bdij9lk74fhkm3vdj01zgq1ri6ffrv9lqrla"; - }) ]; - nativeBuildInputs = [ asciidoc cmake perl ]; + nativeBuildInputs = [ asciidoctor cmake perl ]; buildInputs = [ zstd ]; + cmakeFlags = [ + # Build system does not autodetect redis library presence. + # Requires explicit flag. + "-DREDIS_STORAGE_BACKEND=OFF" + ]; + doCheck = true; checkInputs = [ # test/run requires the compgen function which is available in @@ -56,7 +56,7 @@ let ccache = stdenv.mkDerivation rec { runHook preCheck export HOME=$(mktemp -d) ctest --output-on-failure ${lib.optionalString stdenv.isDarwin '' - -E '^(test.nocpp2|test.basedir|test.multi_arch)$' + -E '^(test.nocpp2|test.basedir|test.multi_arch|test.trim_dir)$' ''} runHook postCheck ''; |