mirror of
https://https.git.savannah.gnu.org/git/guix.git/
synced 2025-07-14 11:00:36 +02:00
gnu: go-github-com-urfave-cli: Update to 1.22.16.
* gnu/packages/golang.scm (go-github-com-urfave-cli): Update to 1.22.16. [source]: Remove patch. [native-iputs]: Add go-github-com-stretchr-testify. * gnu/packages/patches/go-github-com-urfave-cli-fix-tests.patch: Delete file. * gnu/local.mk: Deregister patch. Change-Id: If4f1db104fbdcd5b603003065c88110746d12ebb
This commit is contained in:
parent
85a9366d60
commit
94cefaab3a
3 changed files with 6 additions and 33 deletions
|
@ -1506,7 +1506,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/go-fix-script-tests.patch \
|
%D%/packages/patches/go-fix-script-tests.patch \
|
||||||
%D%/packages/patches/go-gopkg-in-yaml-v3-32bit.patch \
|
%D%/packages/patches/go-gopkg-in-yaml-v3-32bit.patch \
|
||||||
%D%/packages/patches/go-github-com-golang-snappy-32bit-test.patch \
|
%D%/packages/patches/go-github-com-golang-snappy-32bit-test.patch \
|
||||||
%D%/packages/patches/go-github-com-urfave-cli-fix-tests.patch \
|
|
||||||
%D%/packages/patches/go-github-com-urfave-cli-v2-fix-tests.patch \
|
%D%/packages/patches/go-github-com-urfave-cli-v2-fix-tests.patch \
|
||||||
%D%/packages/patches/go-github-com-warpfork-go-wish-fix-tests.patch \
|
%D%/packages/patches/go-github-com-warpfork-go-wish-fix-tests.patch \
|
||||||
%D%/packages/patches/go-github-com-wraparound-wrap-free-fonts.patch \
|
%D%/packages/patches/go-github-com-wraparound-wrap-free-fonts.patch \
|
||||||
|
|
|
@ -4212,7 +4212,7 @@ references.")
|
||||||
(define-public go-github-com-urfave-cli
|
(define-public go-github-com-urfave-cli
|
||||||
(package
|
(package
|
||||||
(name "go-github-com-urfave-cli")
|
(name "go-github-com-urfave-cli")
|
||||||
(version "1.22.2")
|
(version "1.22.16")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method git-fetch)
|
(method git-fetch)
|
||||||
|
@ -4222,11 +4222,13 @@ references.")
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"10mcnvi5qmn00vpyk6si8gjka7p654wr9hac4zc9w5h3ickhvbdc"))
|
"022abbjwr3g2vbyfbdc1hg09d753hfba21b69n2nkrx168ag5ahd"))))
|
||||||
(patches (search-patches "go-github-com-urfave-cli-fix-tests.patch"))))
|
|
||||||
(build-system go-build-system)
|
(build-system go-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:import-path "github.com/urfave/cli"))
|
(list
|
||||||
|
#:import-path "github.com/urfave/cli"))
|
||||||
|
(native-inputs
|
||||||
|
(list go-github-com-stretchr-testify))
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(list go-github-com-go-md2man))
|
(list go-github-com-go-md2man))
|
||||||
(home-page "https://github.com/urfave/cli")
|
(home-page "https://github.com/urfave/cli")
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
Backported from upstream PR: https://github.com/urfave/cli/pull/1299
|
|
||||||
---
|
|
||||||
diff --git a/app_test.go b/app_test.go
|
|
||||||
index 33024ff..6b3aaa3 100644
|
|
||||||
--- a/app_test.go
|
|
||||||
+++ b/app_test.go
|
|
||||||
@@ -513,18 +513,18 @@ func TestApp_RunAsSubcommandParseFlags(t *testing.T) {
|
|
||||||
func TestApp_RunAsSubCommandIncorrectUsage(t *testing.T) {
|
|
||||||
a := App{
|
|
||||||
Flags: []Flag{
|
|
||||||
- StringFlag{Name: "--foo"},
|
|
||||||
+ StringFlag{Name: "foo"},
|
|
||||||
},
|
|
||||||
Writer: bytes.NewBufferString(""),
|
|
||||||
}
|
|
||||||
|
|
||||||
set := flag.NewFlagSet("", flag.ContinueOnError)
|
|
||||||
- _ = set.Parse([]string{"", "---foo"})
|
|
||||||
+ _ = set.Parse([]string{"", "-bar"})
|
|
||||||
c := &Context{flagSet: set}
|
|
||||||
|
|
||||||
err := a.RunAsSubcommand(c)
|
|
||||||
|
|
||||||
- expect(t, err, errors.New("bad flag syntax: ---foo"))
|
|
||||||
+ expect(t, err.Error(), "flag provided but not defined: -bar")
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestApp_CommandWithFlagBeforeTerminator(t *testing.T) {
|
|
Loading…
Add table
Add a link
Reference in a new issue