ccache: 4.6.3 -> 4.7

+8 -12
+2 -2
pkgs/development/tools/misc/ccache/default.nix
··· 15 16 let ccache = stdenv.mkDerivation rec { 17 pname = "ccache"; 18 - version = "4.6.3"; 19 20 src = fetchFromGitHub { 21 owner = pname; 22 repo = pname; 23 rev = "v${version}"; 24 - sha256 = "sha256-uMGM3YW85wgJFin9IGrKafOkSLmN5/q/LP1sttN7/u0="; 25 }; 26 27 outputs = [ "out" "man" ];
··· 15 16 let ccache = stdenv.mkDerivation rec { 17 pname = "ccache"; 18 + version = "4.7"; 19 20 src = fetchFromGitHub { 21 owner = pname; 22 repo = pname; 23 rev = "v${version}"; 24 + sha256 = "sha256-Aqk8ukynXHXHieaI/5K5Wfh5ghpe1yfNtZHeXs7kn1I="; 25 }; 26 27 outputs = [ "out" "man" ];
+6 -10
pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch
··· 1 - diff --git a/test/run b/test/run 2 - index 9623e49d..3df1c5a8 100755 3 --- a/test/run 4 +++ b/test/run 5 - @@ -126,23 +126,17 @@ file_size() { 6 objdump_cmd() { 7 local file="$1" 8 ··· 22 objdump_grep_cmd() { 23 - if $HOST_OS_APPLE; then 24 - fgrep -q "\"$1\"" 25 - - else 26 - - fgrep -q ": $1" 27 - - fi 28 - + fgrep -q ": $1" 29 - } 30 - 31 - expect_stat() {
··· 1 --- a/test/run 2 +++ b/test/run 3 + @@ -148,21 +148,17 @@ file_size() { 4 objdump_cmd() { 5 local file="$1" 6 ··· 20 objdump_grep_cmd() { 21 - if $HOST_OS_APPLE; then 22 - fgrep -q "\"$1\"" 23 + - elif $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then 24 + + if $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then 25 + fgrep -q "$1" 26 + else 27 + fgrep -q ": $1"