Merge pull request #125253 from NixOS/backport-124853-to-release-21.05

This commit is contained in:
Artturi 2021-08-07 00:27:00 +03:00 committed by GitHub
commit 7396b68a4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions

View File

@ -1,20 +1,20 @@
{ 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";
name = "fix-for-home-end-in-tmux.patch";
url = "https://github.com/troglobit/editline/commit/265c1fb6a0b99bedb157dc7c320f2c9629136518.patch";
sha256 = "sha256-9fhQH0hT8BcykGzOUoT18HBtWjjoXnePSGDJQp8GH30=";
})
];
@ -22,11 +22,15 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" "doc" ];
passthru.updateScript = nix-update-script {
attrPath = pname;
};
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 ];
maintainers = with maintainers; [ dtzWill oxalica ];
platforms = platforms.all;
};
}