diff options
| author | adisbladis <adis@blad.is> | 2018-01-27 18:08:15 +0800 |
|---|---|---|
| committer | adisbladis <adis@blad.is> | 2018-01-28 06:51:28 +0800 |
| commit | 92d790117d89d8a417e9ce4e1a3414c89f53a259 (patch) | |
| tree | 66791c813e44cabf5ec95b6619e24f9d6c497e31 /pkgs/development/tools/misc/ccache | |
| parent | 74ebb70f89fa8857e05f974016cd76e8a40398fd (diff) | |
| download | nixpkgs-92d790117d89d8a417e9ce4e1a3414c89f53a259.tar nixpkgs-92d790117d89d8a417e9ce4e1a3414c89f53a259.tar.gz nixpkgs-92d790117d89d8a417e9ce4e1a3414c89f53a259.tar.bz2 nixpkgs-92d790117d89d8a417e9ce4e1a3414c89f53a259.tar.lz nixpkgs-92d790117d89d8a417e9ce4e1a3414c89f53a259.tar.xz nixpkgs-92d790117d89d8a417e9ce4e1a3414c89f53a259.tar.zst nixpkgs-92d790117d89d8a417e9ce4e1a3414c89f53a259.zip | |
ccache: 3.3.4 -> 3.3.5
Diffstat (limited to 'pkgs/development/tools/misc/ccache')
| -rw-r--r-- | pkgs/development/tools/misc/ccache/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch | 31 |
2 files changed, 9 insertions, 26 deletions
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 88556d7395d..ff4ad83b642 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -2,10 +2,10 @@ let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; - version = "3.3.4"; + version = "3.3.5"; src = fetchurl { - sha256 = "0ks0vk408mdppfbk8v38p46fqx3p30r9a9cwiia43373i7rmpw94"; + sha256 = "1iih5d171rq29366c1z90dri2h8173yyc8rm2740wxiqx6k7c18r"; url = "mirror://samba/ccache/${name}.tar.xz"; }; diff --git a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch index ecd3c4c9a74..3bc3a95e420 100644 --- a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch +++ b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch @@ -1,9 +1,9 @@ ---- ccache-3.3.4.org/test.sh 2017-02-17 21:28:53.000000000 +0000 -+++ ccache-3.3.4/test.sh 2017-07-01 18:38:00.523403023 +0100 -@@ -2631,23 +2631,23 @@ +--- a/test.sh ++++ b/test.sh +@@ -2669,23 +2669,6 @@ SUITE_cleanup() { + $CCACHE -F 0 -M 256K >/dev/null - $CCACHE -c >/dev/null - # floor(0.8 * 4) = 3 + CCACHE_LOGFILE=/tmp/foo $CCACHE -c >/dev/null - expect_file_count 3 '*.o' $CCACHE_DIR - expect_file_count 3 '*.d' $CCACHE_DIR - expect_file_count 3 '*.stderr' $CCACHE_DIR @@ -21,23 +21,6 @@ - test_failed "File $file not removed when it should" - fi - done -+ #expect_file_count 3 '*.o' $CCACHE_DIR -+ #expect_file_count 3 '*.d' $CCACHE_DIR -+ #expect_file_count 3 '*.stderr' $CCACHE_DIR -+ #expect_stat 'files in cache' 9 -+ #expect_stat 'cleanups performed' 1 -+ #for i in 3 4 5; do -+ # file=$CCACHE_DIR/a/result$i-4017.o -+ # if [ ! -f $file ]; then -+ # test_failed "File $file removed when it shouldn't" -+ # fi -+ #done -+ #for i in 0 1 2 6 7 8 9; do -+ # file=$CCACHE_DIR/a/result$i-4017.o -+ # if [ -f $file ]; then -+ # test_failed "File $file not removed when it should" -+ # fi -+ #done - + # ------------------------------------------------------------------------- - TEST "Automatic cache cleanup" + TEST "Automatic cache cleanup, limit_multiple 0.9" |