lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

ccache: update 3.2.2 -> 3.2.3

+8 -42
+8 -6
pkgs/development/tools/misc/ccache/default.nix
··· 1 1 { stdenv, fetchurl, runCommand, gcc, zlib }: 2 2 3 3 let 4 - # TODO: find out if there's harm in just using 'rec' instead. 5 4 name = "ccache-${version}"; 6 - version = "3.2.2"; 7 - sha256 = "1jm0qb3h5sypllaiyj81zp6m009vm50hzjnx994ril94kxlrj3ag"; 5 + version = "3.2.3"; 6 + sha256 = "03k0fvblwqb80zwdgas8a5fjrwvghgsn587wp3lfr0jr8gy1817c"; 8 7 9 8 ccache = 10 9 stdenv.mkDerivation { ··· 13 12 inherit sha256; 14 13 url = "mirror://samba/ccache/${name}.tar.xz"; 15 14 }; 16 - 17 - patches = [ ./test-drop-perl-requirement.patch ]; 18 15 19 16 buildInputs = [ zlib ]; 20 17 18 + postPatch = '' 19 + substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)' 20 + ''; 21 + 21 22 doCheck = true; 22 23 23 24 passthru = { 24 25 # A derivation that provides gcc and g++ commands, but that 25 26 # will end up calling ccache for the given cacheDir 26 - links = extraConfig : (runCommand "ccache-links" { passthru.gcc = gcc; passthru.isGNU = true; } 27 + links = extraConfig: (runCommand "ccache-links" 28 + { passthru.gcc = gcc; passthru.isGNU = true; } 27 29 '' 28 30 mkdir -p $out/bin 29 31 if [ -x "${gcc.cc}/bin/gcc" ]; then
-36
pkgs/development/tools/misc/ccache/test-drop-perl-requirement.patch
··· 1 - Since perl is used in just one place and can easily be replaced by a 2 - little bit of shell, do so. This makes testing on limited systems 3 - easier. 4 - 5 - Signed-off-by: Mike Frysinger <vapier@gentoo.org> 6 - --- 7 - INSTALL.txt | 1 - 8 - test.sh | 2 +- 9 - 2 files changed, 1 insertion(+), 2 deletions(-) 10 - 11 - diff --git a/INSTALL.txt b/INSTALL.txt 12 - index 256beab..f77cbe6 100644 13 - --- a/INSTALL.txt 14 - +++ b/INSTALL.txt 15 - @@ -67,7 +67,6 @@ In addition to the prerequisites mentioned above, you also need: 16 - 17 - To debug and run the performance test suite you'll also need: 18 - 19 - -- Perl (http://www.perl.org/) 20 - - Python (http://www.python.org/) 21 - 22 - Run "./autogen.sh" and then follow the steps mentioned under "Installation" 23 - diff --git a/test.sh b/test.sh 24 - index f14e287..1090649 100755 25 - --- a/test.sh 26 - +++ b/test.sh 27 - @@ -1834,7 +1834,7 @@ prepare_cleanup_test() { 28 - mkdir -p $dir 29 - i=0 30 - while [ $i -lt 10 ]; do 31 - - perl -e 'print "A" x 4017' >$dir/result$i-4017.o 32 - + printf '%4017s' '' | tr ' ' 'A' >$dir/result$i-4017.o 33 - touch $dir/result$i-4017.stderr 34 - touch $dir/result$i-4017.d 35 - if [ $i -gt 5 ]; then 36 - --