me/guix
Archived
1
0
Fork 0
Code Activity

gnu: chezmoi: Fix build.

Browse source 
* 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
This commit is contained in:
Sharlatan Hellseher 2024-07-14 20:38:13 +01:00
parent bfa4c98d38
commit b4645c9567
No known key found for this signature in database
GPG key ID: 76D727BFF62CD2B5
1 changed files with 37 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,7 @@
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages golang-build) #:use-module (gnu packages golang-build)
#:use-module (gnu packages golang-check)
#:use-module (gnu packages golang-web) #:use-module (gnu packages golang-web)
#:use-module (gnu packages golang-xyz) #:use-module (gnu packages golang-xyz)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
@ -79,48 +80,63 @@
"secretkeepassxc.txt" "secretkeepassxc.txt"
"secretlastpass.txt" "secretlastpass.txt"
"secretonepassword.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 (native-inputs
(list go-github-com-alecthomas-chroma (list go-github-com-alecthomas-chroma-v2
go-github-com-aymerick-douceur
go-github-com-bmatcuk-doublestar-v2 go-github-com-bmatcuk-doublestar-v2
go-github-com-charmbracelet-glamour go-github-com-charmbracelet-glamour
go-github-com-chris-ramon-douceur
go-github-com-coreos-go-semver 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-github-v33
go-github-com-google-go-querystring
go-github-com-google-goterm
go-github-com-google-renameio 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-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-pelletier-go-toml
go-github-com-pkg-diff go-github-com-pkg-diff
go-github-com-rogpeppe-go-internal go-github-com-rogpeppe-go-internal
go-github-com-sergi-go-diff go-github-com-sergi-go-diff
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-twpayne-go-shell go-github-com-twpayne-go-shell
go-github-com-twpayne-go-vfs go-github-com-twpayne-go-vfs
go-github-com-twpayne-go-vfsafero go-github-com-twpayne-go-vfsafero
go-github-com-twpayne-go-xdg go-github-com-twpayne-go-xdg-v3
go-github-com-yuin-goldmark
go-github-com-zalando-go-keyring go-github-com-zalando-go-keyring
go-github-go-git go-github-go-git
go-go-etcd-io-bbolt go-go-etcd-io-bbolt
go-golang-org-x-net
go-golang-org-x-oauth2 go-golang-org-x-oauth2
go-golang-org-x-sys
go-golang-org-x-term 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/") (home-page "https://www.chezmoi.io/")
(synopsis "Personal configuration files manager") (synopsis "Personal configuration files manager")
(description "This package helps to manage personal configuration files (description "This package helps to manage personal configuration files