diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-12-10 23:59:38 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 23:59:38 -0500 |
| commit | d157c97b43c2302b96de4b2fac000cc41b55e6ea (patch) | |
| tree | e278269dba7dd0f533ca969a12605487291dfd23 /pkgs/shells | |
| parent | 58cf77fbee0eedc11fabf6cb96248f1df7ec1ebb (diff) | |
| parent | 1d2e21ad1f57ad359d88032f8ef187ddc6a3272a (diff) | |
| download | nixpkgs-d157c97b43c2302b96de4b2fac000cc41b55e6ea.tar nixpkgs-d157c97b43c2302b96de4b2fac000cc41b55e6ea.tar.gz nixpkgs-d157c97b43c2302b96de4b2fac000cc41b55e6ea.tar.bz2 nixpkgs-d157c97b43c2302b96de4b2fac000cc41b55e6ea.tar.lz nixpkgs-d157c97b43c2302b96de4b2fac000cc41b55e6ea.tar.xz nixpkgs-d157c97b43c2302b96de4b2fac000cc41b55e6ea.tar.zst nixpkgs-d157c97b43c2302b96de4b2fac000cc41b55e6ea.zip | |
Merge pull request #75434 from kampka/zsh-history
zsh-history: 2019-10-07 -> 2019-12-10
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/zsh/zsh-history/0001-Fix-path-marshalling-when-saveing-config.patch | 25 | ||||
| -rw-r--r-- | pkgs/shells/zsh/zsh-history/default.nix | 10 |
2 files changed, 3 insertions, 32 deletions
diff --git a/pkgs/shells/zsh/zsh-history/0001-Fix-path-marshalling-when-saveing-config.patch b/pkgs/shells/zsh/zsh-history/0001-Fix-path-marshalling-when-saveing-config.patch deleted file mode 100644 index 0c4fd22c54f..00000000000 --- a/pkgs/shells/zsh/zsh-history/0001-Fix-path-marshalling-when-saveing-config.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 - diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index 6bbcdac2c17..98e97d78465 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -2,19 +2,15 @@ buildGoModule rec { pname = "zsh-history"; - version = "2019-10-07"; + version = "2019-12-10"; src = fetchFromGitHub { owner = "b4b4r07"; repo = "history"; - rev = "a08ad2dcffc852903ae54b0c5704b8a085009ef7"; - sha256 = "0r3p04my40dagsq1dssnk583qrlcps9f7ajp43z7mq73q3hrya5s"; + rev = "8da016bd91b0c2eb53c9980f00eee6abdbb097e2"; + sha256 = "13n643ik1zjvpk8h9458yd9ffahhbdnigmbrbmpn7b7g23wqqsi3"; }; - patches = [ - ./0001-Fix-path-marshalling-when-saveing-config.patch - ]; - nativeBuildInputs = [ installShellFiles ]; modSha256 = "0f10b86gyn7m7lw43c8y1m30mdg0i092a319v3cb2qj05jb9vn42"; |