From 75ecd2e41549e6aa5492a0ba89c3b3d56caf6d8f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 11 May 2015 14:56:41 +0200 Subject: [PATCH] ccache 3.2.1 -> 3.2.2 New features and improvements: - Added support for "CCACHE_COMPILERCHECK=string:". This is a faster alternative to "CCACHE_COMPILERCHECK=" if the command's output can be precalculated by the build system. - Add support for caching code coverage results (compiling for gcov). Bug fixes: - Fixed bug which could result in false cache hits when source code contains '"' followed by " /*" or " //" (with variations). - Made hash of cached result created with and without "CCACHE_CPP2" different. This makes it possible to rebuild with "CCACHE_CPP2" set without having to clear the cache to get new results. - Don't try to reset a non-existing stats file. This avoids "No such file or directory" messages in the ccache log when the cache directory doesn't exist. - Fixed a bug where ccache deleted clang diagnostics after compiler failures. - Avoid performing an unnecessary copy of the object file on a cache miss. - Bail out on too hard compiler option "-fmodules". - Bail out on too hard compiler option "-fplugin=libcc1plugin" (interaction with GDB). - Fixed build error when compiling ccache with recent clang versions. - Removed signal-unsafe code from signal handler. - Corrected logic for when to output cached stderr. - Wipe the whole cached result on failure retrieving a cached file. - Fixed build error when compiling ccache with recent clang versions. --- pkgs/development/tools/misc/ccache/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 7c0cfa51cd7..b0a8e1b3e2c 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,12 +1,16 @@ {stdenv, fetchurl, runCommand, gcc, zlib}: let + name = "ccache-${version}"; + version = "3.2.2"; + sha256 = "1jm0qb3h5sypllaiyj81zp6m009vm50hzjnx994ril94kxlrj3ag"; + ccache = stdenv.mkDerivation { - name = "ccache-3.2.1"; + inherit name; src = fetchurl { - url = mirror://samba/ccache/ccache-3.2.1.tar.xz; - sha256 = "17dxb0adha2bqzb2r8rcc3kl9mk7y6vrvlh181liivrc3m7g6al7"; + inherit sha256; + url = "mirror://samba/ccache/${name}.tar.xz"; }; buildInputs = [ zlib ]; @@ -37,8 +41,10 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { + inherit version; description = "Compiler cache for fast recompilation of C/C++ code"; homepage = http://ccache.samba.org/; + downloadPage = https://ccache.samba.org/download.html; license = with licenses; gpl3Plus; maintainers = with maintainers; [ nckx ]; };