[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
62/76: gnu: chezmoi: Fix build.
From: |
guix-commits |
Subject: |
62/76: gnu: chezmoi: Fix build. |
Date: |
Mon, 15 Jul 2024 07:19:50 -0400 (EDT) |
sharlatan pushed a commit to branch go-team
in repository guix.
commit b4645c95671bc654d92e09f7c712ad3efd100507
Author: Sharlatan Hellseher <sharlatanus@gmail.com>
AuthorDate: Sun Jul 14 20:38:13 2024 +0100
gnu: chezmoi: Fix build.
* gnu/packages/configuration-management.scm (chezmoi): Fix build.
[arguments]: <#:phases>: Add 'copy-input-to-vendor-directory and
'remove-vendor-directory phases.
[native-inputs]: Remove go-github-com-alecthomas-chroma,
go-github-com-aymerick-douceur, go-github-com-chris-ramon-douceur,
go-github-com-danwakefield-fnmatch, go-github-com-dlclark-regexp2,
go-github-com-godbus-dbus, go-github-com-google-go-querystring,
go-github-com-google-goterm, go-github-com-gorilla-css,
go-github-com-lucasb-eyer-go-colorful, go-github-com-mattn-go-isatty,
go-github-com-mattn-go-runewidth,
go-github-com-microcosm-cc-bluemonday, go-github-com-muesli-reflow,
go-github-com-muesli-termenv, go-github-com-olekukonko-tablewriter,
go-github-com-twpayne-go-xdg, go-github-com-yuin-goldmark,
go-golang-org-x-net, and go-gopkg-in-errgo-fmt-errors; add
go-github-com-alecthomas-chroma-v2, go-github-com-stretchr-testify,
go-github-com-twpayne-go-xdg-v3, go-golang-org-x-sys,
go-gopkg-in-yaml-v2, and go-howett-net-plist.
Change-Id: If4baff6d3e927430a4a979ea70cd0c1534acd580
---
gnu/packages/configuration-management.scm | 58 ++++++++++++++++++++-----------
1 file changed, 37 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/configuration-management.scm
b/gnu/packages/configuration-management.scm
index cded9b0bb8..ffb6762142 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -24,6 +24,7 @@
#:use-module (guix git-download)
#:use-module (gnu packages golang)
#:use-module (gnu packages golang-build)
+ #:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-web)
#:use-module (gnu packages golang-xyz)
#:use-module (gnu packages version-control)
@@ -79,48 +80,63 @@
"secretkeepassxc.txt"
"secretlastpass.txt"
"secretonepassword.txt"
- "secretpass.txt")))))))
+ "secretpass.txt"))))
+ ;; FIXME: Pattern embedded: cannot embed directory embedded:
+ ;; contains no embeddable files.
+ ;;
+ ;; This happens due to Golang can't determine the valid directory of
+ ;; the module which is sourced during setup environment phase, but
+ ;; easy resolved after coping to expected directory "vendor" within
+ ;; the current package, see details in Golang source:
+ ;;
+ ;; - URL: <https://github.com/golang/go/blob/>
+ ;; - commit: 82c14346d89ec0eeca114f9ca0e88516b2cda454
+ ;; - file: src/cmd/go/internal/load/pkg.go#L2059
+ (add-before 'build 'copy-input-to-vendor-directory
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (mkdir "vendor")
+ (copy-recursively
+ (string-append
+ #$(this-package-native-input
"go-github-com-charmbracelet-glamour")
+ "/src/github.com")
+ "vendor/github.com")
+ (copy-recursively
+ (string-append
+ #$(this-package-native-input
"go-github-com-alecthomas-chroma-v2")
+ "/src/github.com")
+ "vendor/github.com"))))
+ (add-before 'install 'remove-vendor-directory
+ (lambda* (#:key import-path #:allow-other-keys)
+ (with-directory-excursion (string-append "src/" import-path)
+ (delete-file-recursively "vendor")))))))
(native-inputs
- (list go-github-com-alecthomas-chroma
- go-github-com-aymerick-douceur
+ (list go-github-com-alecthomas-chroma-v2
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-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-gorilla-css
- go-github-com-lucasb-eyer-go-colorful
go-github-com-masterminds-sprig-v3
- go-github-com-mattn-go-isatty
- go-github-com-mattn-go-runewidth
- go-github-com-microcosm-cc-bluemonday
- go-github-com-muesli-reflow
- go-github-com-muesli-termenv
- 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
+ go-github-com-stretchr-testify
go-github-com-twpayne-go-shell
go-github-com-twpayne-go-vfs
go-github-com-twpayne-go-vfsafero
- go-github-com-twpayne-go-xdg
- go-github-com-yuin-goldmark
+ go-github-com-twpayne-go-xdg-v3
go-github-com-zalando-go-keyring
go-github-go-git
go-go-etcd-io-bbolt
- go-golang-org-x-net
go-golang-org-x-oauth2
+ go-golang-org-x-sys
go-golang-org-x-term
- go-gopkg-in-errgo-fmt-errors))
+ go-gopkg-in-yaml-v2
+ go-howett-net-plist))
(home-page "https://www.chezmoi.io/")
(synopsis "Personal configuration files manager")
(description "This package helps to manage personal configuration files
- 50/76: gnu: govulncheck: Update to 0.0.0-20230110180137-6ad3e3d07815., (continued)
- 50/76: gnu: govulncheck: Update to 0.0.0-20230110180137-6ad3e3d07815., guix-commits, 2024/07/15
- 49/76: gnu: go-honnef-co-go-tools: Enable tests., guix-commits, 2024/07/15
- 51/76: gnu: govulncheck: Adjust package style., guix-commits, 2024/07/15
- 52/76: gnu: govulncheck: Swap inheritance with go-golang-org-x-vuln., guix-commits, 2024/07/15
- 54/76: gnu: gopls: Adjust package style, guix-commits, 2024/07/15
- 55/76: gnu: unparam: Update to 0.0.0-20240528143540-8a5130ca722f., guix-commits, 2024/07/15
- 56/76: gnu: go-github-com-dhowett-go-plist: Update to 1.0.1., guix-commits, 2024/07/15
- 58/76: gnu: go-github-com-dhowett-go-plist: Rename variable., guix-commits, 2024/07/15
- 59/76: gnu: go-github-com-twpayne-go-xdg: Rename variable., guix-commits, 2024/07/15
- 69/76: gnu: demlo: Update to 3.8-1.985f810., guix-commits, 2024/07/15
- 62/76: gnu: chezmoi: Fix build.,
guix-commits <=
- 67/76: gnu: go-pgregory-net-rapid: Use go-1.18., guix-commits, 2024/07/15
- 72/76: gnu: Remove go-github-com-go-libsecret., guix-commits, 2024/07/15
- 38/76: gnu: Add go-github-com-go-jose-go-jose-v4., guix-commits, 2024/07/15
- 39/76: gnu: Add go-github-com-yuin-goldmark-emoji., guix-commits, 2024/07/15
- 01/76: gnu: go-github-com-yuin-goldmark: Update to 1.7.4., guix-commits, 2024/07/15
- 13/76: gnu: go-golang-org-x-mod: Fix indentation., guix-commits, 2024/07/15
- 23/76: gnu: go-golang-org-x-text: Enable tests., guix-commits, 2024/07/15
- 37/76: gnu: go-github-com-go-jose-go-jose-v3: Update to 3.0.3., guix-commits, 2024/07/15
- 43/76: gnu: go-github-com-charmbracelet-glamour: Update to 0.7.0., guix-commits, 2024/07/15
- 45/76: gnu: Add go-c2sp-org-cctv-age., guix-commits, 2024/07/15