sharlatan pushed a commit to branch go-team
in repository guix.
commit b2b8b05b2b71df02e386b8917829c5fe934cce06
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Thu Feb 13 17:04:15 2025 +0000
gnu: chezmoi: Update to 2.1.0.
The most of the changes are clean up for no longer required package
variants.
* gnu/packages/configuration-management.scm (chezmoi): Update to 2.1.0.
[arguments] <test-flags>: Skip failing test here instead of deleting
test files.
<phases>: Remove 'remove-failing-test-scripts.
[native-inputs]: Remove go-github-com-bmatcuk-doublestar-v2,
go-github-com-charmbracelet-glamour, go-github-com-google-go-github-v33,
go-github-com-pkg-diff, go-github-com-twpayne-go-vfs-1.0.1,
go-github-com-twpayne-go-vfsafero, and go-github-com-twpayne-go-xdg-v3;
add go-github-com-bmatcuk-doublestar-v4,
go-github-com-bradenhilton-mozillainstallhash,
go-github-com-charmbracelet-glamour-0.3,
go-github-com-google-go-github-v36, go-github-com-google-gops,
go-github-com-mitchellh-mapstructure, go-github-com-spf13-afero,
go-github-com-twpayne-go-vfs-v3, and go-github-com-twpayne-go-xdg-v6.
* gnu/packages/golanng-web.scm: (go-github-com-google-go-github-v33):
Delete variable.
(go-github-com-google-go-github-v36): New variable.
* gnu/packages/golanng-xyz.scm: (go-github-com-bmatcuk-doublestar-v2,
go-github-com-spf13-afero-1.1.2, go-github-com-twpayne-go-vfs-v4,
go-github-com-twpayne-go-vfs-1.0.1, go-github-com-twpayne-go-xdg-v3):
Delete variables.
(go-github-com-twpayne-go-xdg-v6): Do not inherit from
go-github-com-twpayne-go-xdg-v3
(go-github-com-charmbracelet-glamour-0.3,
go-github-com-twpayne-go-vfs-v3): New variables.
* gnu/packages/golanng.scm (go-github-com-twpayne-go-vfsafero): Delete
variable.
Change-Id: I0732fd7eb8d8873d53a7094e94af0cc07f2f6f61
---
gnu/packages/configuration-management.scm | 85 ++++++++++----------
gnu/packages/golang-web.scm | 12 +--
gnu/packages/golang-xyz.scm | 128 ++++++++++--------------------
gnu/packages/golang.scm | 25 ------
4 files changed, 91 insertions(+), 159 deletions(-)
diff --git a/gnu/packages/configuration-management.scm
b/gnu/packages/configuration-management.scm
index 36450ad70c..23909e272f 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -36,7 +36,7 @@
(define-public chezmoi
(package
(name "chezmoi")
- (version "1.8.10")
+ (version "2.1.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -45,64 +45,69 @@
(file-name (git-file-name name version))
(sha256
(base32
- "0ildvlq7v8vnw74y4fgnv3hpq49bpl6zh1wmakfh46crwg7ffmjb"))))
+ "1kjjbns80pcd6wh51kmhpw8xlm57cqgq205qp2i2z78n82h3fijc"))))
(build-system go-build-system)
(arguments
(list
+ #:install-source? #f
#:import-path "github.com/twpayne/chezmoi"
#:embed-files #~(list ".*\\.xml")
- #:install-source? #f
- #:phases
- #~(modify-phases %standard-phases
- ;; Remove test script which expect additional user's programs
available
- ;; in the PATH. The testdata directory is removed in the latest
version
- ;; (2.46.1) of the program.
- (add-after 'unpack 'remove-failing-test-scripts
- (lambda* (#:key import-path #:allow-other-keys)
- (for-each (lambda (f)
- (delete-file (string-append "src/" import-path
"/testdata/scripts/" f)))
- '("bitwarden.txt"
- "cd.txt"
- "cd_unix.txt"
- "completion.txt"
- "diff.txt"
- "edit.txt"
- "editconfig.txt"
- "git.txt"
- "gopass.txt"
- "keepassxc.txt"
- "lastpass.txt"
- "onepassword.txt"
- "pass.txt"
- "runscriptdir_unix.txt"
- "script_unix.txt"
- "secretgeneric.txt"
- "secretgopass.txt"
- "secretkeepassxc.txt"
- "secretlastpass.txt"
- "secretonepassword.txt"
- "secretpass.txt")))))))
+ #:test-flags
+ #~(list "-skip" (string-join
+ (list "TestScript/autocommit"
+ "TestScript/autopush"
+ "TestScript/bitwarden"
+ "TestScript/builtingit"
+ "TestScript/cd_unix"
+ "TestScript/completion"
+ "TestScript/doctor_unix"
+ "TestScript/edit"
+ "TestScript/editconfig"
+ "TestScript/git"
+ "TestScript/gopass"
+ "TestScript/init"
+ "TestScript/issue1213"
+ "TestScript/keepassxc"
+ "TestScript/lastpass"
+ "TestScript/merge_unix"
+ "TestScript/modify_unix"
+ "TestScript/onepassword"
+ "TestScript/pass"
+ "TestScript/runscriptdir_unix"
+ "TestScript/script"
+ "TestScript/script_unix"
+ "TestScript/scriptonce_unix"
+ "TestScript/scriptorder_unix"
+ "TestScript/scriptsubdir_unix"
+ "TestScript/secret"
+ "TestScript/state_unix"
+ "TestScript/templatefuncs"
+ "TestScript/update"
+ "TestScript/vault")
+ "|"))))
(native-inputs
(list go-github-com-masterminds-sprig-v3
- go-github-com-bmatcuk-doublestar-v2
- go-github-com-charmbracelet-glamour
+ go-github-com-bmatcuk-doublestar-v4
+ go-github-com-bradenhilton-mozillainstallhash
+ go-github-com-charmbracelet-glamour-0.3
go-github-com-coreos-go-semver
go-github-com-go-git-go-git-v5
- go-github-com-google-go-github-v33
+ go-github-com-google-go-github-v36
+ go-github-com-google-gops
go-github-com-google-renameio
+ go-github-com-mitchellh-mapstructure
go-github-com-muesli-combinator
go-github-com-pelletier-go-toml
- go-github-com-pkg-diff
go-github-com-rogpeppe-go-internal
go-github-com-rs-zerolog
go-github-com-sergi-go-diff
+ go-github-com-spf13-afero
go-github-com-spf13-cobra
go-github-com-spf13-viper
go-github-com-stretchr-testify
go-github-com-twpayne-go-shell
- go-github-com-twpayne-go-vfs-1.0.1
- go-github-com-twpayne-go-vfsafero
- go-github-com-twpayne-go-xdg-v3
+ go-github-com-twpayne-go-vfs-v3
+ go-github-com-twpayne-go-xdg-v6
go-github-com-zalando-go-keyring
go-go-etcd-io-bbolt
go-go-uber-org-multierr
diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 7d5249793a..c1bc0a3182 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -3444,12 +3444,12 @@ with caching and de-duplication that works across a set
of peer processes.")
GitHub API v3.")
(license license:bsd-3)))
-;; For chezmoi-1.8.10
-(define-public go-github-com-google-go-github-v33
+;; For [email protected]
+(define-public go-github-com-google-go-github-v36
(package
(inherit go-github-com-google-go-github-v31)
- (name "go-github-com-google-go-github-v33")
- (version "33.0.0")
+ (name "go-github-com-google-go-github-v36")
+ (version "36.0.0")
(source
(origin
(method git-fetch)
@@ -3458,7 +3458,7 @@ GitHub API v3.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1nzwgvaa9k1ky3sfynib6nhalam9dx66h5lxff334m9kk3rf5nn0"))
+ (base32 "041a1rmi7pipimxiwjnsd0dngzb4djmcz8a8x4xv53d3373szaj6"))
(modules '((guix build utils)))
(snippet
#~(begin
@@ -3470,7 +3470,7 @@ GitHub API v3.")
(arguments
(substitute-keyword-arguments
(package-arguments go-github-com-google-go-github-v31)
- ((#:import-path _) "github.com/google/go-github/v33")))))
+ ((#:import-path _) "github.com/google/go-github/v36")))))
(define-public go-github-com-google-go-github-v50
(package
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 87c060021a..bde432dd69 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -2084,26 +2084,6 @@ based on murmurhash.")
matching and globbing with support for \"doublestar\" patterns.")
(license license:expat)))
-;; For chezmoi-1.8.11
-(define-public go-github-com-bmatcuk-doublestar-v2
- (package
- (inherit go-github-com-bmatcuk-doublestar)
- (name "go-github-com-bmatcuk-doublestar-v2")
- (version "2.0.4")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/bmatcuk/doublestar";)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "09ma8a9rhs8dg527vjhdf3lsb6lajaq193m6ksssm2k3qajhpi94"))))
- (arguments
- (substitute-keyword-arguments
- (package-arguments go-github-com-bmatcuk-doublestar)
- ((#:import-path _) "github.com/bmatcuk/doublestar/v2")))))
-
(define-public go-github-com-bmatcuk-doublestar-v3
(package
(inherit go-github-com-bmatcuk-doublestar)
@@ -2748,6 +2728,32 @@ compatible terminals. You can create your own
stylesheet or use one of our
glamorous default themes.")
(license license:expat)))
+;; For [email protected]
+(define-public go-github-com-charmbracelet-glamour-0.3
+ (hidden-package (package (inherit go-github-com-charmbracelet-glamour)
+ (name "go-github-com-charmbracelet-glamour")
+ (version "0.3.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/charmbracelet/glamour";)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0fk7wvn0yvsvhnwz6g4q4qb42r513b66131cgk8ahzs3va6flxk3"))))
+ (arguments
+ (list
+ #:tests? #f
+ #:import-path "github.com/charmbracelet/glamour"))
+ (propagated-inputs
+ (modify-inputs (package-propagated-inputs
+ go-github-com-charmbracelet-glamour)
+ (replace "go-github-com-alecthomas-chroma-v2"
+ go-github-com-alecthomas-chroma)
+ (append go-github-com-dlclark-regexp2
+ go-github-com-olekukonko-tablewriter))))))
+
(define-public go-github-com-charmbracelet-harmonica
(package
(name "go-github-com-charmbracelet-harmonica")
@@ -14251,21 +14257,6 @@ converting them to the @code{time.Duration} type.")
"This package provides a file system abstraction for Go.")
(license license:asl2.0)))
-;; XXX: For chezmoi 1.8.10, remove it when updated.
-(define-public go-github-com-spf13-afero-1.1.2
- (hidden-package (package (inherit go-github-com-spf13-afero)
- (name "go-github-com-spf13-afero")
- (version "1.1.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/spf13/afero";)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k")))))))
-
(define-public go-github-com-spf13-cast
(package
(name "go-github-com-spf13-cast")
@@ -15197,29 +15188,11 @@ supports JSON, YAML, TOML, XML and CSV with zero
runtime dependencies.")
@code{ioutil} packages that is easy to test.")
(license license:expat)))
-;; XXX: For chezmoi 2.30.1, remove it when updated.
-(define-public go-github-com-twpayne-go-vfs-v4
- (hidden-package (package (inherit go-github-com-twpayne-go-vfs-v5)
- (name "go-github-com-twpayne-go-vfs-v4")
- (version "4.3.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/twpayne/go-vfs";)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "1hbrm6b0ca116h8mc8nkq04nba685wmp52pz5980ivvi86ji9b1y"))))
- (arguments
- (list
- #:import-path "github.com/twpayne/go-vfs/v4")))))
-
-;; XXX: For chezmoi 1.8.10, remove it when updated.
-(define-public go-github-com-twpayne-go-vfs-1.0.1
+;; For [email protected]
+(define-public go-github-com-twpayne-go-vfs-v3
(hidden-package (package (inherit go-github-com-twpayne-go-vfs-v5)
- (name "go-github-com-twpayne-go-vfs")
- (version "1.0.1")
+ (name "go-github-com-twpayne-go-vfs-v3")
+ (version "3.0.0")
(source
(origin
(method git-fetch)
@@ -15228,42 +15201,15 @@ supports JSON, YAML, TOML, XML and CSV with zero
runtime dependencies.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1if2wfdwl3h8v8kgrgywkwcjafcz7hynq8ikr52s11qf2n0w3gny"))))
- (arguments
- (list
- #:import-path "github.com/twpayne/go-vfs")))))
-
-(define-public go-github-com-twpayne-go-xdg-v3
- (package
- (name "go-github-com-twpayne-go-xdg-v3")
- (version "3.1.0")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/twpayne/go-xdg";)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0j8q7yzixs6jlaad0lpa8hs6b240gm2cmy0yxgnprrbpa0y2r7ln"))))
- (build-system go-build-system)
+ (base32 "0w7alyd2pdafny4xfi0ybpnhrwwbkb3fk73yjrwjj6h0rysvpxy2"))))
(arguments
(list
- #:import-path "github.com/twpayne/go-xdg/v3"))
+ #:import-path "github.com/twpayne/go-vfs/v3"))
(native-inputs
- (list go-github-com-stretchr-testify))
- (propagated-inputs
- (list go-github-com-twpayne-go-vfs-1.0.1))
- (home-page "https://github.com/twpayne/go-xdg/";)
- (synopsis "Functions related to freedesktop.org")
- (description
- "Package @code{xdg} provides functions related to
-@uref{freedesktop.org}.")
- (license license:expat)))
+ (list go-github-com-stretchr-testify)))))
(define-public go-github-com-twpayne-go-xdg-v6
(package
- (inherit go-github-com-twpayne-go-xdg-v3)
(name "go-github-com-twpayne-go-xdg-v6")
(version "6.1.3")
(source
@@ -15282,7 +15228,13 @@ supports JSON, YAML, TOML, XML and CSV with zero
runtime dependencies.")
(native-inputs
(list go-github-com-alecthomas-assert-v2))
(propagated-inputs
- (list go-github-com-twpayne-go-vfs-v5))))
+ (list go-github-com-twpayne-go-vfs-v5))
+ (home-page "https://github.com/twpayne/go-xdg/";)
+ (synopsis "Functions related to freedesktop.org")
+ (description
+ "Package @code{xdg} provides functions related to
+@uref{freedesktop.org}.")
+ (license license:expat)))
(define-public go-github-com-txthinking-runnergroup
(package
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index acadd6da6d..1e45a7f58d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -2116,31 +2116,6 @@ characters with their ASCII approximations.")
(description "@code{gg} is a library for rendering 2D graphics in pure
Go.")
(license license:expat)))
-(define-public go-github-com-twpayne-go-vfsafero
- (package
- (name "go-github-com-twpayne-go-vfsafero")
- (version "1.0.0")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/twpayne/go-vfsafero";)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "18jwxhlrjd06z8xzg9ij0irl4f79jfy5jpwiz6xqlhzb1fja19pw"))))
- (build-system go-build-system)
- (arguments
- `(#:import-path "github.com/twpayne/go-vfsafero"))
- (native-inputs
- (list go-github-com-twpayne-go-vfs-1.0.1 go-github-com-spf13-afero-1.1.2))
- (home-page "https://github.com/twpayne/go-vfsafero/";)
- (synopsis "Compatibility later between @code{go-vfs} and @code{afero}")
- (description
- "Package @code{vfsafero} provides a compatibility later between
-@code{go-github-com-twpayne-go-vfs} and @code{go-github-com-spf13-afero}.")
- (license license:expat)))
-
(define-public go-github-com-delthas-go-libnp
(let ((commit "0e45ece1f878f202fee2c74801e287804668f677"))
(package
