Merge remote-tracking branch 'origin/master' into stdenv-updates

This commit is contained in:
Eelco Dolstra
2013-01-17 14:19:14 +01:00
120 changed files with 2870 additions and 471 deletions
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
name = "libxklavier-5.0";
src = fetchurl {
url = "mirror://sf/gswitchit/${name}.tar.bz2";
url = "mirror://sourceforge/gswitchit/${name}.tar.bz2";
sha256 = "1c2dxinjfpq1lzxi0z46r0j80crbmwb0lkvnh6987cjjlwblpnfz";
};