diff options
| author | aszlig <aszlig@nix.build> | 2018-05-27 06:17:14 +0200 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2018-05-27 06:17:14 +0200 |
| commit | 57ebb4111c2d36fe5d95223e3adb0da4faf3d753 (patch) | |
| tree | 37bb7ec0f608e836d8037e1cf04ff92b96715be2 /pkgs/aszlig/gopass | |
| parent | 1ffd55e697636d75598b2223cf8c3ed750d047a9 (diff) | |
pkgs/gopass: Rebase patches against version 1.7.1
The patches are basically the same but only the files were moved to a different place in the upstream repository. Tested building and execution. Signed-off-by: aszlig <aszlig@nix.build>
Diffstat (limited to 'pkgs/aszlig/gopass')
| -rw-r--r-- | pkgs/aszlig/gopass/ascii-symbols.patch | 6 | ||||
| -rw-r--r-- | pkgs/aszlig/gopass/use-color-in-pager.patch | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/pkgs/aszlig/gopass/ascii-symbols.patch b/pkgs/aszlig/gopass/ascii-symbols.patch index c66e9e6b..01365193 100644 --- a/pkgs/aszlig/gopass/ascii-symbols.patch +++ b/pkgs/aszlig/gopass/ascii-symbols.patch @@ -1,7 +1,7 @@ -diff --git a/utils/tree/simple/tree.go b/utils/tree/simple/tree.go +diff --git a/pkg/tree/simple/tree.go b/pkg/tree/simple/tree.go index aa9f42a..76f56e9 100644 ---- a/utils/tree/simple/tree.go -+++ b/utils/tree/simple/tree.go +--- a/pkg/tree/simple/tree.go ++++ b/pkg/tree/simple/tree.go @@ -8,9 +8,9 @@ import ( const ( diff --git a/pkgs/aszlig/gopass/use-color-in-pager.patch b/pkgs/aszlig/gopass/use-color-in-pager.patch index 52ea8801..86f6fd53 100644 --- a/pkgs/aszlig/gopass/use-color-in-pager.patch +++ b/pkgs/aszlig/gopass/use-color-in-pager.patch @@ -1,16 +1,16 @@ -diff --git a/action/list.go b/action/list.go -index c5d2ae0..715ce65 100644 ---- a/action/list.go -+++ b/action/list.go -@@ -9,7 +9,6 @@ import ( - "os/exec" - "strings" +diff --git a/pkg/action/list.go b/pkg/action/list.go +index 03de22b..d54113f 100644 +--- a/pkg/action/list.go ++++ b/pkg/action/list.go +@@ -14,7 +14,6 @@ import ( + "github.com/justwatchcom/gopass/pkg/termutil" + "github.com/justwatchcom/gopass/pkg/tree" - "github.com/fatih/color" - "github.com/justwatchcom/gopass/utils/ctxutil" - "github.com/justwatchcom/gopass/utils/out" - "github.com/justwatchcom/gopass/utils/termutil" -@@ -84,7 +83,6 @@ func redirectPager(ctx context.Context, subtree tree.Tree) (io.Writer, *bytes.Bu + shellquote "github.com/kballard/go-shellquote" + "github.com/pkg/errors" + "github.com/urfave/cli" +@@ -89,7 +88,6 @@ func redirectPager(ctx context.Context, subtree tree.Tree) (io.Writer, *bytes.Bu if subtree == nil || subtree.Len() < rows { return stdout, nil } |