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

2013-01-17 14:19:14 +01:00
parent b4dd943f16 3544f32231
commit 5bb548d2e4
120 changed files with 2870 additions and 471 deletions
@@ -20,8 +20,6 @@ rec {
    http://kent.dl.sourceforge.net/sourceforge/
  ];

-  sf = sourceforge;
-
  # GNU (http://www.gnu.org/prep/ftp.html).
  gnu = [
    # This one redirects to a (supposedly) nearby and (supposedly) up-to-date