From cc5936993367067149c715834c74f4fbf1185a86 Mon Sep 17 00:00:00 2001 From: oxalica Date: Sat, 29 May 2021 15:25:45 +0800 Subject: [PATCH 1/3] editline: 1.17.0 -> 1.17.1 (cherry picked from commit c63268512b513cc31b2c55376245d9d8d1f0099a) --- pkgs/development/libraries/editline/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 82f65082b94..1d3ad5c316a 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -1,32 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, nix-update-script, fetchpatch }: stdenv.mkDerivation rec { pname = "editline"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "editline"; rev = version; - sha256 = "0vjm42y6zjmi6hdcng0l7wkksw7s50agbmk5dxsc3292q8mvq8v6"; + sha256 = "sha256-0FeDUVCUahbweH24nfaZwa7j7lSfZh1TnQK7KYqO+3g="; }; 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" ]; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { homepage = "https://troglobit.com/editline.html"; description = "A readline() replacement for UNIX without termcap (ncurses)"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ dtzWill oxalica ]; platforms = platforms.all; }; } From d9a0f81c7d7bdd306c857d90aacf9723faf8cf7b Mon Sep 17 00:00:00 2001 From: oxalica Date: Sat, 29 May 2021 15:01:43 +0800 Subject: [PATCH 2/3] editline: add patch to fix Home and End key in tmux `nix repl` is affected by this usability issue. (cherry picked from commit f0d26341adad9207d57edbb80736126ba2a295f2) --- pkgs/development/libraries/editline/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 1d3ad5c316a..ed327e6fa14 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { }; patches = [ + (fetchpatch { + name = "fix-for-home-end-in-tmux.patch"; + url = "https://github.com/troglobit/editline/commit/265c1fb6a0b99bedb157dc7c320f2c9629136518.patch"; + sha256 = "sha256-9fhQH0hT8BcykGzOUoT18HBtWjjoXnePSGDJQp8GH30="; + }) ]; nativeBuildInputs = [ autoreconfHook ]; From 790d9970f1a432499d9db141cd7594d47713dd0b Mon Sep 17 00:00:00 2001 From: Sandro Date: Tue, 1 Jun 2021 15:42:37 +0200 Subject: [PATCH 3/3] Update pkgs/development/libraries/editline/default.nix (cherry picked from commit c9149241a0abbfadfb9fc9b26b0bd539e47f7da0) --- pkgs/development/libraries/editline/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index ed327e6fa14..2b2ffbea31e 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "https://troglobit.com/editline.html"; + homepage = "https://troglobit.com/projects/editline/"; description = "A readline() replacement for UNIX without termcap (ncurses)"; license = licenses.bsdOriginal; maintainers = with maintainers; [ dtzWill oxalica ];