public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/stdenv/generic/default.nix
This commit is contained in:
Eelco Dolstra
2014-11-06 10:16:39 +01:00
parent c964077200 782a12e450
commit 0518ccf5af
232 changed files with 3422 additions and 1035 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/misc/ccache/default.nix
+4 -4
View File
@@ -5,10 +5,10 @@ assert stdenv.isLinux;
let
ccache =
stdenv.mkDerivation {
name = "ccache-3.1.9";
name = "ccache-3.1.10";
src = fetchurl {
url = http://samba.org/ftp/ccache/ccache-3.1.9.tar.gz;
sha256 = "0ixlxqv1xyacwgg0k9b4a6by07c7k75y0xbr8dp76jvyada0c9x2";
url = http://samba.org/ftp/ccache/ccache-3.1.10.tar.gz;
sha256 = "0fzxa45q7wfm63zrak65wh31w7pnsp0k65fxv00cgmf454as4dza";
};
buildInputs = [ zlib ];
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
meta = {
description = "Compiler cache for fast recompilation of C/C++ code";
homepage = http://ccache.samba.org/;
license = "GPL";
license = stdenv.lib.licenses.gpl3Plus;
};
};
in