git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #75434 from kampka/zsh-history

zsh-history: 2019-10-07 -> 2019-12-10

commitd157c97b43c2302b96de4b2fac000cc41b55e6ea authorworldofpeace <worldofpeace@protonmail.ch> dateTue 10 Dec 2019, 23:59 (7 years ago) parent58cf77f1d2e21a
2 files changed+3−32
pkgs/shells/zsh/zsh-history/0001-Fix-path-marshalling-when-saveing-config.patch−25 pkgs/shells/zsh/zsh-history/default.nix+3−7
pkgs/shells/zsh/zsh-history/0001-Fix-path-marshalling-when-saveing-config.patchdeleted−25
@@ -1,25 +0,0 @@
1−From efc16fbe7e41784f218d9c6cb4239b209cd77214 Mon Sep 17 00:00:00 2001
2−From: Christian Kampka <christian@kampka.net>
3−Date: Sat, 12 Oct 2019 21:47:47 +0200
4−Subject: [PATCH 1/2] Fix path marshalling when saveing config
5−
6−---
7− config/config.go | 2 +-
8− 1 file changed, 1 insertion(+), 1 deletion(-)
9−
10−diff --git a/config/config.go b/config/config.go
11−index 69a10c5..b5c61fe 100644
12−--- a/config/config.go
13−+++ b/config/config.go
14−@@ -26,7 +26,7 @@ func (p *Path) UnmarshalText(text []byte) error {
15− return nil
16− }
17−
18−-func (p *Path) MarshalText() (text []byte, err error) {
19−+func (p Path) MarshalText() (text []byte, err error) {
20− return []byte(p.path), nil
21− }
22−
23−--
24−2.19.2
25−
pkgs/shells/zsh/zsh-history/default.nix+3−7
@@ -2,19 +2,15 @@
22
33buildGoModule rec {
44 pname = "zsh-history";
5− version = "2019-10-07";
5+ version = "2019-12-10";
66
77 src = fetchFromGitHub {
88 owner = "b4b4r07";
99 repo = "history";
10− rev = "a08ad2dcffc852903ae54b0c5704b8a085009ef7";
11− sha256 = "0r3p04my40dagsq1dssnk583qrlcps9f7ajp43z7mq73q3hrya5s";
10+ rev = "8da016bd91b0c2eb53c9980f00eee6abdbb097e2";
11+ sha256 = "13n643ik1zjvpk8h9458yd9ffahhbdnigmbrbmpn7b7g23wqqsi3";
1212 };
1313
14− patches = [
15− ./0001-Fix-path-marshalling-when-saveing-config.patch
16− ];
17−
1814 nativeBuildInputs = [ installShellFiles ];
1915
2016 modSha256 = "0f10b86gyn7m7lw43c8y1m30mdg0i092a319v3cb2qj05jb9vn42";