From 9fd495da9b2e23f6a81da88ed5d224f25960d835 Mon Sep 17 00:00:00 2001
From: Sebastian Hagen <sh_c_git@memespace.net>
Date: Sun, 8 Jan 2017 13:32:09 +0000
Subject: [PATCH 1/2] ed: Add fedoraproject mirror.

The existing URL has gone dark; this commit adds one from fedoraproject.org
that still works. We put the new mirror first since ed is in the bootstrap
path, and 16.09 bootstrap doesn't try later URLs.

(cherry picked from commit 547b203b9a28968bba9e9902dbff4600779ed75b)
---
 pkgs/applications/editors/ed/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index 650a551cb601..680b7f8a0307 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -2,6 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "ed-1.13";
+  file_md5 = "fb8ffc8d8072e13dd5799131e889bfa5"; # for fedora mirror
 
   src = fetchurl {
     # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping
@@ -9,7 +10,10 @@ stdenv.mkDerivation rec {
     # When updating, please make sure the sources pulled match those upstream by
     # Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum`
     # in the resulting directory
-    url = "http://fossies.org/linux/privat/${name}.tar.bz2";
+    urls = [
+      "http://pkgs.fedoraproject.org/repo/extras/ed/${name}.tar.bz2/${file_md5}/${name}.tar.bz2"
+      "http://fossies.org/linux/privat/${name}.tar.bz2"
+    ];
     sha256 = "1iym2fsamxr886l3sz8lqzgf00bip5cr0aly8jp04f89kf5mvl0j";
   };
 

From fd68fbfea797dcbbd960df67f0c5ddc739d50d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 8 Jan 2017 22:16:00 +0100
Subject: [PATCH 2/2] ed: avoid the useless rebuild due to #21752

(cherry picked from commit 936bc23b414e562da9fd8ce5e3e360929d25262c)
---
 pkgs/applications/editors/ed/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index 680b7f8a0307..9cb644cc9315 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -2,7 +2,6 @@
 
 stdenv.mkDerivation rec {
   name = "ed-1.13";
-  file_md5 = "fb8ffc8d8072e13dd5799131e889bfa5"; # for fedora mirror
 
   src = fetchurl {
     # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping
@@ -10,10 +9,12 @@ stdenv.mkDerivation rec {
     # When updating, please make sure the sources pulled match those upstream by
     # Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum`
     # in the resulting directory
-    urls = [
-      "http://pkgs.fedoraproject.org/repo/extras/ed/${name}.tar.bz2/${file_md5}/${name}.tar.bz2"
-      "http://fossies.org/linux/privat/${name}.tar.bz2"
-    ];
+    urls = let file_md5 = "fb8ffc8d8072e13dd5799131e889bfa5"; # for fedora mirror
+      in [
+        ("http://pkgs.fedoraproject.org/repo/extras/ed"
+          + "/${name}.tar.bz2/${file_md5}/${name}.tar.bz2")
+        "http://fossies.org/linux/privat/${name}.tar.bz2"
+      ];
     sha256 = "1iym2fsamxr886l3sz8lqzgf00bip5cr0aly8jp04f89kf5mvl0j";
   };