From 3349da7ee5e716efa32acdc018b9015ea7530ad4 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 31 Jul 2023 16:36:37 +0200 Subject: [PATCH 1/2] speedtest-explorer: Remove as unmaintained Signed-off-by: Matthias Beyer --- .../libraries/speedtest-exporter/default.nix | 26 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 pkgs/development/libraries/speedtest-exporter/default.nix diff --git a/pkgs/development/libraries/speedtest-exporter/default.nix b/pkgs/development/libraries/speedtest-exporter/default.nix deleted file mode 100644 index 51ab1ac33d03..000000000000 --- a/pkgs/development/libraries/speedtest-exporter/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ buildGoModule -, fetchFromGitHub -, lib -}: - -buildGoModule rec { - pname = "speedtest-exporter"; - version = "0.3.2"; - - src = fetchFromGitHub { - owner = "nlamirault"; - repo = "speedtest_exporter"; - rev = "v${version}"; - hash = "sha256-WIMDv63sHyZVw3Ct5LFXCIufj7sU2H81n+hT/NiPMeQ="; - }; - - vendorHash = "sha256-Lm73pZzdNZv7J+vKrtQXxm4HiAuB9lugKT/oanmD0HM="; - - meta = with lib; { - description = "Prometheus exporter for Speedtest metrics"; - homepage = "https://github.com/nlamirault/speedtest_exporter"; - license = licenses.asl20; - maintainers = with maintainers; [ urandom ]; - mainProgram = "speedtest_exporter"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 96e2c9da3eec..b40c2bb05271 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1620,6 +1620,7 @@ mapAliases ({ speech_tools = throw "'speech_tools' has been renamed to/replaced by 'speech-tools'"; # Converted to throw 2022-02-22 speedometer = throw "speedometer has been removed: abandoned by upstream"; # Added 2022-04-24 speedtest_cli = throw "'speedtest_cli' has been renamed to/replaced by 'speedtest-cli'"; # Converted to throw 2022-02-22 + speedtest-exporter = throw "'speedtest-exporter' has been removed as unmaintained"; # Added 2023-07-31 sphinxbase = throw "sphinxbase has been removed: unmaintained"; # Added 2022-04-24 spice-gtk_libsoup2 = throw "'spice-gtk_libsoup2' has been renamed to/replaced by 'spice-gtk'"; # Added 2023-02-21 spice_gtk = throw "'spice_gtk' has been renamed to/replaced by 'spice-gtk'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ac157d4ba3f..fa1b31e4f553 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24802,8 +24802,6 @@ with pkgs; speech-tools = callPackage ../development/libraries/speech-tools { }; - speedtest-exporter = callPackage ../development/libraries/speedtest-exporter { }; - speex = callPackage ../development/libraries/speex { fftw = fftwFloat; }; From 9738ead17fb2e1aa92137bcb1203af20198e1341 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 31 Jul 2023 16:36:54 +0200 Subject: [PATCH 2/2] prometheus-speedtest-exporter: Remove as unmaintained Signed-off-by: Matthias Beyer --- .../prometheus/speedtest-exporter.nix | 22 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 pkgs/servers/monitoring/prometheus/speedtest-exporter.nix diff --git a/pkgs/servers/monitoring/prometheus/speedtest-exporter.nix b/pkgs/servers/monitoring/prometheus/speedtest-exporter.nix deleted file mode 100644 index 68af021d4c17..000000000000 --- a/pkgs/servers/monitoring/prometheus/speedtest-exporter.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule { - pname = "speedtest_exporter"; - version = "0.3.2"; - - src = fetchFromGitHub { - owner = "nlamirault"; - repo = "speedtest_exporter"; - rev = "7364db62b98ab2736405c7cde960698ab5b688bf"; - sha256 = "WIMDv63sHyZVw3Ct5LFXCIufj7sU2H81n+hT/NiPMeQ="; - }; - - vendorSha256 = "Lm73pZzdNZv7J+vKrtQXxm4HiAuB9lugKT/oanmD0HM="; - - meta = with lib; { - license = licenses.asl20; - homepage = "https://github.com/nlamirault/speedtest_exporter"; - description = "Prometheus exporter for Speedtest metrics"; - maintainers = with maintainers; [ jonaenz ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index b40c2bb05271..d6868fe22b14 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1412,6 +1412,7 @@ mapAliases ({ prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 prometheus-mesos-exporter = throw "prometheus-mesos-exporter is deprecated and archived by upstream"; # Added 2022-04-05 prometheus-unifi-exporter = throw "prometheus-unifi-exporter is deprecated and archived by upstream, use unifi-poller instead"; # Added 2022-06-03 + prometheus-speedtest-exporter = throw "prometheus-speedtest-exporter was removed as unmaintained"; # Added 2023-07-31 protobuf3_7 = throw "protobuf3_7 does not receive updates anymore and has been removed"; # Added 2022-10-03 protobuf3_11 = throw "protobuf3_11 does not receive updates anymore and has been removed"; # Added 2022-09-28 protobuf3_17 = throw "protobuf3_17 does not receive updates anymore and has been removed"; # Added 2023-05-21 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa1b31e4f553..140388efe0a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26833,7 +26833,6 @@ with pkgs; prometheus-smartctl-exporter = callPackage ../servers/monitoring/prometheus/smartctl-exporter { }; prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; - prometheus-speedtest-exporter = callPackage ../servers/monitoring/prometheus/speedtest-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { };