fix ftp.mozilla.org URLs

The old URLs time out.

+12 -11
+3 -3
pkgs/development/interpreters/spidermonkey/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "spidermonkey-1.7"; 5 - 5 + 6 6 src = fetchurl { 7 - url = ftp://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz; 7 + url = https://ftp.mozilla.org/pub/js/js-1.7.0.tar.gz; 8 8 sha256 = "12v6v2ccw1y6ng3kny3xw0lfs58d1klylqq707k0x04m707kydj4"; 9 9 }; 10 10 ··· 14 14 15 15 makefileExtra = ./Makefile.extra; 16 16 makefile = "Makefile.ref"; 17 - 17 + 18 18 patchPhase = 19 19 '' 20 20 cat ${makefileExtra} >> ${makefile}
+1 -1
pkgs/development/libraries/java/rhino/default.nix
··· 14 14 name = "rhino-${version}"; 15 15 16 16 src = fetchurl { 17 - url = "ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R2.zip"; 17 + url = "https://ftp.mozilla.org/pub/js/rhino1_7R2.zip"; 18 18 sha256 = "1p32hkghi6bkc3cf2dcqyaw5cjj7403mykcp0fy8f5bsnv0pszv7"; 19 19 }; 20 20
+1 -1
pkgs/development/libraries/svrcore/default.nix
··· 5 5 version = "4.0.4"; 6 6 7 7 src = fetchurl { 8 - url = "ftp://ftp.mozilla.org/pub/mozilla.org/directory/svrcore/releases/${version}/src/${name}.tar.bz2"; 8 + url = "https://ftp.mozilla.org/pub/directory/svrcore/releases/${version}/src/${name}.tar.bz2"; 9 9 sha256 = "0n3alg6bxml8952fb6h0bi0l29farvq21q6k20gy2ba90m3znwj7"; 10 10 }; 11 11
+7 -6
pkgs/top-level/perl-packages.nix
··· 8047 8047 }; 8048 8048 }; 8049 8049 8050 - MozillaLdap = buildPerlPackage { 8051 - name = "Mozilla-Ldap-1.5.3"; 8052 - USE_OPENLDAP=1; 8053 - LDAPSDKDIR=pkgs.openldap; 8050 + MozillaLdap = buildPerlPackage rec { 8051 + name = "Mozilla-Ldap-${version}"; 8052 + version = "1.5.3"; 8053 + USE_OPENLDAP = 1; 8054 + LDAPSDKDIR = pkgs.openldap; 8054 8055 src = fetchurl { 8055 - url = "ftp://ftp.mozilla.org/pub/mozilla.org/directory/perldap/releases/1.5.3/src/perl-mozldap-1.5.3.tar.gz"; 8056 + url = "https://ftp.mozilla.org/pub/directory/perldap/releases/${version}/src/perl-mozldap-${version}.tar.gz"; 8056 8057 sha256 = "0s0albdw0zvg3w37s7is7gddr4mqwicjxxsy400n1p96l7ipnw4x"; 8057 8058 }; 8058 8059 meta = { 8059 8060 description = "Mozilla's ldap client library"; 8060 - license = "unknown"; 8061 + license = with stdenv.lib.licenses; [ mpl20 lgpl21Plus gpl2Plus ]; 8061 8062 }; 8062 8063 }; 8063 8064