mirror/guix
mirror/guix
1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-14 19:10:49 +02:00
Code Releases Activity

gnu: chezmoi: Update to 2.1.0.

Browse source 
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
This commit is contained in:
Sharlatan Hellseher 2025-02-13 17:04:15 +00:00
parent 18325898bb
commit 7a6da937bd
No known key found for this signature in database
GPG key ID: 76D727BFF62CD2B5
4 changed files with 91 additions and 159 deletions
Download patch file Download diff file Expand all files Collapse all files

85
gnu/packages/configuration-management.scm
View file

@ -40,7 +40,7 @@
(define-public chezmoi (define-public chezmoi
(package (package
(name "chezmoi") (name "chezmoi")
(version "1.8.10") (version "2.1.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -49,64 +49,69 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0ildvlq7v8vnw74y4fgnv3hpq49bpl6zh1wmakfh46crwg7ffmjb")))) "1kjjbns80pcd6wh51kmhpw8xlm57cqgq205qp2i2z78n82h3fijc"))))
(build-system go-build-system) (build-system go-build-system)
(arguments (arguments
(list (list
#:install-source? #f
#:import-path "github.com/twpayne/chezmoi" #:import-path "github.com/twpayne/chezmoi"
#:embed-files #~(list ".*\\.xml") #:embed-files #~(list ".*\\.xml")
#:install-source? #f #:test-flags
#:phases #~(list "-skip" (string-join
#~(modify-phases %standard-phases (list "TestScript/autocommit"
;; Remove test script which expect additional user's programs available "TestScript/autopush"
;; in the PATH. The testdata directory is removed in the latest version "TestScript/bitwarden"
;; (2.46.1) of the program. "TestScript/builtingit"
(add-after 'unpack 'remove-failing-test-scripts "TestScript/cd_unix"
(lambda* (#:key import-path #:allow-other-keys) "TestScript/completion"
(for-each (lambda (f) "TestScript/doctor_unix"
(delete-file (string-append "src/" import-path "/testdata/scripts/" f))) "TestScript/edit"
'("bitwarden.txt" "TestScript/editconfig"
"cd.txt" "TestScript/git"
"cd_unix.txt" "TestScript/gopass"
"completion.txt" "TestScript/init"
"diff.txt" "TestScript/issue1213"
"edit.txt" "TestScript/keepassxc"
"editconfig.txt" "TestScript/lastpass"
"git.txt" "TestScript/merge_unix"
"gopass.txt" "TestScript/modify_unix"
"keepassxc.txt" "TestScript/onepassword"
"lastpass.txt" "TestScript/pass"
"onepassword.txt" "TestScript/runscriptdir_unix"
"pass.txt" "TestScript/script"
"runscriptdir_unix.txt" "TestScript/script_unix"
"script_unix.txt" "TestScript/scriptonce_unix"
"secretgeneric.txt" "TestScript/scriptorder_unix"
"secretgopass.txt" "TestScript/scriptsubdir_unix"
"secretkeepassxc.txt" "TestScript/secret"
"secretlastpass.txt" "TestScript/state_unix"
"secretonepassword.txt" "TestScript/templatefuncs"
"secretpass.txt"))))))) "TestScript/update"
"TestScript/vault")
"|"))))
(native-inputs (native-inputs
(list go-github-com-masterminds-sprig-v3 (list go-github-com-masterminds-sprig-v3
go-github-com-bmatcuk-doublestar-v2 go-github-com-bmatcuk-doublestar-v4
go-github-com-charmbracelet-glamour go-github-com-bradenhilton-mozillainstallhash
go-github-com-charmbracelet-glamour-0.3
go-github-com-coreos-go-semver go-github-com-coreos-go-semver
go-github-com-go-git-go-git-v5 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-google-renameio
go-github-com-mitchellh-mapstructure
go-github-com-muesli-combinator go-github-com-muesli-combinator
go-github-com-pelletier-go-toml go-github-com-pelletier-go-toml
go-github-com-pkg-diff
go-github-com-rogpeppe-go-internal go-github-com-rogpeppe-go-internal
go-github-com-rs-zerolog go-github-com-rs-zerolog
go-github-com-sergi-go-diff go-github-com-sergi-go-diff
go-github-com-spf13-afero
go-github-com-spf13-cobra go-github-com-spf13-cobra
go-github-com-spf13-viper go-github-com-spf13-viper
go-github-com-stretchr-testify go-github-com-stretchr-testify
go-github-com-twpayne-go-shell go-github-com-twpayne-go-shell
go-github-com-twpayne-go-vfs-1.0.1 go-github-com-twpayne-go-vfs-v3
go-github-com-twpayne-go-vfsafero go-github-com-twpayne-go-xdg-v6
go-github-com-twpayne-go-xdg-v3
go-github-com-zalando-go-keyring go-github-com-zalando-go-keyring
go-go-etcd-io-bbolt go-go-etcd-io-bbolt
go-go-uber-org-multierr go-go-uber-org-multierr

12
gnu/packages/golang-web.scm
View file

@ -3444,12 +3444,12 @@ with caching and de-duplication that works across a set of peer processes.")
GitHub API v3.") GitHub API v3.")
(license license:bsd-3))) (license license:bsd-3)))
;; For chezmoi-1.8.10 ;; For chezmoi@2.1.0
(define-public go-github-com-google-go-github-v33 (define-public go-github-com-google-go-github-v36
(package (package
(inherit go-github-com-google-go-github-v31) (inherit go-github-com-google-go-github-v31)
(name "go-github-com-google-go-github-v33") (name "go-github-com-google-go-github-v36")
(version "33.0.0") (version "36.0.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3458,7 +3458,7 @@ GitHub API v3.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1nzwgvaa9k1ky3sfynib6nhalam9dx66h5lxff334m9kk3rf5nn0")) (base32 "041a1rmi7pipimxiwjnsd0dngzb4djmcz8a8x4xv53d3373szaj6"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
#~(begin #~(begin
@ -3470,7 +3470,7 @@ GitHub API v3.")
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments
(package-arguments go-github-com-google-go-github-v31) (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 (define-public go-github-com-google-go-github-v50
(package (package

128
gnu/packages/golang-xyz.scm
View file

@ -2087,26 +2087,6 @@ based on murmurhash.")
matching and globbing with support for \"doublestar\" patterns.") matching and globbing with support for \"doublestar\" patterns.")
(license license:expat))) (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 (define-public go-github-com-bmatcuk-doublestar-v3
(package (package
(inherit go-github-com-bmatcuk-doublestar) (inherit go-github-com-bmatcuk-doublestar)
@ -2751,6 +2731,32 @@ compatible terminals. You can create your own stylesheet or use one of our
glamorous default themes.") glamorous default themes.")
(license license:expat))) (license license:expat)))
;; For chezmoi@2.1.0
(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 (define-public go-github-com-charmbracelet-harmonica
(package (package
(name "go-github-com-charmbracelet-harmonica") (name "go-github-com-charmbracelet-harmonica")
@ -14284,21 +14290,6 @@ converting them to the @code{time.Duration} type.")
"This package provides a file system abstraction for Go.") "This package provides a file system abstraction for Go.")
(license license:asl2.0))) (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 (define-public go-github-com-spf13-cast
(package (package
(name "go-github-com-spf13-cast") (name "go-github-com-spf13-cast")
@ -15230,11 +15221,11 @@ supports JSON, YAML, TOML, XML and CSV with zero runtime dependencies.")
@code{ioutil} packages that is easy to test.") @code{ioutil} packages that is easy to test.")
(license license:expat))) (license license:expat)))
;; XXX: For chezmoi 2.30.1, remove it when updated. ;; For chezmoi@2.1.0
(define-public go-github-com-twpayne-go-vfs-v4 (define-public go-github-com-twpayne-go-vfs-v3
(hidden-package (package (inherit go-github-com-twpayne-go-vfs-v5) (hidden-package (package (inherit go-github-com-twpayne-go-vfs-v5)
(name "go-github-com-twpayne-go-vfs-v4") (name "go-github-com-twpayne-go-vfs-v3")
(version "4.3.0") (version "3.0.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -15243,60 +15234,15 @@ supports JSON, YAML, TOML, XML and CSV with zero runtime dependencies.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1hbrm6b0ca116h8mc8nkq04nba685wmp52pz5980ivvi86ji9b1y")))) (base32 "0w7alyd2pdafny4xfi0ybpnhrwwbkb3fk73yjrwjj6h0rysvpxy2"))))
(arguments (arguments
(list (list
#:import-path "github.com/twpayne/go-vfs/v4"))))) #:import-path "github.com/twpayne/go-vfs/v3"))
;; XXX: For chezmoi 1.8.10, remove it when updated.
(define-public go-github-com-twpayne-go-vfs-1.0.1
(hidden-package (package (inherit go-github-com-twpayne-go-vfs-v5)
(name "go-github-com-twpayne-go-vfs")
(version "1.0.1")
(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 "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)
(arguments
(list
#:import-path "github.com/twpayne/go-xdg/v3"))
(native-inputs (native-inputs
(list go-github-com-stretchr-testify)) (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)))
(define-public go-github-com-twpayne-go-xdg-v6 (define-public go-github-com-twpayne-go-xdg-v6
(package (package
(inherit go-github-com-twpayne-go-xdg-v3)
(name "go-github-com-twpayne-go-xdg-v6") (name "go-github-com-twpayne-go-xdg-v6")
(version "6.1.3") (version "6.1.3")
(source (source
@ -15315,7 +15261,13 @@ supports JSON, YAML, TOML, XML and CSV with zero runtime dependencies.")
(native-inputs (native-inputs
(list go-github-com-alecthomas-assert-v2)) (list go-github-com-alecthomas-assert-v2))
(propagated-inputs (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 (define-public go-github-com-txthinking-runnergroup
(package (package

25
gnu/packages/golang.scm
View file

@ -2116,31 +2116,6 @@ characters with their ASCII approximations.")
(description "@code{gg} is a library for rendering 2D graphics in pure Go.") (description "@code{gg} is a library for rendering 2D graphics in pure Go.")
(license license:expat))) (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 (define-public go-github-com-delthas-go-libnp
(let ((commit "0e45ece1f878f202fee2c74801e287804668f677")) (let ((commit "0e45ece1f878f202fee2c74801e287804668f677"))
(package (package