From 9ff0a399438b11a5a4e248565df3512343896e1c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 19 Sep 2024 14:00:56 +0100 Subject: 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 . * 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 --- gnu/packages/golang-crypto.scm | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) (limited to 'gnu/packages/golang-crypto.scm') diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index 016592e776..9a845612a3 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -137,33 +137,10 @@ can be ignored.") (build-system go-build-system) (arguments (list - #:import-path "filippo.io/age" - #:phases - #~(modify-phases %standard-phases - ;; FIXME: src/c2sp.org/CCTV/age/age.go:13:12: pattern testdata: - ;; cannot embed directory testdata: 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: - ;; - 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-c2sp-org-cctv-age") - "/src/c2sp.org") - "vendor/c2sp.org")))) - (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"))))))) + #:embed-files #~(list "armor.*" "header_crlf" "hmac_.*" "scrypt.*" + "stanza_.*" "stream_.*" "version_unsupported" + "x25519.*" "x25519_.*") + #:import-path "filippo.io/age")) (native-inputs (list go-c2sp-org-cctv-age go-github-com-rogpeppe-go-internal)) -- cgit v1.2.3