Merge remote-tracking branch 'official/master' into ppp_2.4.7_squash

Conflicts: pkgs/tools/networking/ppp/default.nix
2015-02-10 09:24:38 -08:00
parent 5522aad3ec 7a6af47cca
commit 3baf1c0772
357 changed files with 13211 additions and 4663 deletions
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
  name = "ppp-${version}";

  src = fetchurl {
-    url = "${meta.homepage}ftp/ppp/${name}.tar.gz";
+    url = "mirror://samba/ppp/${name}.tar.gz";
    sha256 = "0c7vrjxl52pdwi4ckrvfjr08b31lfpgwf3pp0cqy76a77vfs7q02";
  };