From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] srcpkgs/: most Go packages shouldn't have git in hostmakedepends.
Date: Fri, 19 Feb 2021 05:32:56 +0100 [thread overview]
Message-ID: <20210219043256.AtCIUCBXaHtVMYxx-BKThsXCy6woACNS0zRYvqHsKrs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28863@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 888 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages goclean
https://github.com/void-linux/void-packages/pull/28863
[WIP] srcpkgs/: most Go packages shouldn't have git in hostmakedepends.
Depending on git for building can sometimes happen due to issue #27690,
where instead of using the unpacked tarball, Go clones the package's
repository itself, since the tarball we provided doesn't contain the
go_import_path we pass to it in the command line.
Since we should require as few dependencies as possible, and this
measure can help catch issues of building the wrong version of a Go
package, we remove git from hostmakedepends where possible.
I'm still pulling in packages that do this, will take a while.
A patch file from https://github.com/void-linux/void-packages/pull/28863.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-goclean-28863.patch --]
[-- Type: text/x-diff, Size: 24179 bytes --]
From 01ee0f99300f8d952879e846fc90e7eb1fbfab16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 00:55:24 -0300
Subject: [PATCH 1/7] srcpkgs/: clean up Go packages.
Fix small typos, expand some variables, leave comments for updates.
---
srcpkgs/antibody/template | 2 +-
srcpkgs/caddy/template | 1 +
srcpkgs/chezmoi/template | 2 +-
srcpkgs/consul-template/template | 2 +-
srcpkgs/consul/template | 2 +-
srcpkgs/crane/template | 2 +-
srcpkgs/dep/template | 2 +-
srcpkgs/docker-gen/template | 2 +-
srcpkgs/flint/template | 2 +-
srcpkgs/forego/template | 2 +-
srcpkgs/gendesk/template | 2 +-
srcpkgs/git-lfs/template | 2 +-
srcpkgs/gkill/template | 2 +-
srcpkgs/glock/template | 2 +-
srcpkgs/go-ipfs/template | 4 ++--
srcpkgs/hugo/template | 4 ++--
srcpkgs/lego/template | 4 ++--
srcpkgs/massren/template | 4 ++--
srcpkgs/micro/template | 2 +-
srcpkgs/nomad/template | 4 ++--
srcpkgs/peco/template | 2 +-
srcpkgs/sift/template | 2 +-
srcpkgs/tag/template | 4 ++--
srcpkgs/terragrunt/template | 2 +-
srcpkgs/vault/template | 4 ++--
srcpkgs/webcat/template | 2 +-
srcpkgs/websocketd/template | 2 +-
27 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/srcpkgs/antibody/template b/srcpkgs/antibody/template
index 7071501830c..cb109f0b183 100644
--- a/srcpkgs/antibody/template
+++ b/srcpkgs/antibody/template
@@ -9,7 +9,7 @@ short_desc="Fast and lightweight shell plugin manager"
maintainer="SolitudeSF <solitudesf@protonmail.com>"
license="MIT"
homepage="https://getantibody.github.io/"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
+distfiles="https://github.com/getantibody/antibody/archive/v${version}.tar.gz"
checksum=87bced5fba8cf5d587ea803d33dda72e8bcbd4e4c9991a9b40b2de4babbfc24f
post_install() {
diff --git a/srcpkgs/caddy/template b/srcpkgs/caddy/template
index dbae7057566..6fe986419c9 100644
--- a/srcpkgs/caddy/template
+++ b/srcpkgs/caddy/template
@@ -3,6 +3,7 @@ pkgname=caddy
version=1.0.5
revision=1
build_style=go
+# XXX: use caddy/v2 when updating
go_import_path=github.com/caddyserver/caddy
go_package="${go_import_path}/caddy"
hostmakedepends="git"
diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template
index 5c6d47e5abc..64326d00b13 100644
--- a/srcpkgs/chezmoi/template
+++ b/srcpkgs/chezmoi/template
@@ -12,7 +12,7 @@ short_desc="Manage your dotfiles across multiple machines, securely"
maintainer="Abigail G <dev@kb6.ee>"
license="MIT"
homepage="https://chezmoi.io/"
-distfiles="https://github.com/twpayne/${pkgname}/archive/v${version}.tar.gz"
+distfiles="https://github.com/twpayne/chezmoi/archive/v${version}.tar.gz"
checksum=23515591028202aaf7af908e38972f156ee08022f535bc74aaa9244b82da2fa1
post_install() {
diff --git a/srcpkgs/consul-template/template b/srcpkgs/consul-template/template
index 3d490804ba2..00cd77f3416 100644
--- a/srcpkgs/consul-template/template
+++ b/srcpkgs/consul-template/template
@@ -3,7 +3,7 @@ pkgname=consul-template
version=0.25.1
revision=1
build_style=go
-go_import_path="github.com/hashicorp/$pkgname"
+go_import_path="github.com/hashicorp/consul-template"
hostmakedepends="git"
short_desc="Template rendering, notifier, and supervisor for Consul and Vault data"
maintainer="Noel Cower <ncower@nil.dev>"
diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template
index e55c4d587fd..b6fd558b9c3 100644
--- a/srcpkgs/consul/template
+++ b/srcpkgs/consul/template
@@ -3,7 +3,7 @@ pkgname=consul
version=1.8.4
revision=1
build_style=go
-go_import_path="github.com/hashicorp/${pkgname}"
+go_import_path="github.com/hashicorp/consul"
_git_commit=9ea1a204d832cfd4d8c5cba9df56876a526a4531
go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}"
# consul has a vendor directory, but relies on replace statements in go.mod, so
diff --git a/srcpkgs/crane/template b/srcpkgs/crane/template
index 0a19c2a68a8..edb04e896ae 100644
--- a/srcpkgs/crane/template
+++ b/srcpkgs/crane/template
@@ -8,7 +8,7 @@ short_desc="Lift containers with ease"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
go_import_path="github.com/michaelsauter/crane"
-homepage="https://${go_import_path}"
+homepage="https://github.com/michaelsauter/crane"
distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=00f202783ae2ef3a2d0e02fba0454defe53e823b4c99e2e3b5af734dc870906e
diff --git a/srcpkgs/dep/template b/srcpkgs/dep/template
index f2a886bc66a..79cce541059 100644
--- a/srcpkgs/dep/template
+++ b/srcpkgs/dep/template
@@ -11,7 +11,7 @@ depends="git go"
short_desc="Go dependency management tool"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="BSD-3-Clause"
-homepage="https://${go_import_path}"
+homepage="https://github.com/golang/dep"
distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=929c8f759838f98323211ba408a831ea80d93b75beda8584b6d950f393a3298a
diff --git a/srcpkgs/docker-gen/template b/srcpkgs/docker-gen/template
index 9256fde323a..8a1ab6c3381 100644
--- a/srcpkgs/docker-gen/template
+++ b/srcpkgs/docker-gen/template
@@ -9,7 +9,7 @@ go_import_path="github.com/jwilder/docker-gen"
go_package="${go_import_path}/cmd/docker-gen"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
-homepage="https://$go_import_path"
+homepage="https://github.com/jwilder/docker-gen"
distfiles="$homepage/archive/$version.tar.gz"
checksum=7951b63684e4ace9eab4f87f0c5625648f8add2559fa7779fabdb141a8a83908
diff --git a/srcpkgs/flint/template b/srcpkgs/flint/template
index 1b8ae9d964c..9a6b0d8c0aa 100644
--- a/srcpkgs/flint/template
+++ b/srcpkgs/flint/template
@@ -8,7 +8,7 @@ short_desc="Check your project for common sources of contributor friction"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
go_import_path="github.com/pengwynn/flint"
-homepage="https://${go_import_path}"
+homepage="https://github.com/pengwynn/flint"
distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=ec865ec5cad191c7fc9c7c6d5007754372696a708825627383913367f3ef8b7f
diff --git a/srcpkgs/forego/template b/srcpkgs/forego/template
index 6f239f15efc..315153aef00 100644
--- a/srcpkgs/forego/template
+++ b/srcpkgs/forego/template
@@ -8,6 +8,6 @@ short_desc="A process supervisor in Go"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
go_import_path="github.com/ddollar/forego"
-homepage="https://$go_import_path"
+homepage="https://github.com/ddollar/forego"
distfiles="$homepage/archive/$version.tar.gz"
checksum=23119550cc0e45191495823aebe28b42291db6de89932442326340042359b43d
diff --git a/srcpkgs/gendesk/template b/srcpkgs/gendesk/template
index 1c2d600d23d..51904d9d14d 100644
--- a/srcpkgs/gendesk/template
+++ b/srcpkgs/gendesk/template
@@ -10,7 +10,7 @@ short_desc="Utility to generate .desktop files and download icons"
maintainer="Benjamín Albiñana <benalb@gmail.com>"
license="MIT"
homepage="http://roboticoverlords.org/gendesk/"
-distfiles="https://github.com/xyproto/${pkgname}/archive/${version}.tar.gz
+distfiles="https://github.com/xyproto/gendesk/archive/${version}.tar.gz
http://roboticoverlords.org/images/default.png"
checksum="924606ca1c15a140b70f363c4a0ac46fb3ad4d05bc39db400d0b0e41dd4456bb
4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837"
diff --git a/srcpkgs/git-lfs/template b/srcpkgs/git-lfs/template
index 588d7fe9aa3..81f99bef217 100644
--- a/srcpkgs/git-lfs/template
+++ b/srcpkgs/git-lfs/template
@@ -9,7 +9,7 @@ short_desc="Git extension for versioning large files"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="MIT"
homepage="https://git-lfs.github.com/"
-distfiles="https://github.com/git-lfs/${pkgname}/archive/v${version}.tar.gz"
+distfiles="https://github.com/git-lfs/git-lfs/archive/v${version}.tar.gz"
checksum=2b2e70f1233f7efe9a010771510391a07527ec7c0af721ecf8edabac5d60f62b
post_build() {
diff --git a/srcpkgs/gkill/template b/srcpkgs/gkill/template
index f2b9ae64a20..6c9d5adafa4 100644
--- a/srcpkgs/gkill/template
+++ b/srcpkgs/gkill/template
@@ -8,7 +8,7 @@ short_desc="Easy Process Killer"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
go_import_path="github.com/heppu/gkill"
-homepage="https://$go_import_path"
+homepage="https://github.com/heppu/gkill"
distfiles="$homepage/archive/v$version.tar.gz"
checksum=aee86f1e18a88ecd3024c6deb3dbd6a2e385961ad8365046dc2b64596bdbb84b
diff --git a/srcpkgs/glock/template b/srcpkgs/glock/template
index 6cd6cc4c5d8..3d5eb4ea734 100644
--- a/srcpkgs/glock/template
+++ b/srcpkgs/glock/template
@@ -11,6 +11,6 @@ go_import_path="github.com/robfig/glock"
go_package="${go_import_path}"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Public Domain"
-homepage="https://$go_import_path"
+homepage="https://github.com/robfig/glock"
distfiles="$homepage/archive/$_commit.tar.gz"
checksum=b8fea16ccdfa4a927a8590753d44ca5bb610561f3b9e09cc1e501ef5c9351dc9
diff --git a/srcpkgs/go-ipfs/template b/srcpkgs/go-ipfs/template
index 4f0a7e98403..321d7015598 100644
--- a/srcpkgs/go-ipfs/template
+++ b/srcpkgs/go-ipfs/template
@@ -3,7 +3,7 @@ pkgname=go-ipfs
version=0.7.0
revision=2
build_style=go
-go_import_path="github.com/ipfs/${pkgname}"
+go_import_path="github.com/ipfs/go-ipfs"
go_package="${go_import_path}/cmd/ipfs"
hostmakedepends="git"
depends="fs-repo-migrations>=1.6.4"
@@ -12,7 +12,7 @@ maintainer="Christopher Brannon <chris@the-brannons.com>"
license="MIT, Apache-2.0"
homepage="https://ipfs.io"
changelog="https://github.com/ipfs/go-ipfs/blob/master/CHANGELOG.md"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
+distfiles="https://github.com/ipfs/go-ipfs/archive/v${version}.tar.gz"
checksum=152986ebb30657ab706bee708fbe929114f5e8c39fbe602e3bbec93fe74c9123
system_accounts="_ipfs"
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index 9b4818c6467..8abec86a971 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -3,7 +3,7 @@ pkgname=hugo
version=0.80.0
revision=1
build_style=go
-go_import_path="github.com/gohugoio/${pkgname}"
+go_import_path="github.com/gohugoio/hugo"
go_build_tags="$(vopt_if extended extended)"
hostmakedepends="git"
depends="$(vopt_if pygments python-Pygments)"
@@ -11,7 +11,7 @@ short_desc="Fast & Modern Static Website Engine"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
homepage="https://gohugo.io"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
+distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
checksum=4ddcd6ebea21e5fd4067db4a481ab7810e34496d5991a3520169c8f5ee1d38bb
build_options="pygments extended"
diff --git a/srcpkgs/lego/template b/srcpkgs/lego/template
index a71ffb026e3..573dbdf943b 100644
--- a/srcpkgs/lego/template
+++ b/srcpkgs/lego/template
@@ -3,8 +3,8 @@ pkgname=lego
version=4.0.1
revision=1
build_style=go
-go_import_path="github.com/go-acme/${pkgname}/v4"
-go_package="${go_import_path}/cmd/${pkgname}"
+go_import_path="github.com/go-acme/lego/v4"
+go_package="${go_import_path}/cmd/lego"
hostmakedepends="git"
short_desc="Let's Encrypt client and ACME library written in Go"
maintainer="Anachron <gith@cron.world>"
diff --git a/srcpkgs/massren/template b/srcpkgs/massren/template
index db3941c7170..d3f4250b2ec 100644
--- a/srcpkgs/massren/template
+++ b/srcpkgs/massren/template
@@ -7,8 +7,8 @@ hostmakedepends="git"
short_desc="Massive renamer from command line"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
-go_import_path="github.com/laurent22/${pkgname}"
-homepage="https://${go_import_path}"
+go_import_path="github.com/laurent22/massren"
+homepage="https://github.com/laurent22/massren"
distfiles="$homepage/archive/v$version.tar.gz"
checksum=7a728d96a9e627c3609d147db64bba60ced33c407c75e9512147a5c83ba94f56
diff --git a/srcpkgs/micro/template b/srcpkgs/micro/template
index 27b87e22b7f..c0a2842eb85 100644
--- a/srcpkgs/micro/template
+++ b/srcpkgs/micro/template
@@ -6,7 +6,7 @@ build_style=go
go_import_path="github.com/zyedidia/micro/v2"
go_package="${go_import_path}/cmd/micro"
go_ldflags="-X github.com/zyedidia/micro/v2/internal/util.Version=${version}"
-# Adding CompuileDate is bad reproducibility and adding CommitHash
+# Adding CompileDate is bad for reproducibility and adding CommitHash
# is redundant as we use a tag to build the package.
hostmakedepends="git"
short_desc="Modern and intuitive terminal-based text editor"
diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template
index 9ed33f12a0a..ddaf4f6b78e 100644
--- a/srcpkgs/nomad/template
+++ b/srcpkgs/nomad/template
@@ -3,7 +3,7 @@ pkgname=nomad
version=1.0.1
revision=1
build_style=go
-go_import_path="github.com/hashicorp/${pkgname}"
+go_import_path="github.com/hashicorp/nomad"
go_build_tags="ui release"
_git_commit=a480eed0815c54612856d9115a34bb1d1a773e8c
go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}"
@@ -12,7 +12,7 @@ short_desc="Cluster scheduler designed to easily integrate into existing workflo
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="MPL-2.0"
homepage="https://www.nomadproject.io/"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
+distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz"
checksum=1dca9ebb1636fc8ef005d9c6eed8cf10fbfc3d7c9ff7307606454142d858f419
patch_args="-Np1"
diff --git a/srcpkgs/peco/template b/srcpkgs/peco/template
index 44c50774ed2..182c2e5ecdc 100644
--- a/srcpkgs/peco/template
+++ b/srcpkgs/peco/template
@@ -10,7 +10,7 @@ short_desc="Simplistic interactive filtering tool"
maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/peco/peco"
-distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz"
+distfiles="https://github.com/peco/peco/archive/v${version}.tar.gz"
checksum=90d87503265c12f8583f5c6bc19c83eba7a2e15219a6339d5041628aa48c4705
post_install() {
diff --git a/srcpkgs/sift/template b/srcpkgs/sift/template
index adf4b95b79f..22a9698bf44 100644
--- a/srcpkgs/sift/template
+++ b/srcpkgs/sift/template
@@ -8,6 +8,6 @@ short_desc="A fast and powerful open source alternative to grep"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3"
go_import_path="github.com/svent/sift"
-homepage="https://$go_import_path"
+homepage="https://github.com/svent/sift"
distfiles="$homepage/archive/v$version.tar.gz"
checksum=bbbd5c472c36b78896cd7ae673749d3943621a6d5523d47973ed2fc6800ae4c8
diff --git a/srcpkgs/tag/template b/srcpkgs/tag/template
index 1363f7118a8..7cd64a2e240 100644
--- a/srcpkgs/tag/template
+++ b/srcpkgs/tag/template
@@ -4,12 +4,12 @@ version=1.4.0
revision=7
build_style=go
hostmakedepends="git mercurial"
-go_import_path="github.com/aykamko/${pkgname}"
+go_import_path="github.com/aykamko/tag"
short_desc="Instantly jump to your ag matches"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="https://github.com/aykamko/tag"
-distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
+distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=d3a02466e600634cf0ffff9ad8c5f70eba97e44758edf35cc4efbda9cbfdff9a
post_install() {
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index f907bacb02e..f8fb232a5c3 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -3,7 +3,7 @@ pkgname=terragrunt
version=0.28.4
revision=1
build_style=go
-go_import_path="github.com/gruntwork-io/$pkgname"
+go_import_path="github.com/gruntwork-io/terragrunt"
hostmakedepends="git"
depends="terraform"
short_desc="Thin wrapper for Terraform that provides extra tools"
diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template
index edfa5c95a91..85fc439ba9c 100644
--- a/srcpkgs/vault/template
+++ b/srcpkgs/vault/template
@@ -3,7 +3,7 @@ pkgname=vault
version=1.6.1
revision=1
build_style=go
-go_import_path="github.com/hashicorp/${pkgname}"
+go_import_path="github.com/hashicorp/vault"
go_build_tags="release"
_git_commit=6d2db3f033e02e70202bef9ec896360062b88b03
go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}"
@@ -12,7 +12,7 @@ short_desc="Manage Secrets and Protect Sensitive Data"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="MPL-2.0"
homepage="https://www.vaultproject.io/"
-distfiles="https://github.com/hashicorp/${pkgname}/archive/v${version}.tar.gz"
+distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz"
checksum=fb5d96e682a48bfd421b13cdfffd710da0238dbded1988aab822dd5aae75b4c4
system_accounts="_vault"
make_dirs="/var/lib/vault 0700 _vault _vault
diff --git a/srcpkgs/webcat/template b/srcpkgs/webcat/template
index c1cb0b678a5..5d6c459dd93 100644
--- a/srcpkgs/webcat/template
+++ b/srcpkgs/webcat/template
@@ -9,5 +9,5 @@ short_desc="WebSocket Netcat"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="GPL-3"
homepage="https://github.com/thypon/webcat"
-distfiles="https://github.com/thypon/${pkgname}/archive/v${version}.tar.gz"
+distfiles="https://github.com/thypon/webcat/archive/v${version}.tar.gz"
checksum=5b3be1cb8deb08f144d674a0bf23f97a692ebb601666d3a38df6e80b2e68d0b7
diff --git a/srcpkgs/websocketd/template b/srcpkgs/websocketd/template
index e0eba0cdb59..80857258f37 100644
--- a/srcpkgs/websocketd/template
+++ b/srcpkgs/websocketd/template
@@ -8,6 +8,6 @@ short_desc="Turn any program that uses STDIN/STDOUT into a WebSocket server"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="BSD"
go_import_path="github.com/joewalnes/websocketd"
-homepage="https://$go_import_path"
+homepage="https://github.com/joewalnes/websocketd"
distfiles="$homepage/archive/v$version.tar.gz"
checksum=6b8fe0fad586d794e002340ee597059b2cfc734ba7579933263aef4743138fe5
From 1aaee8fceabbb3ce5b79a4fc87c0504cf9e93abd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 23:25:27 -0300
Subject: [PATCH 2/7] gucci: fix checksum.
Upstream force pushed the same tag, so checksum for the tarball changed.
Only changes were timestamps for files and some small differences in
their .travis.yml file, which doesn't affect the build.
---
srcpkgs/gucci/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gucci/template b/srcpkgs/gucci/template
index fb10a6ca866..fd3f94cdf7e 100644
--- a/srcpkgs/gucci/template
+++ b/srcpkgs/gucci/template
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/noqcks/gucci"
distfiles="https://github.com/noqcks/gucci/archive/${version}.tar.gz"
-checksum=7ce8967cb83eddb8db6878a9f00a96996f7503fb0a5ee01fa9e1947d2444ead8
+checksum=50d9d513fff97128bbd92685af5b244cbc1453e79010fb2b1aea51c84d478855
post_install() {
vlicense LICENSE
From 2ea68da88167d38f1568f57a93d5ae1208784264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 23:57:10 -0300
Subject: [PATCH 3/7] hydroxide: set correct go_import_path and use go_package.
---
srcpkgs/hydroxide/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hydroxide/template b/srcpkgs/hydroxide/template
index 86cc09417aa..b3011181386 100644
--- a/srcpkgs/hydroxide/template
+++ b/srcpkgs/hydroxide/template
@@ -3,8 +3,8 @@ pkgname=hydroxide
version=0.2.17
revision=1
build_style=go
-go_import_path=github.com/emersion/hydroxide/cmd/hydroxide
-hostmakedepends="git"
+go_import_path=github.com/emersion/hydroxide
+go_package=$go_import_path/cmd/hydroxide
short_desc="Third-party, open-source ProtonMail CardDAV, IMAP and SMTP bridge"
maintainer="DirectorX <void.directorx@protonmail.com>"
license="MIT"
From 1fdd0dafb4664448c7e9fa03477ccbaaa5a1518e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 18 Feb 2021 23:59:56 -0300
Subject: [PATCH 4/7] ipfs-cluster: clean up unnecessary hostmakedepends
At least gx-go seems to have been forgotten in commit
31effcb4a1a21b4b0e209ba2618365ef17c0cc41, which removed the commands
using gx from pre_build.
---
srcpkgs/ipfs-cluster/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/ipfs-cluster/template b/srcpkgs/ipfs-cluster/template
index 281a5d1239e..27e6d6aad94 100644
--- a/srcpkgs/ipfs-cluster/template
+++ b/srcpkgs/ipfs-cluster/template
@@ -5,7 +5,6 @@ revision=1
build_style=go
go_import_path="github.com/ipfs/ipfs-cluster"
go_package="${go_import_path}/cmd/ipfs-cluster-ctl ${go_import_path}/cmd/ipfs-cluster-service"
-hostmakedepends="git wget gx-go"
depends="go-ipfs"
short_desc="Collective pinning and composition for IPFS"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
From 95e9df9b0b74958e3a7ca9cb6155beac4e0c1774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 00:22:05 -0300
Subject: [PATCH 5/7] miniflux: use correct go_import_path.
Also use ChangeLog from master and fix homepage.
---
srcpkgs/miniflux/template | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index aa50315ece7..0bef52b6dc3 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -1,18 +1,16 @@
# Template file for 'miniflux'
pkgname=miniflux
version=2.0.27
-revision=1
+revision=2
wrksrc="v2-${version}"
build_style=go
-go_import_path="github.com/miniflux/miniflux"
-go_package="miniflux.app"
-hostmakedepends="git"
+go_import_path="miniflux.app"
short_desc="Minimalist and opinionated feed reader written in Go"
maintainer="Frank Steinborn <steinex@nognu.de>"
license="Apache-2.0"
homepage="https://miniflux.app"
-changelog="https://raw.githubusercontent.com/miniflux/miniflux/${version}/ChangeLog"
-distfiles="https://github.com/miniflux/miniflux/archive/${version}.tar.gz"
+changelog="https://raw.githubusercontent.com/miniflux/v2/master/ChangeLog"
+distfiles="https://github.com/miniflux/v2/archive/${version}.tar.gz"
checksum=ec6696b1cf41ef50b76d02d1179838e03d9c3bcb3dce48febe2b5f4ecc450473
system_accounts="_miniflux"
From 7e070e821bd8b4dd746bcc164b40541e9f88f0ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 01:31:46 -0300
Subject: [PATCH 6/7] termshark: split command path correctly between
go_import_path and go_package.
---
srcpkgs/termshark/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/termshark/template b/srcpkgs/termshark/template
index 941c36f66d5..1b9c8765e74 100644
--- a/srcpkgs/termshark/template
+++ b/srcpkgs/termshark/template
@@ -1,10 +1,10 @@
# Template file for 'termshark'
pkgname=termshark
version=2.2.0
-revision=1
+revision=2
build_style=go
-go_import_path="github.com/gcla/termshark"
-go_package="${go_import_path}/v2/cmd/termshark"
+go_import_path="github.com/gcla/termshark/v2"
+go_package="${go_import_path}/cmd/termshark"
hostmakedepends="git"
depends="wireshark"
short_desc="Terminal UI for tshark, inspired by Wireshark"
From ef74ea16c020758e00675327bf03b1b2a0f5b5f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 19 Feb 2021 01:32:18 -0300
Subject: [PATCH 7/7] sops: use correct go_import_path, add go_package.
---
srcpkgs/sops/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/sops/template b/srcpkgs/sops/template
index d8c344b94bc..ca43b4a502d 100644
--- a/srcpkgs/sops/template
+++ b/srcpkgs/sops/template
@@ -1,9 +1,10 @@
# Template file for 'sops'
pkgname=sops
version=3.6.1
-revision=1
+revision=2
build_style=go
-go_import_path="go.mozilla.org/sops/v3/cmd/sops"
+go_import_path="go.mozilla.org/sops/v3"
+go_package="${go_import_path}/cmd/sops"
hostmakedepends="git"
short_desc="Simple and flexible tool for managing secrets"
maintainer="Noel Cower <ncower@nil.dev>"
next prev parent reply other threads:[~2021-02-19 4:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-18 22:20 [PR PATCH] " ericonr
2021-02-19 2:27 ` [PR PATCH] [Updated] " ericonr
2021-02-19 3:34 ` ericonr
2021-02-19 4:32 ` ericonr [this message]
2021-02-19 15:07 ` [PR PATCH] [Updated] srcpkgs/: clean up lots of Go packages ericonr
2021-02-19 15:07 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210219043256.AtCIUCBXaHtVMYxx-BKThsXCy6woACNS0zRYvqHsKrs@z \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).