From 53d67bcc26ceff38454b97ebafd49a5df0d0733e Mon Sep 17 00:00:00 2001
From: Klaas van Schelven <klaas@vanschelven.com>
Date: Thu, 17 Aug 2017 16:46:04 +0200
Subject: [PATCH] readline 7.0 -> 7.0.3

Discussion: https://groups.google.com/forum/#!topic/nix-devel/agupzdm352Q
---
 lib/maintainers.nix                           |  1 +
 pkgs/development/libraries/readline/7.0.nix   | 19 +++++++++----------
 .../readline/readline-7.0-patches.nix         |  7 +++++++
 3 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/libraries/readline/readline-7.0-patches.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 5762982273be..727fd2091c99 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -595,6 +595,7 @@
   uwap = "uwap <me@uwap.name>";
   vaibhavsagar = "Vaibhav Sagar <vaibhavsagar@gmail.com>";
   vandenoever = "Jos van den Oever <jos@vandenoever.info>";
+  vanschelven = "Klaas van Schelven <klaas@vanschelven.com>";
   vanzef = "Ivan Solyankin <vanzef@gmail.com>";
   vbgl = "Vincent Laporte <Vincent.Laporte@gmail.com>";
   vbmithr = "Vincent Bernardoff <vb@luminar.eu.org>";
diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix
index 7cc76e087685..ed6e0cb153c4 100644
--- a/pkgs/development/libraries/readline/7.0.nix
+++ b/pkgs/development/libraries/readline/7.0.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   name = "readline-${version}";
-  version = "7.0p0";
+  version = "7.0p${toString (builtins.length upstreamPatches)}";
 
   src = fetchurl {
     url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz";
@@ -17,13 +17,7 @@ stdenv.mkDerivation rec {
 
   patchFlags = "-p0";
 
-  patches =
-    [ ./link-against-ncurses.patch
-      ./no-arch_only-6.3.patch
-    ]
-    ;
-    /*
-    ++
+  upstreamPatches =
     (let
        patch = nr: sha256:
          fetchurl {
@@ -32,7 +26,12 @@ stdenv.mkDerivation rec {
          };
      in
        import ./readline-7.0-patches.nix patch);
-    */
+
+  patches =
+    [ ./link-against-ncurses.patch
+      ./no-arch_only-6.3.patch
+    ]
+    ++ upstreamPatches;
 
   # Don't run the native `strip' when cross-compiling.
   dontStrip = hostPlatform != buildPlatform;
@@ -60,7 +59,7 @@ stdenv.mkDerivation rec {
 
     license = licenses.gpl3Plus;
 
-    maintainers = [ ];
+    maintainers = [ vanschelven ];
 
     platforms = platforms.unix;
     branch = "7.0";
diff --git a/pkgs/development/libraries/readline/readline-7.0-patches.nix b/pkgs/development/libraries/readline/readline-7.0-patches.nix
new file mode 100644
index 000000000000..45bec6b64812
--- /dev/null
+++ b/pkgs/development/libraries/readline/readline-7.0-patches.nix
@@ -0,0 +1,7 @@
+# Automatically generated by `update-patch-set.sh'; do not edit.
+
+patch: [
+(patch "001" "0xm3sxvwmss7ddyfb11n6pgcqd1aglnpy15g143vzcf75snb7hcs")
+(patch "002" "0n1dxmqsbjgrfxb1hgk5c6lsraw4ncbnzxlsx7m35nym6lncjiw7")
+(patch "003" "1027kmymniizcy0zbdlrczxfx3clxcdln5yq05q9yzlc6y9slhwy")
+]