From 45bbdb9f51461c5998fa4a418a211f0816075c5a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 13 Sep 2024 17:10:34 +1000 Subject: [PATCH 1/2] telegraf: move to pkgs/by-name --- .../telegraf/default.nix => by-name/te/telegraf/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/monitoring/telegraf/default.nix => by-name/te/telegraf/package.nix} (100%) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/by-name/te/telegraf/package.nix similarity index 100% rename from pkgs/servers/monitoring/telegraf/default.nix rename to pkgs/by-name/te/telegraf/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9736d1ec8d3..da604fd83ae5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13031,8 +13031,6 @@ with pkgs; teip = callPackage ../tools/text/teip { }; - telegraf = callPackage ../servers/monitoring/telegraf { }; - inherit (callPackages ../servers/teleport { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; }) teleport_14 teleport_15 teleport_16 teleport; From b09b1438b457427496fd10b934f30dc7db9aae23 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 13 Sep 2024 07:04:44 +0000 Subject: [PATCH 2/2] telegraf: 1.31.3 -> 1.32.0 Diff: https://github.com/influxdata/telegraf/compare/v1.31.3...v1.32.0 Changelog: https://github.com/influxdata/telegraf/blob/v1.32.0/CHANGELOG.md --- pkgs/by-name/te/telegraf/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index d2291890d8b6..bda948d342aa 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo123Module , fetchFromGitHub , nixosTests , stdenv @@ -7,9 +7,9 @@ , telegraf }: -buildGoModule rec { +buildGo123Module rec { pname = "telegraf"; - version = "1.31.3"; + version = "1.32.0"; subPackages = [ "cmd/telegraf" ]; @@ -17,10 +17,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-J5jIyrxG2cLEu909/fcPQCo+xUlW6VAoge5atCrW4HY="; + hash = "sha256-ITTlHsoWPXHbGtmNOE0x1sCbeADWi4liOEqXXKQUeGU="; }; - vendorHash = "sha256-lxLFUKOFg7HAjgZIVACW6VlWLgCeZX38SNRsjxc9D7g="; + vendorHash = "sha256-wKl6Rutt2QrF4nLxB5Ic6QlekrPUfHwdFZyTTdbK0HU="; proxyVendor = true; ldflags = [