diff options
author | Sharlatan Hellseher <sharlatanus@gmail.com> | 2024-09-19 14:00:56 +0100 |
---|---|---|
committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2024-11-09 21:33:51 +0000 |
commit | 9ff0a399438b11a5a4e248565df3512343896e1c (patch) | |
tree | 1565cb6abb41c774c9195f9b17fcd3ffb41552f9 /gnu/packages/textutils.scm | |
parent | 922d0170818b6f9ba55b6202825f689b645419eb (diff) |
gnu: build/go: Apply default 'fix-embed-files phase.
These changes remove redundant phases where files, requiring to be embed
during build or check phases, are copied to the build directory as
proposed in <https://issues.guix.gnu.org/73299>.
* gnu/packages/backup.scm (restic-rest-server) [arguments]: <#:phases>:
Remove 'fix-embed-files phase.
* gnu/packages/configuration-management.scm (chezmoi): Likewise.
* gnu/packages/packages/golang-build.scm (go-github-com-golang-protobuf): Likewise.
* gnu/packages/golang-web.scm (go-github-com-go-openapi-loads,
go-github-com-go-openapi-runtime, go-github-com-golang-groupcache): Likewise.
* gnu/packages/golang-xyz.scm (go-github-com-dgraph-io-badger): Likewise.
* gnu/packages/golang.scm (go-github-com-ssgelm-cookiejarparser): Likewise.
* gnu/packages/ipfs.scm (go-github-com-ipfs-go-ds-badger,
go-github-com-libp2p-go-libp2p, kubo): Likewise.
* gnu/packages/irc.scm (soju): Likewise.
* gnu/packages/networking.scm (nebula): Likewise.
* gnu/packages/prometheus.scm (go-github-com-nbrownus-go-metrics-prometheus,
go-github-com-prometheus-client-golang, go-github-com-prometheus-common,
go-github-com-prometheus-common-sigv4, go-github-com-prometheus-exporter-toolkit,
go-github-com-prometheus-statsd-exporter): Likewise
* gnu/packages/version-control.scm (git-lfs): Likewise.
* gnu/packages/web.scm (miniflux): Likewise.
* gnu/packages/golang-crypto.scm (go-filippo-io-age): [arguments]:
<#:phases>: Remove 'copy-input-to-vendor-direcotyr and
'remove-vendor-directory phases.
* gnu/packages/golang-web.scm (go-github-com-go-openapi-analysis,
go-github-com-go-openapi-analysis, go-github-com-go-openapi-validate): Likewise.
* gnu/packages/golang.scm (go-github-com-charmbracelet-glamour): Likewise.
* gnu/packages/textutils.scm (vale): Likewise.
Change-Id: Ic2ec01c8caf86f3ae69d7a1812c1e0b78a549e91
Diffstat (limited to 'gnu/packages/textutils.scm')
-rw-r--r-- | gnu/packages/textutils.scm | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index deebd893d6..22a40866c9 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1517,6 +1517,7 @@ of a Unix terminal to HTML code.") (arguments (list #:install-source? #f + #:embed-files #~(list ".*\\.gob") #:import-path "github.com/errata-ai/vale/cmd/vale" #:unpack-path "github.com/errata-ai/vale" #:phases @@ -1536,26 +1537,6 @@ of a Unix terminal to HTML code.") (("TestLocalZip") "OffTestLocalZip") (("TestNoPkgFound") "OffTestNoPkgFound") (("TestV3Pkg") "OffTestV3Pkg"))))) - ;; 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 unpack-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" unpack-path) - (mkdir "vendor") - (copy-recursively - (string-append - #$(this-package-native-input "go-github-com-jdkato-twine") - "/src/github.com") - "vendor/github.com")))) ;; XXX: Workaround for go-build-system's lack of Go modules ;; support. (replace 'check @@ -1563,11 +1544,7 @@ of a Unix terminal to HTML code.") (when tests? (with-directory-excursion (string-append "src/" unpack-path) (setenv "HOME" "/tmp") - (invoke "go" "test" "-v" "./..."))))) - (add-before 'install 'remove-vendor-directory - (lambda* (#:key unpack-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" unpack-path) - (delete-file-recursively "vendor"))))))) + (invoke "go" "test" "-v" "./...")))))))) (native-inputs (list go-github-com-masterminds-sprig-v3 go-github-com-adrg-strutil |