summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2020-02-04 07:25:26 -0600
committerGitHub <noreply@github.com>2020-02-04 07:25:26 -0600
commite2867af1b2463aa0a2a9c218c966494a781be80d (patch)
treed9a6d2ac13d9d21c8c059e835b6869be1ec74ba6 /pkgs
parent6fd230f1449bfe70291ffc17da464a09f5e55bfd (diff)
parent0285a20b48e2f72a5592371009a08993d040037b (diff)
downloadnixpkgs-e2867af1b2463aa0a2a9c218c966494a781be80d.tar
nixpkgs-e2867af1b2463aa0a2a9c218c966494a781be80d.tar.gz
nixpkgs-e2867af1b2463aa0a2a9c218c966494a781be80d.tar.bz2
nixpkgs-e2867af1b2463aa0a2a9c218c966494a781be80d.tar.lz
nixpkgs-e2867af1b2463aa0a2a9c218c966494a781be80d.tar.xz
nixpkgs-e2867af1b2463aa0a2a9c218c966494a781be80d.tar.zst
nixpkgs-e2867af1b2463aa0a2a9c218c966494a781be80d.zip
Merge pull request #77050 from r-ryantm/auto-update/editline
editline: 1.16.1 -> 1.17.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/editline/default.nix14
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix
index 5f9c72f04af..f0c7c7d2064 100644
--- a/pkgs/development/libraries/editline/default.nix
+++ b/pkgs/development/libraries/editline/default.nix
@@ -1,15 +1,23 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }:
 
 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";
   };
 
+  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" ];