From 600fd0382451660a5977894c99cb98d3dbc0ed61 Mon Sep 17 00:00:00 2001 From: "Collin J. Doering" Date: Wed, 30 Dec 2020 23:05:08 -0500 Subject: [PATCH] rekahsoft-gnu/packages/golang.scm: Update aws-vault to v6.2.0 --- rekahsoft-gnu/packages/golang.scm | 116 ++++++++++++++++++++++-------- 1 file changed, 87 insertions(+), 29 deletions(-) diff --git a/rekahsoft-gnu/packages/golang.scm b/rekahsoft-gnu/packages/golang.scm index c6a3318..a70f8e5 100644 --- a/rekahsoft-gnu/packages/golang.scm +++ b/rekahsoft-gnu/packages/golang.scm @@ -92,22 +92,48 @@ platforms. Gox will also build the cross-compilation toolchain for you.") (home-page "https://github.com/mitchellh/gox") (license license:mpl2.0))) +(define-public go-github-com-androiddnsfix + (package + (name "go-androiddnsfix") + (version "ff02804463540c36e3a148dcf4b009d003cf2a31") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mtibben/androiddnsfix") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pcbjs793kd0yg3dcp79agfxm7xm3sldx2r7v66ipzpcq0j2npi2")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/mtibben/androiddnsfix" + #:phases %standard-phases)) + (synopsis "Hack to get around the issues building on android") + (description + "Hack around the issues in https://github.com/golang/go/issues/8877.") + (home-page "https://github.com/mtibben/androiddnsfix") + (license license:expat))) + (define-public aws-vault (package (name "aws-vault") - (version "4.6.1") + (version "v6.2.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/99designs/aws-vault") - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0ppjys27685d2ghj7j27910mqzjbzsw8lwg2da9ky5cv97zp592n")))) + "0892fhjmxnms09bfbjnngnnnli2d4nkwq44fw98yb3d5lbpa1j1j")))) (build-system go-build-system) (native-inputs `(("go-keyring" ,go-keyring) + ("go-github-com-androiddnsfix" ,go-github-com-androiddnsfix) + ("go-github-com-percent" ,go-github-com-percent) + ("go-github-com-jmespath-go-jmespath" ,go-github-com-jmespath-go-jmespath) ("go-github-com-aws-aws-sdk-go" ,go-github-com-aws-aws-sdk-go) ("go-github-com-dvsekhvalnov-jose2go" ,go-github-com-dvsekhvalnov-jose2go) ("go-github-com-godbus-dbus" ,go-github-com-godbus-dbus) @@ -115,16 +141,20 @@ platforms. Gox will also build the cross-compilation toolchain for you.") ("go-github-com-mitchellh-go-homedir" ,go-github-com-mitchellh-go-homedir) ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) ("go-golang-org-x-sys" ,go-golang-org-x-sys) - ("go-github-com-go-ini-ini" ,go-github-com-go-ini-ini) + ("go-gopkg-in-ini" ,go-gopkg-in-ini) ("go-github-com-skratchdot-open-golang" ,go-github-com-skratchdot-open-golang) - ("go-gopkg-in-kingpin-v2" ,go-gopkg-in-kingpin-v2) + ("go-github-com-kingpin" ,go-github-com-kingpin) ("go-github-com-alecthomas-template" ,go-github-com-alecthomas-template) ("go-github-com-alecthomas-units" ,go-github-com-alecthomas-units))) (arguments - '(#:import-path "github.com/99designs/aws-vault" + `(#:import-path "github.com/99designs/aws-vault" #:install-source? #f #:phases (modify-phases %standard-phases + (add-before 'build 'patch-version + (lambda _ + (substitute* "src/github.com/99designs/aws-vault/main.go" + (("var Version = \"dev\"") (string-append "var Version = \"" ,version "\""))))) (add-after 'build 'contrib (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -132,9 +162,10 @@ platforms. Gox will also build the cross-compilation toolchain for you.") (bash-completion-dir (string-append out "/share/bash-completion/completions"))) (for-each mkdir-p `(,zsh-site-dir ,bash-completion-dir)) (with-directory-excursion "src/github.com/99designs/aws-vault" - (invoke "ls" "-la") - (install-file "completions/zsh/_aws-vault" (string-append zsh-site-dir "/_aws-vault")) - (install-file "completions/bash/aws-vault" (string-append bash-completion-dir "/aws-vault"))))))))) + (install-file "contrib/completions/zsh/aws-vault.zsh" + (string-append zsh-site-dir "/_aws-vault")) + (install-file "contrib/completions/bash/aws-vault.bash" + (string-append bash-completion-dir "/aws-vault"))))))))) (synopsis "Vault for securely storing and accessing AWS credentials in development environments") @@ -149,10 +180,33 @@ aware of your profiles and configuration in ~/.aws/config.") (home-page "https://github.com/99designs/aws-vault") (license license:expat))) +(define-public go-github-com-percent + (package + (name "go-percent") + (version "v0.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mtibben/percent") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1iqivw8pigj259rj5yifibbvic70f9hb7k24a4sa967s4fj6agb6")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/mtibben/percent" + #:phases %standard-phases)) + (synopsis "Package percent escapes strings using percent-encoding") + (description + "Package percent escapes strings using percent-encoding.") + (home-page "https://github.com/mtibben/percent") + (license license:expat))) + (define-public go-keyring (package (name "go-keyring") - (version "v1.0.0") + (version "v1.1.6") (source (origin (method git-fetch) (uri (git-reference @@ -161,11 +215,12 @@ aware of your profiles and configuration in ~/.aws/config.") (file-name (git-file-name name version)) (sha256 (base32 - "1izcaz7mr642by7k6y4dc03bb9hj8racn4qw4xpcw0b1jj61ywn8")))) + "08rcdqpxaa9n348q10fw40q4gxpjajkyrighykk71i7mxzwkcgwn")))) (build-system go-build-system) (native-inputs `(("go-golang-org-x-crypto" ,go-golang-org-x-crypto) ("go-golang-org-x-sys" ,go-golang-org-x-sys) + ("go-github-com-percent" ,go-github-com-percent) ("go-github-com-mitchellh-go-homedir" ,go-github-com-mitchellh-go-homedir) ("go-github-com-dvsekhvalnov-jose2go" ,go-github-com-dvsekhvalnov-jose2go) ("go-github-com-godbus-dbus" ,go-github-com-godbus-dbus) @@ -174,7 +229,9 @@ aware of your profiles and configuration in ~/.aws/config.") ("gnupg" ,gnupg))) (arguments '(#:import-path "github.com/99designs/keyring" - #:phases %standard-phases)) + #:phases (modify-phases %standard-phases + ;; Tests require vagrant + (delete 'check)))) (synopsis "Go library providing a uniform interface across a range of secure credential stores") (description @@ -273,7 +330,7 @@ Service DBus API") (define-public go-github-com-aws-aws-sdk-go (package (name "go-aws-sdk-go") - (version "1.20.8") + (version "1.36.18") (source (origin (method git-fetch) (uri (git-reference @@ -282,8 +339,10 @@ Service DBus API") (file-name (git-file-name name version)) (sha256 (base32 - "1935w6n1q7lrd0yqrmc5601sjqxh6fyvh1wd9hf6ic7wiq8n84y7")))) + "169mkkw1cff1px6326krwvfpfj07sb4y5rbn003gi4bk176h6ry9")))) (build-system go-build-system) + (native-inputs + `(("go-github-com-jmespath-go-jmespath" ,go-github-com-jmespath-go-jmespath))) (arguments '(#:import-path "github.com/aws/aws-sdk-go" #:phases %standard-phases)) @@ -293,30 +352,29 @@ Service DBus API") (home-page "https://github.com/aws/aws-sdk-go") (license license:asl2.0))) -(define-public go-github-com-go-ini-ini +(define-public go-gopkg-in-ini (package (name "go-ini") - (version "1.42.0") + (version "v1.62.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/go-ini/ini") - (commit (string-append "v" version)))) + (url "https://gopkg.in/ini.v1") + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "18ywm8zyv091j1pp5mvx8szl7928chk8lw02br6jy568d7rk4xal")))) + "1dm9ydqyflasp5li22kb0w73s6kp2swii8naqfhnz64v171gmm5v")))) (build-system go-build-system) (native-inputs `(("go-github.com-smartystreets-goconvey" ,go-github.com-smartystreets-goconvey))) (arguments - '(#:import-path "github.com/go-ini/ini" - #:tests? #f + '(#:import-path "gopkg.in/ini.v1" #:phases %standard-phases)) - (synopsis "Go library provides INI file read and write functionality") + (synopsis "Provides INI file read and write functionality in Go") (description - "Go library provides INI file read and write functionality.") - (home-page "https://github.com/go-ini/ini") + "Provides INI file read and write functionality in Go.") + (home-page "https://gopkg.in/ini.v1") (license license:asl2.0))) (define-public go-github-com-skratchdot-open-golang @@ -350,14 +408,14 @@ Linux/Other - xdg-open") (home-page "https://github.com/skratchdot/open-golang") (license license:expat)))) -(define-public go-gopkg-in-kingpin-v2 +(define-public go-github-com-kingpin (package - (name "go-kingpin-v2") + (name "go-kingpin") (version "2.2.6") (source (origin (method git-fetch) (uri (git-reference - (url "https://gopkg.in/alecthomas/kingpin.v2") + (url "https://github.com/alecthomas/kingpin") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -369,12 +427,12 @@ Linux/Other - xdg-open") ("go-github-com-alecthomas-units" ,go-github-com-alecthomas-units) ("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify))) (arguments - '(#:import-path "gopkg.in/alecthomas/kingpin.v2" + '(#:import-path "github.com/alecthomas/kingpin" #:phases %standard-phases)) (synopsis "Go library provides utilities for building command line interfaces") (description "Go library provides utilities for building command line interfaces.") - (home-page "https://gopkg.in/alecthomas/kingpin.v2") + (home-page "https://github.com/alecthomas/kingpin") (license license:expat))) (define-public go-github-com-alecthomas-template