commit 77f612e6882205e9351ca95493466f2b8003192b
parent d575fd89a29172ec799f7c863e99f0d4636d841b
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date: Tue, 26 Nov 2024 21:54:11 +0400
Migrate buildGoPackage to buildGoModule
Diffstat:
10 files changed, 150 insertions(+), 132 deletions(-)
diff --git a/pkgs/gemini/gemcert/default.nix b/pkgs/gemini/gemcert/default.nix
@@ -1,26 +1,27 @@
{
lib,
- buildGoPackage,
- fetchFromGitea,
+ buildGoModule,
+ fetchFromSourcehut,
}:
-buildGoPackage {
+buildGoModule {
pname = "gemcert";
version = "2020-08-01";
- src = fetchFromGitea {
- domain = "tildegit.org";
- owner = "solderpunk";
+ src = fetchFromSourcehut {
+ owner = "~solderpunk";
repo = "gemcert";
rev = "fc14deb2751274d2df01f8d5abef023ec7e12a8c";
hash = "sha256-za3pS6WlOJ+NKqhyCfhlj7gH4U5yFXtJ6gLta7WXhb0=";
};
- goPackagePath = "tildegit.org/solderpunk/gemcert";
+ patches = [ ./go.mod.patch ];
+
+ vendorHash = null;
meta = {
description = "A simple tool for creating self-signed certs for use in Geminispace";
- homepage = "https://tildegit.org/solderpunk/gemcert";
+ homepage = "https://git.sr.ht/~solderpunk/gemcert";
license = lib.licenses.bsd2;
maintainers = [ lib.maintainers.sikmir ];
platforms = lib.platforms.unix;
diff --git a/pkgs/gemini/gemcert/go.mod.patch b/pkgs/gemini/gemcert/go.mod.patch
@@ -0,0 +1,9 @@
+diff --git c/go.mod i/go.mod
+new file mode 100644
+index 0000000..385ec8e
+--- /dev/null
++++ i/go.mod
+@@ -0,0 +1,3 @@
++module git.sr.ht/~solderpunk/gemcert
++
++go 1.22
diff --git a/pkgs/linguistics/dict2rest/default.nix b/pkgs/linguistics/dict2rest/default.nix
@@ -1,10 +1,10 @@
{
lib,
fetchFromGitHub,
- buildGoPackage,
+ buildGoModule,
}:
-buildGoPackage {
+buildGoModule {
pname = "dict2rest";
version = "0-unstable-2016-12-05";
@@ -15,7 +15,15 @@ buildGoPackage {
hash = "sha256-v5vBsdGQZYHSPEiBgSezKqaev1sTXnP27Tn47z1ebjQ=";
};
- goPackagePath = "github.com/felix/go-dict2rest";
+ patches = [ ./go.mod.patch ];
+
+ postPatch = ''
+ rm -rf vendor
+ '';
+
+ vendorHash = "sha256-vwqD9XsxutwMalJiPZa//aYw88wK0ih6zGcOSxoOjec=";
+
+ doCheck = false;
meta = {
description = "A simple proxy service providing an HTTP interface to a Dict protocol (RFC 2229) server";
diff --git a/pkgs/linguistics/dict2rest/go.mod.patch b/pkgs/linguistics/dict2rest/go.mod.patch
@@ -0,0 +1,35 @@
+diff --git c/go.mod i/go.mod
+new file mode 100644
+index 0000000..46a3f95
+--- /dev/null
++++ i/go.mod
+@@ -0,0 +1,11 @@
++module github.com/felix/go-dict2rest
++
++go 1.22
++
++require (
++ github.com/alexedwards/stack v0.0.0-20160719074228-3ba431d5d12d
++ github.com/julienschmidt/httprouter v1.3.0
++ github.com/rs/cors v1.11.1
++ github.com/stretchr/graceful v1.2.15
++ golang.org/x/net v0.31.0
++)
+diff --git c/go.sum i/go.sum
+new file mode 100644
+index 0000000..5f5e6d5
+--- /dev/null
++++ i/go.sum
+@@ -0,0 +1,12 @@
++github.com/alexedwards/stack v0.0.0-20160719074228-3ba431d5d12d h1:Dglg+735LrUpHAY4KX5KlTjgki9HWJpvubnq/uh3mnE=
++github.com/alexedwards/stack v0.0.0-20160719074228-3ba431d5d12d/go.mod h1:Woal3KHKBSiQ/vwtBZUuea+GuR48mpz2TziRODQqVXk=
++github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
++github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
++github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA=
++github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
++github.com/stretchr/graceful v1.2.15 h1:vmXbwPGfe8bI6KkgmHry/P1Pk63bM3TDcfi+5mh+VHg=
++github.com/stretchr/graceful v1.2.15/go.mod h1:IxdGAOTZueMKoBr3oJIzdeg5CCCXbHXfV44sLhfAXXI=
++golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
++golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
++golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
++golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
diff --git a/pkgs/misc/nanodns/default.nix b/pkgs/misc/nanodns/default.nix
@@ -1,10 +1,10 @@
{
lib,
- buildGo122Package,
+ buildGo122Module,
fetchFromGitHub,
}:
-buildGo122Package {
+buildGo122Module {
pname = "nanodns";
version = "0-unstable-2021-10-29";
@@ -15,9 +15,9 @@ buildGo122Package {
hash = "sha256-Paz59YJkwK0v9/e7NrqpQjx0r/iHMpSCLd2heHw8KlA=";
};
- goPackagePath = "github.com/Sina-Ghaderi/nanodns";
+ patches = [ ./go.mod.patch ];
- goDeps = ./deps.nix;
+ vendorHash = "sha256-+azMCvpNBE6p+U9wHdl8j5pKV42v05PIkeOURB+5qVc=";
meta = {
description = "Simple dns forwarder/cache blocker server";
diff --git a/pkgs/misc/nanodns/deps.nix b/pkgs/misc/nanodns/deps.nix
@@ -1,65 +0,0 @@
-[
- {
- goPackagePath = "github.com/miekg/dns";
- fetch = {
- type = "git";
- url = "https://github.com/miekg/dns";
- rev = "v1.1.48";
- sha256 = "sha256-FA4nYe0t6k8ZugvSYgZWXIXFbfjaBd2IzDew+pblpJI=";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "1850ba15e1bead26ce105d30e15374864d8eff07";
- sha256 = "sha256-GUMZ+fwMlO8LPxcZbX3eARcjMN+VuSYJA/Lpl8s7ixY=";
- };
- }
- {
- goPackagePath = "golang.org/x/sys";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sys";
- rev = "33da011f77ade50ff5b6a6fb4a9a1e6d6b285809";
- sha256 = "sha256-mWg+AboQLFaoe09QqOpg8pIBPo63Blur0cvnizONQdc=";
- };
- }
- {
- goPackagePath = "golang.org/x/tools";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/tools";
- rev = "48a2cc8a0dedac636c66bb5f095ad46073e0a288";
- sha256 = "sha256-pXQI4QhpIDJvNakvXrhBXP6PX2eftV0C9EEkO2bWWvQ=";
- };
- }
- {
- goPackagePath = "golang.org/x/sync";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sync";
- rev = "036812b2e83c0ddf193dd5a34e034151da389d09";
- sha256 = "sha256-qyBoAsnVWZyQM7UkJ573EjijMHK0q5mVoY/o4a8Agr4=";
- };
- }
- {
- goPackagePath = "golang.org/x/xerrors";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/xerrors";
- rev = "2f41105eb62f341cfe208d06de4ee3bdd3a083da";
- sha256 = "sha256-yZNeG+jcarcw/aOFhrhxWWE20r0P+/VJF4i/0JQfv1c=";
- };
- }
- {
- goPackagePath = "golang.org/x/mod";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/mod";
- rev = "v0.5.1";
- sha256 = "sha256-CThURfk/KKuPD1XesYauFLxnZH0RJXc7hCGpW4YDk4U=";
- };
- }
-]
diff --git a/pkgs/misc/nanodns/go.mod.patch b/pkgs/misc/nanodns/go.mod.patch
@@ -0,0 +1,37 @@
+diff --git c/go.mod i/go.mod
+new file mode 100644
+index 0000000..8c105d0
+--- /dev/null
++++ i/go.mod
+@@ -0,0 +1,13 @@
++module github.com/Sina-Ghaderi/nanodns
++
++go 1.22
++
++require github.com/miekg/dns v1.1.62
++
++require (
++ golang.org/x/mod v0.18.0 // indirect
++ golang.org/x/net v0.27.0 // indirect
++ golang.org/x/sync v0.7.0 // indirect
++ golang.org/x/sys v0.22.0 // indirect
++ golang.org/x/tools v0.22.0 // indirect
++)
+diff --git c/go.sum i/go.sum
+new file mode 100644
+index 0000000..95e8194
+--- /dev/null
++++ i/go.sum
+@@ -0,0 +1,12 @@
++github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
++github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
++golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
++golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
++golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
++golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
++golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
++golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
++golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
++golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
++golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
++golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
diff --git a/pkgs/mqtt/janus-mqtt-proxy/default.nix b/pkgs/mqtt/janus-mqtt-proxy/default.nix
@@ -1,10 +1,10 @@
{
lib,
fetchFromGitHub,
- buildGoPackage,
+ buildGoModule,
}:
-buildGoPackage {
+buildGoModule {
pname = "janus-mqtt-proxy";
version = "0-unstable-2022-02-19";
@@ -15,12 +15,14 @@ buildGoPackage {
hash = "sha256-RjhIV5GDHqtGz54Zfaph5JleBaAIDwIWGiknl1KNW+8=";
};
- subPackages = [ "cmd/proxy" ];
- goPackagePath = "github.com/phoenix-mstu/janus-mqtt-proxy";
+ patches = [ ./go.mod.patch ];
+
+ vendorHash = "sha256-dfllNAieT3scfsojOJoBSDpKJVkh9YwwRD9KvLwT2Jo=";
- goDeps = ./deps.nix;
+ subPackages = [ "cmd/proxy" ];
postInstall = ''
+ mv $out/bin/{proxy,janus-mqtt-proxy}
install -Dm644 $src/sample_configs/*.yaml -t $out/share/janus-mqtt-proxy/sample_configs
'';
diff --git a/pkgs/mqtt/janus-mqtt-proxy/deps.nix b/pkgs/mqtt/janus-mqtt-proxy/deps.nix
@@ -1,47 +0,0 @@
-[
- {
- goPackagePath = "github.com/eclipse/paho.mqtt.golang";
- fetch = {
- type = "git";
- url = "https://github.com/eclipse/paho.mqtt.golang";
- rev = "v1.4.2";
- sha256 = "sha256-qCBZbcvGqD9tA3Po3Nd9wqATJ9fBgAPZ0s4y/jFYzeA=";
- };
- }
- {
- goPackagePath = "github.com/gorilla/websocket";
- fetch = {
- type = "git";
- url = "https://github.com/gorilla/websocket";
- rev = "v1.5.0";
- sha256 = "sha256-EYVgkSEMo4HaVrsWKqnsYRp8SSS8gNf7t+Elva02Ofc=";
- };
- }
- {
- goPackagePath = "golang.org/x/net";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/net";
- rev = "v0.2.0";
- sha256 = "sha256-0MqnHDdLkkau6k7hlWD9MzIoAFROvxulyT+KzZkSXOs=";
- };
- }
- {
- goPackagePath = "golang.org/x/sync";
- fetch = {
- type = "git";
- url = "https://go.googlesource.com/sync";
- rev = "v0.1.0";
- sha256 = "sha256-Hygjq9euZ0qz6TvHYQwOZEjNiTbTh1nSLRAWZ6KFGR8=";
- };
- }
- {
- goPackagePath = "gopkg.in/yaml.v3";
- fetch = {
- type = "git";
- url = "https://github.com/go-yaml/yaml";
- rev = "v3.0.1";
- sha256 = "sha256-FqL9TKYJ0XkNwJFnq9j0VvJ5ZUU1RvH/52h/f5bkYAU=";
- };
- }
-]
diff --git a/pkgs/mqtt/janus-mqtt-proxy/go.mod.patch b/pkgs/mqtt/janus-mqtt-proxy/go.mod.patch
@@ -0,0 +1,38 @@
+diff --git c/go.mod i/go.mod
+new file mode 100644
+index 0000000..06192a6
+--- /dev/null
++++ i/go.mod
+@@ -0,0 +1,14 @@
++module github.com/phoenix-mstu/janus-mqtt-proxy
++
++go 1.22
++
++require (
++ github.com/eclipse/paho.mqtt.golang v1.5.0
++ gopkg.in/yaml.v3 v3.0.1
++)
++
++require (
++ github.com/gorilla/websocket v1.5.3 // indirect
++ golang.org/x/net v0.27.0 // indirect
++ golang.org/x/sync v0.7.0 // indirect
++)
+diff --git c/go.sum i/go.sum
+new file mode 100644
+index 0000000..57e1073
+--- /dev/null
++++ i/go.sum
+@@ -0,0 +1,12 @@
++github.com/eclipse/paho.mqtt.golang v1.5.0 h1:EH+bUVJNgttidWFkLLVKaQPGmkTUfQQqjOsyvMGvD6o=
++github.com/eclipse/paho.mqtt.golang v1.5.0/go.mod h1:du/2qNQVqJf/Sqs4MEL77kR8QTqANF7XU7Fk0aOTAgk=
++github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
++github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
++golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
++golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
++golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
++golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
++gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
++gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
++gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
