From 19f1fd14b3157d42ef51ae2b9c5a95e25f74b348 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 2 Jan 2018 12:15:48 -0600
Subject: [PATCH] invisible-island programs: Fix FTP URL's, use HTTPS, prefer
 ftp

FTP URL's should use ftp.invisible-island.net.
---
 pkgs/applications/misc/xterm/default.nix               | 5 ++++-
 pkgs/applications/networking/browsers/lynx/default.nix | 5 ++++-
 pkgs/development/libraries/ncurses/default.nix         | 5 ++++-
 pkgs/development/tools/parsing/byacc/default.nix       | 4 ++--
 pkgs/tools/text/diffstat/default.nix                   | 5 ++++-
 pkgs/tools/text/mawk/default.nix                       | 2 +-
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 9e64557838e..ca26b35f29e 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -6,7 +6,10 @@ stdenv.mkDerivation rec {
   name = "xterm-330";
 
   src = fetchurl {
-    url = "http://invisible-mirror.net/archives/xterm/${name}.tgz";
+    urls = [
+     "ftp://ftp.invisible-island.net/xterm/${name}.tgz"
+     "https://invisible-mirror.net/archives/xterm/${name}.tgz"
+   ];
     sha256 = "1psnfmqd23v9gxj8a98nzrgvymrk0p1whwqi92gy15bbkzrgkvks";
   };
 
diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index 0f6c4ed36d4..b1f9b0a1695 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -12,7 +12,10 @@ stdenv.mkDerivation rec {
   version = "2.8.9dev.16";
 
   src = fetchurl {
-    url = "http://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2";
+    urls = [
+      "ftp://ftp.invisible-island.net/lynx/tarballs/lynx${version}.tar.bz2"
+      "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2"
+    ];
     sha256 = "1j0vx871ghkm7fgrafnvd2ml3ywcl8d3gyhq02fhfb851c88lc84";
   };
 
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 9aade8b9672..3cdc88fd644 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -18,7 +18,10 @@ stdenv.mkDerivation rec {
     url = "mirror://gnu/ncurses/${name}.tar.gz";
     sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh";
   } else {
-    url = "ftp://ftp.invisible-island.net/ncurses/current/${name}.tgz";
+    urls = [
+      "ftp://ftp.invisible-island.net/ncurses/current/${name}.tgz"
+      "https://invisible-mirror.net/archives/ncurses/current/${name}.tgz"
+    ];
     sha256 = "11adzj0k82nlgpfrflabvqn2m7fmhp2y6pd7ivmapynxqb9vvb92";
   });
 
diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index c34eb9fc708..ce8f7de1bbb 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     urls = [
-      "ftp://invisible-island.net/byacc/${name}.tgz"
-      "http://invisible-mirror.net/archives/byacc/${name}.tgz"
+      "ftp://ftp.invisible-island.net/byacc/${name}.tgz"
+      "https://invisible-mirror.net/archives/byacc/${name}.tgz"
     ];
     sha256 = "90b768d177f91204e6e7cef226ae1dc7cac831b625774cebd3e233a917754f91";
   };
diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix
index cfc1d4badbd..d106d140a67 100644
--- a/pkgs/tools/text/diffstat/default.nix
+++ b/pkgs/tools/text/diffstat/default.nix
@@ -4,7 +4,10 @@ stdenv.mkDerivation rec {
   name = "diffstat-1.61";
 
   src = fetchurl {
-    url = "ftp://invisible-island.net/diffstat/${name}.tgz";
+    urls = [
+      "ftp://ftp.invisible-island.net/diffstat/${name}.tgz"
+      "https://invisible-mirror.net/archives/diffstat/${name}.tgz"
+    ];
     sha256 = "1vjmda2zfjxg0qkaj8hfqa8g6bfwnn1ja8696rxrjgqq4w69wd95";
   };
 
diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix
index a8657c3ea2f..ed54f9d349e 100644
--- a/pkgs/tools/text/mawk/default.nix
+++ b/pkgs/tools/text/mawk/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     urls = [
+      "ftp://ftp.invisible-island.net/mawk/${name}.tgz"
       "https://invisible-mirror.net/archives/mawk/${name}.tgz"
-      "ftp://invisible-island.net/mawk/${name}.tgz"
     ];
     sha256 = "0nwyxhipn4jx7j695lih1xggxm6cp4fjk4wbgihd33ni3rfi25yv";
   };