From 450917023fcd4a3009a91928753e74455d2413a8 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 14 Jan 2024 09:21:21 +0900 Subject: go-musicfox: unpin go --- pkgs/applications/audio/go-musicfox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index 0432224fa3c3..549ab0f692e7 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -1,5 +1,5 @@ { lib -, buildGo121Module +, buildGoModule , fetchFromGitHub , pkg-config , alsa-lib @@ -7,7 +7,7 @@ , nix-update-script }: -buildGo121Module rec { +buildGoModule rec { pname = "go-musicfox"; version = "4.3.0"; -- cgit 1.4.1 From d8f54aa74aad9c708f579432a654aa520bae1900 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 14 Jan 2024 09:21:39 +0900 Subject: k0sctl: unpin go --- pkgs/applications/networking/cluster/k0sctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index 90c69e8c3340..2165fd41cdc7 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -1,10 +1,10 @@ { lib -, buildGo121Module +, buildGoModule , fetchFromGitHub , installShellFiles }: -buildGo121Module rec { +buildGoModule rec { pname = "k0sctl"; version = "0.17.3"; -- cgit 1.4.1 From 93e09497c4c87744e3f8c8790255407f81620e40 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 14 Jan 2024 09:21:55 +0900 Subject: kubectl-klock: unpin go --- pkgs/applications/networking/cluster/kubectl-klock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl-klock/default.nix b/pkgs/applications/networking/cluster/kubectl-klock/default.nix index db40df70f934..4b617fd8d854 100644 --- a/pkgs/applications/networking/cluster/kubectl-klock/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-klock/default.nix @@ -1,6 +1,6 @@ -{ lib, buildGo121Module, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGo121Module rec { +buildGoModule rec { pname = "kubectl-klock"; version = "0.5.0"; -- cgit 1.4.1 From 241b1e43e5eafc2bcfe07f46e84a47d6f3d83a97 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 14 Jan 2024 09:22:13 +0900 Subject: timoni: unpin go --- pkgs/applications/networking/cluster/timoni/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix index d89b90d92928..4ae26898e51c 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/pkgs/applications/networking/cluster/timoni/default.nix @@ -1,10 +1,10 @@ { lib -, buildGo121Module +, buildGoModule , fetchFromGitHub , installShellFiles }: -buildGo121Module rec { +buildGoModule rec { pname = "timoni"; version = "0.17.0"; -- cgit 1.4.1 From c175894f919714de8d4c3a3ac3d4a7dd103356e0 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 14 Jan 2024 09:22:38 +0900 Subject: ktailctl: unpin go --- pkgs/applications/networking/ktailctl/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/ktailctl/default.nix b/pkgs/applications/networking/ktailctl/default.nix index e166e156da4b..2b0e870ed485 100644 --- a/pkgs/applications/networking/ktailctl/default.nix +++ b/pkgs/applications/networking/ktailctl/default.nix @@ -1,11 +1,11 @@ { lib , stdenv , fetchFromGitHub -, buildGo121Module +, buildGoModule , cmake , extra-cmake-modules , git -, go_1_21 +, go , wrapQtAppsHook , qtbase , qtquickcontrols2 @@ -28,13 +28,14 @@ let hash = "sha256-nY6DEHkDVWIlvc64smXb9KshrhNgNLKiilYydbMKCqc="; }; - goDeps = (buildGo121Module { + goDeps = (buildGoModule { pname = "tailwrap"; inherit src version; modRoot = "tailwrap"; vendorHash = "sha256-Y9xhoTf3vCtiNi5qOPg020EQmASo58BZI3rAoUEC8qE="; }).goModules; -in stdenv.mkDerivation { +in +stdenv.mkDerivation { pname = "ktailctl"; inherit version src; @@ -56,7 +57,7 @@ in stdenv.mkDerivation { cmake extra-cmake-modules git - go_1_21 + go wrapQtAppsHook ]; -- cgit 1.4.1 From be71ae176e3538f626d065356e091454934ba84e Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 14 Jan 2024 09:22:55 +0900 Subject: static-server: unpin go --- pkgs/by-name/st/static-server/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/st/static-server/package.nix b/pkgs/by-name/st/static-server/package.nix index 3a5f0748f968..f2b7d26d8f0b 100644 --- a/pkgs/by-name/st/static-server/package.nix +++ b/pkgs/by-name/st/static-server/package.nix @@ -1,5 +1,5 @@ { lib -, buildGo121Module +, buildGoModule , fetchFromGitHub , curl , stdenv @@ -8,7 +8,7 @@ , substituteAll }: -buildGo121Module rec { +buildGoModule rec { pname = "static-server"; version = "1.2.1"; -- cgit 1.4.1 From a5297dd348f31e4434ebe3dc42e9492a95ea992f Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 14 Jan 2024 09:23:10 +0900 Subject: uplosi: unpin go --- pkgs/by-name/up/uplosi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/up/uplosi/package.nix b/pkgs/by-name/up/uplosi/package.nix index 05e38ca8026c..eaa1ef48e35d 100644 --- a/pkgs/by-name/up/uplosi/package.nix +++ b/pkgs/by-name/up/uplosi/package.nix @@ -1,8 +1,8 @@ { lib , fetchFromGitHub -, buildGo121Module +, buildGoModule }: -buildGo121Module rec { +buildGoModule rec { pname = "uplosi"; version = "0.1.2"; -- cgit 1.4.1 From 3779a7cc0b938771e2dddaa2a8c1beb92de84290 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 14 Jan 2024 09:23:26 +0900 Subject: zitadel: unpin go --- pkgs/by-name/zi/zitadel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zi/zitadel/package.nix b/pkgs/by-name/zi/zitadel/package.nix index 03216c406209..1788d157c8f4 100644 --- a/pkgs/by-name/zi/zitadel/package.nix +++ b/pkgs/by-name/zi/zitadel/package.nix @@ -1,5 +1,5 @@ { stdenv -, buildGo121Module +, buildGoModule , callPackage , fetchFromGitHub , lib @@ -25,7 +25,7 @@ let goModulesHash = "sha256-IVf1YVnhyEYgZqM31Cv3aBFnPG7v5WW6fCEvlN+sTIE="; buildZitadelProtocGen = name: - buildGo121Module { + buildGoModule { pname = "protoc-gen-${name}"; inherit version; @@ -94,7 +94,7 @@ let hash = "sha256-xrEF1B4pMoCZs1WO9F6IoqHnSyt5BhPVTIABMWK/q2E="; }; in -buildGo121Module rec { +buildGoModule rec { name = "zitadel"; inherit version; -- cgit 1.4.1 From 266037332c067bf3f44b81b8aeebe19d8525735f Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 14 Jan 2024 09:23:41 +0900 Subject: risor: unpin go --- pkgs/development/interpreters/risor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/risor/default.nix b/pkgs/development/interpreters/risor/default.nix index 1408b196f4a3..9798c6fdefaf 100644 --- a/pkgs/development/interpreters/risor/default.nix +++ b/pkgs/development/interpreters/risor/default.nix @@ -1,11 +1,11 @@ { lib -, buildGo121Module +, buildGoModule , fetchFromGitHub , testers , risor }: -buildGo121Module rec { +buildGoModule rec { pname = "risor"; version = "1.1.2"; -- cgit 1.4.1 From 9d75411f78f61defe79ed669837696167a848fed Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 14 Jan 2024 09:25:47 +0900 Subject: turso-cli: unpin go --- pkgs/development/tools/turso-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index 1aacba1646b8..e115ec44533b 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, - buildGo121Module, + buildGoModule, fetchFromGitHub, installShellFiles, nix-update-script, }: -buildGo121Module rec { +buildGoModule rec { pname = "turso-cli"; version = "0.87.8"; -- cgit 1.4.1 From 72de14424083c43309bb54412896c2e3826e6428 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 14 Jan 2024 09:26:11 +0900 Subject: juicity: unpin go --- pkgs/tools/networking/juicity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/juicity/default.nix b/pkgs/tools/networking/juicity/default.nix index 286192a2a31d..e265ef94908a 100644 --- a/pkgs/tools/networking/juicity/default.nix +++ b/pkgs/tools/networking/juicity/default.nix @@ -1,8 +1,8 @@ { lib , fetchFromGitHub -, buildGo121Module +, buildGoModule }: -buildGo121Module rec { +buildGoModule rec { pname = "juicity"; version = "0.3.0"; -- cgit 1.4.1 From 1e65beb2ab59e8318b25cdbb7b4b69b7852c4756 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Sun, 14 Jan 2024 09:27:50 +0900 Subject: netdata-go-plugins: unpin go --- pkgs/tools/system/netdata/go.d.plugin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 71af680b238c..796f6108ca8b 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, buildGo121Module, nixosTests }: +{ lib, fetchFromGitHub, buildGoModule, nixosTests }: -buildGo121Module rec { +buildGoModule rec { pname = "netdata-go-plugins"; version = "0.57.2"; -- cgit 1.4.1