nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 11:53:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

ccache: 4.6.3 -> 4.7

Browse Source
This commit is contained in:
Ryan Burns 2022-10-17 21:38:11 -07:00
parent 88eab1e431
commit e56980b08c
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/misc/ccache/default.nix
View File

@ -15,13 +15,13 @@
let ccache = stdenv.mkDerivation rec {
pname = "ccache";
version = "4.6.3";
version = "4.7";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-uMGM3YW85wgJFin9IGrKafOkSLmN5/q/LP1sttN7/u0=";
sha256 = "sha256-Aqk8ukynXHXHieaI/5K5Wfh5ghpe1yfNtZHeXs7kn1I=";
};
outputs = [ "out" "man" ];

16
pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch
View File

@ -1,8 +1,6 @@
diff --git a/test/run b/test/run
index 9623e49d..3df1c5a8 100755
--- a/test/run
+++ b/test/run
@@ -126,23 +126,17 @@ file_size() {
@@ -148,21 +148,17 @@ file_size() {
objdump_cmd() {
local file="$1"
@ -22,10 +20,8 @@ index 9623e49d..3df1c5a8 100755
objdump_grep_cmd() {
- if $HOST_OS_APPLE; then
- fgrep -q "\"$1\""
- else
- fgrep -q ": $1"
- fi
+ fgrep -q ": $1"
}
expect_stat() {
- elif $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then
+ if $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then
fgrep -q "$1"
else
fgrep -q ": $1"