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/version-control.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu/packages/version-control.scm') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 9a703e9bbc..c892a83a98 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3686,6 +3686,7 @@ (define-public git-lfs (build-system go-build-system) (arguments (list + #:embed-files #~(list "children" "nodes" "text") #:import-path "github.com/git-lfs/git-lfs" #:install-source? #f #:phases @@ -3695,13 +3696,6 @@ (define-public git-lfs (substitute* "src/github.com/git-lfs/git-lfs/lfs/hook.go" (("/bin/sh") (search-input-file inputs "bin/sh"))))) - (add-after 'unpack 'fix-embed-x-net - (lambda _ - (delete-file-recursively "src/golang.org/x/net/publicsuffix/data") - (copy-recursively - #$(file-append (this-package-input "go-golang-org-x-net") - "/src/golang.org/x/net/publicsuffix/data") - "src/golang.org/x/net/publicsuffix/data"))) ;; Only build the man pages if ruby-asciidoctor is available. #$@(if (this-package-native-input "ruby-asciidoctor") #~((add-before 'build 'man-gen -- cgit v1.2.3