From 54ece522d1a17b07c2a15db8b869056ff9e87d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Tue, 5 Nov 2024 20:35:43 +0100 Subject: [PATCH 1/6] dnsmasq_exporter: build with Go 1.22 for now until the golang.org/x/net dependency gets upgraded in the project https://hydra.nixos.org/build/276128656/nixlog/1/tail --- pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index 0c071a092cfa..e78efeb22d85 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -1,6 +1,6 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGo122Module, fetchFromGitHub, nixosTests }: -buildGoModule rec { +buildGo122Module rec { pname = "dnsmasq_exporter"; version = "0.3.0"; From 86ef64265ae8307580a89c06e48af2336324dc59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Tue, 5 Nov 2024 20:36:38 +0100 Subject: [PATCH 2/6] peroxide: build with Go 1.22 for now until the golang.org/x/net dependency gets upgraded in the project https://hydra.nixos.org/build/276206869/nixlog/1/tail --- pkgs/applications/networking/peroxide/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/peroxide/default.nix b/pkgs/applications/networking/peroxide/default.nix index 6e8537275f05..1275329bcf65 100644 --- a/pkgs/applications/networking/peroxide/default.nix +++ b/pkgs/applications/networking/peroxide/default.nix @@ -1,10 +1,10 @@ { lib -, buildGoModule +, buildGo122Module , fetchFromGitHub , nixosTests }: -buildGoModule rec { +buildGo122Module rec { pname = "peroxide"; version = "0.5.0"; From 2245f840869c1c62ac5227a4a8ce758314f68645 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Tue, 5 Nov 2024 20:37:55 +0100 Subject: [PATCH 3/6] ali: build with Go 1.22 for now until the golang.org/x/net dependency gets upgraded in the project https://hydra.nixos.org/build/275234146/nixlog/3/tail --- pkgs/tools/networking/ali/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ali/default.nix b/pkgs/tools/networking/ali/default.nix index 3b6fef73595c..44d80f1b7e19 100644 --- a/pkgs/tools/networking/ali/default.nix +++ b/pkgs/tools/networking/ali/default.nix @@ -1,9 +1,9 @@ { lib -, buildGoModule +, buildGo122Module , fetchFromGitHub }: -buildGoModule rec { +buildGo122Module rec { pname = "ali"; version = "0.7.5"; From 7136dc6870175f6d0745a7e5a8d8e7a7cb01ba7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Tue, 5 Nov 2024 20:38:45 +0100 Subject: [PATCH 4/6] honeytrap: build with Go 1.22 for now until the golang.org/x/net dependency gets upgraded in the project https://hydra.nixos.org/build/276117884/nixlog/1/tail --- pkgs/tools/security/honeytrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/honeytrap/default.nix b/pkgs/tools/security/honeytrap/default.nix index 3e311c576864..8f83e120fdd9 100644 --- a/pkgs/tools/security/honeytrap/default.nix +++ b/pkgs/tools/security/honeytrap/default.nix @@ -1,8 +1,8 @@ { lib -, buildGoModule +, buildGo122Module , fetchFromGitHub }: -buildGoModule { +buildGo122Module { pname = "honeytrap"; version = "unstable-2021-12-20"; From 7545cec01f6dac13768236e107de88fd445343ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Tue, 5 Nov 2024 20:39:20 +0100 Subject: [PATCH 5/6] devdash: build with Go 1.22 for now until the golang.org/x/net dependency gets upgraded in the project https://hydra.nixos.org/build/276183909/nixlog/1/tail --- pkgs/by-name/de/devdash/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/devdash/package.nix b/pkgs/by-name/de/devdash/package.nix index 210a016277f6..a694da0c8029 100644 --- a/pkgs/by-name/de/devdash/package.nix +++ b/pkgs/by-name/de/devdash/package.nix @@ -1,12 +1,12 @@ { lib -, buildGoModule +, buildGo122Module , fetchFromGitHub , nix-update-script , coreutils }: -buildGoModule rec { +buildGo122Module rec { pname = "devdash"; version = "0.5.0"; From a4e4e65330afb2ecd77d46b13986b0df9513dce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Tue, 5 Nov 2024 20:40:07 +0100 Subject: [PATCH 6/6] bettercap: build with Go 1.22 for now until the golang.org/x/net dependency gets upgraded in the project https://hydra.nixos.org/build/276197637/nixlog/1/tail --- pkgs/tools/security/bettercap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index 5594bc106beb..ebd49d4a12cb 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, buildGoModule +, buildGo122Module , fetchFromGitHub , pkg-config , libpcap @@ -8,7 +8,7 @@ , libusb1 }: -buildGoModule rec { +buildGo122Module rec { pname = "bettercap"; version = "2.32.0";