Merge remote-tracking branch 'master' into stdenv-updates.

Conflicts:
	pkgs/applications/version-management/git-and-tools/git/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Peter Simons
2013-07-30 11:29:30 +02:00
543 changed files with 11729 additions and 9102 deletions
+1 -1
View File
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "ctl-1.4.1";
src = fetchurl {
url = http://surfnet.dl.sourceforge.net/sourceforge/ampasctl/ctl-1.4.1.tar.gz;
url = mirror://sourceforge/ampasctl/ctl-1.4.1.tar.gz;
sha256 = "16lzgbpxdyhykdwndj1i9vx3h4bfkxqqcrvasvgg70gb5raxj0mj";
};