Merge pull request #67670 from kampka/zsh-history

zsh-history: init at unstable-2019-08-29
This commit is contained in:
worldofpeace 2019-10-16 01:57:23 +00:00 committed by GitHub
commit fce8b4837a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 63 additions and 0 deletions

View File

@ -0,0 +1,25 @@
From efc16fbe7e41784f218d9c6cb4239b209cd77214 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Sat, 12 Oct 2019 21:47:47 +0200
Subject: [PATCH 1/2] Fix path marshalling when saveing config
---
config/config.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/config.go b/config/config.go
index 69a10c5..b5c61fe 100644
--- a/config/config.go
+++ b/config/config.go
@@ -26,7 +26,7 @@ func (p *Path) UnmarshalText(text []byte) error {
return nil
}
-func (p *Path) MarshalText() (text []byte, err error) {
+func (p Path) MarshalText() (text []byte, err error) {
return []byte(p.path), nil
}
--
2.19.2

View File

@ -0,0 +1,36 @@
{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
buildGoModule rec {
pname = "zsh-history";
version = "2019-10-07";
src = fetchFromGitHub {
owner = "b4b4r07";
repo = "history";
rev = "a08ad2dcffc852903ae54b0c5704b8a085009ef7";
sha256 = "0r3p04my40dagsq1dssnk583qrlcps9f7ajp43z7mq73q3hrya5s";
};
patches = [
./0001-Fix-path-marshalling-when-saveing-config.patch
];
nativeBuildInputs = [ installShellFiles ];
modSha256 = "0f10b86gyn7m7lw43c8y1m30mdg0i092a319v3cb2qj05jb9vn42";
goPackagePath = "github.com/b4b4r07/history";
postInstall = ''
install -d $out/share
cp -r "$NIX_BUILD_TOP/source/misc/"* "$out/share"
installShellCompletion --zsh --name _history $out/share/zsh/completions/_history
'';
meta = with lib; {
description = "A CLI to provide enhanced history for your ZSH shell";
license = licenses.mit;
homepage = https://github.com/b4b4r07/history;
platforms = platforms.unix;
maintainers = with maintainers; [ kampka ];
};
}

View File

@ -7293,6 +7293,8 @@ in
zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { };
zsh-history = callPackage ../shells/zsh/zsh-history { };
zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { };
zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { };