diff options
| author | Christian Kampka <christian@kampka.net> | 2019-10-15 11:44:43 +0200 |
|---|---|---|
| committer | Christian Kampka <christian@kampka.net> | 2019-10-15 11:45:29 +0200 |
| commit | 0bfefb0913762fb1ebc8ed278b878e022948a7f3 (patch) | |
| tree | 531a63a388d01044eab959c0bc911fe73a795a9b /pkgs/shells | |
| parent | 5ddfcc1f60210872b7f2e6754e0ed89638bbf401 (diff) | |
| download | nixpkgs-0bfefb0913762fb1ebc8ed278b878e022948a7f3.tar nixpkgs-0bfefb0913762fb1ebc8ed278b878e022948a7f3.tar.gz nixpkgs-0bfefb0913762fb1ebc8ed278b878e022948a7f3.tar.bz2 nixpkgs-0bfefb0913762fb1ebc8ed278b878e022948a7f3.tar.lz nixpkgs-0bfefb0913762fb1ebc8ed278b878e022948a7f3.tar.xz nixpkgs-0bfefb0913762fb1ebc8ed278b878e022948a7f3.tar.zst nixpkgs-0bfefb0913762fb1ebc8ed278b878e022948a7f3.zip | |
zsh-history: Backport upstream patch for config generation
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 | 4 |
2 files changed, 29 insertions, 0 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 new file mode 100644 index 00000000000..0c4fd22c54f --- /dev/null +++ b/pkgs/shells/zsh/zsh-history/0001-Fix-path-marshalling-when-saveing-config.patch @@ -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 + diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index 047d4093396..6bbcdac2c17 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -11,6 +11,10 @@ buildGoModule rec { sha256 = "0r3p04my40dagsq1dssnk583qrlcps9f7ajp43z7mq73q3hrya5s"; }; + patches = [ + ./0001-Fix-path-marshalling-when-saveing-config.patch + ]; + nativeBuildInputs = [ installShellFiles ]; modSha256 = "0f10b86gyn7m7lw43c8y1m30mdg0i092a319v3cb2qj05jb9vn42"; |