From 525e296c2cb19ac2ee66b60bc13ef7c6b5dae003 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 6 Jan 2020 03:20:22 -0800
Subject: [PATCH 1/2] editline: 1.16.1 -> 1.17.0

---
 pkgs/development/libraries/editline/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix
index 5f9c72f04afe..2b41e69eae60 100644
--- a/pkgs/development/libraries/editline/default.nix
+++ b/pkgs/development/libraries/editline/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "editline";
-  version = "1.16.1";
+  version = "1.17.0";
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "editline";
     rev = version;
-    sha256 = "192valxbvkxh47dszrnahv7xiccarjw9y84g4zaw5y0lxfc54dir";
+    sha256 = "0vjm42y6zjmi6hdcng0l7wkksw7s50agbmk5dxsc3292q8mvq8v6";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 0285a20b48e2f72a5592371009a08993d040037b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 15 Jan 2020 09:49:56 -0600
Subject: [PATCH 2/2] editline: patch for improved handling of multiline input

Minor but observable in `nix repl` when history contains
expression that wraps and one that doesn't and using up/down
arrows to toggle between (for example).
---
 pkgs/development/libraries/editline/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix
index 2b41e69eae60..f0c7c7d2064e 100644
--- a/pkgs/development/libraries/editline/default.nix
+++ b/pkgs/development/libraries/editline/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "editline";
@@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
     sha256 = "0vjm42y6zjmi6hdcng0l7wkksw7s50agbmk5dxsc3292q8mvq8v6";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "fix-for-multiline-as-one-line.patch";
+      url = "https://github.com/troglobit/editline/commit/ceee039cfc819c8e09eebbfca192091b0cf8df75.patch";
+      sha256 = "149fmfva05ghzwkd0bq1sahdbkys3qyyky28ssqb5jq7q9hw3ddm";
+    })
+  ];
+
   nativeBuildInputs = [ autoreconfHook ];
 
   outputs = [ "out" "dev" "man" "doc" ];