ccache: 4.3 -> 4.4 (#135527)
Added `test.trim_dir` to exclude list on Darwin as reported by @r-burns.
This commit is contained in:
parent
638bf9a0b2
commit
0cc67d775f
@ -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
|
||||
'';
|
||||
|
@ -13438,9 +13438,7 @@ with pkgs;
|
||||
|
||||
cc-tool = callPackage ../development/embedded/cc-tool { };
|
||||
|
||||
ccache = callPackage ../development/tools/misc/ccache {
|
||||
asciidoc = asciidoc-full;
|
||||
};
|
||||
ccache = callPackage ../development/tools/misc/ccache { };
|
||||
|
||||
# Wrapper that works as gcc or g++
|
||||
# It can be used by setting in nixpkgs config like this, for example:
|
||||
|
Loading…
Reference in New Issue
Block a user