diff options
author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-02-25 10:28:03 +0100 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-02-25 10:28:03 +0100 |
commit | 7bf4ce4582cd2f9c5b30c547262c1c4a426c0b9b (patch) | |
tree | c6f9cc83feaaf685b7542a98e60bc24ea7c297b1 /gnu/packages/configuration-management.scm | |
parent | 06d01c610e3bee61e38a177aecda5982d5b338ae (diff) | |
parent | 92d8b4c9598ed32cdb6630433d5914c1ae8b7146 (diff) |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/packages/configuration-management.scm')
-rw-r--r-- | gnu/packages/configuration-management.scm | 87 |
1 files changed, 58 insertions, 29 deletions
diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index 6632f429e2..de27f50e0c 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -23,6 +23,7 @@ #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-web) + #:use-module (gnu packages golang-xyz) #:use-module (gnu packages version-control) #:use-module (gnu packages textutils) #:use-module ((guix licenses) #:prefix license:) @@ -32,9 +33,7 @@ (define-public chezmoi (package (name "chezmoi") - ;; XXX: Make sure 7f238faa61e46d79b54d4d0ea8f0b5fc27db84b2 applied before - ;; version update, which should fix @code{password-store} integration. - (version "1.8.1") + (version "1.8.10") (source (origin (method git-fetch) (uri (git-reference @@ -43,47 +42,78 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1b8y0wq3myhvjdnwl0i4x85iil7i7kmsjajvbw1a47afm83jkbaw")))) + "0ildvlq7v8vnw74y4fgnv3hpq49bpl6zh1wmakfh46crwg7ffmjb")))) (build-system go-build-system) (arguments `(#:import-path "github.com/twpayne/chezmoi" - ;; We don't need to install the source code for end-user applications. - #:install-source? #f)) + #: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"))))))) (native-inputs - (list go-github-com-masterminds-sprig - go-github-com-masterminds-goutils - go-github-com-masterminds-semver - go-github-com-google-uuid - go-github-com-huandu-xstrings - go-github-com-imdario-mergo - go-github-com-mitchellh-reflectwalk - go-github-com-mitchellh-copystructure - go-github-com-bmatcuk-doublestar - go-github-com-charmbracelet-glamour + (list go-etcd-io-bbolt go-github-com-alecthomas-chroma + go-github-com-aymerick-douceur + go-github-com-bmatcuk-doublestar-v2 + go-github-com-charmbracelet-glamour + go-github-com-chris-ramon-douceur go-github-com-coreos-go-semver go-github-com-danwakefield-fnmatch go-github-com-dlclark-regexp2 - go-github-go-git - go-github-com-google-go-github + go-github-com-godbus-dbus + go-github-com-google-go-github-v33 go-github-com-google-go-querystring + go-github-com-google-goterm go-github-com-google-renameio - go-github-com-microcosm-cc-bluemonday - go-github-com-aymerick-douceur - go-github-com-chris-ramon-douceur + go-github-com-google-uuid go-github-com-gorilla-css + go-github-com-huandu-xstrings + go-github-com-imdario-mergo + go-github-com-lucasb-eyer-go-colorful + go-github-com-masterminds-goutils + go-github-com-masterminds-semver + go-github-com-masterminds-sprig + go-github-com-mattn-go-isatty + go-github-com-mattn-go-runewidth + go-github-com-microcosm-cc-bluemonday + go-github-com-mitchellh-copystructure + go-github-com-mitchellh-reflectwalk go-github-com-muesli-reflow-ansi - go-github-com-muesli-reflow-wordwrap go-github-com-muesli-reflow-indent go-github-com-muesli-reflow-padding + go-github-com-muesli-reflow-wordwrap go-github-com-muesli-termenv - go-github-com-google-goterm - go-github-com-lucasb-eyer-go-colorful - go-github-com-mattn-go-isatty - go-github-com-mattn-go-runewidth go-github-com-olekukonko-tablewriter go-github-com-pelletier-go-toml go-github-com-pkg-diff + go-github-com-rogpeppe-go-internal go-github-com-sergi-go-diff go-github-com-spf13-cobra go-github-com-spf13-viper @@ -93,12 +123,11 @@ go-github-com-twpayne-go-xdg go-github-com-yuin-goldmark go-github-com-zalando-go-keyring - go-github-com-godbus-dbus - go-etcd-io-bbolt + go-github-go-git go-golang-org-x-crypto go-golang-org-x-net go-golang-org-x-oauth2 - go-github-com-rogpeppe-go-internal + go-golang-org-x-term go-gopkg-in-errgo-fmt-errors)) (home-page "https://www.chezmoi.io/") (synopsis "Personal configuration files manager") |