diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix similarity index 87% rename from pkgs/servers/monitoring/prometheus/node-exporter.nix rename to pkgs/by-name/pr/prometheus-node-exporter/package.nix index d3b7c6786f84f..eac863a9962ac 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -1,7 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests - # darwin - , CoreFoundation, IOKit -}: +{ lib, stdenv, buildGoModule, fetchFromGitHub, nixosTests, darwin }: buildGoModule rec { pname = "node_exporter"; @@ -20,7 +17,7 @@ buildGoModule rec { # FIXME: tests fail due to read-only nix store doCheck = false; - buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation IOKit ]; + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation IOKit ]); excludedPackages = [ "docs/node-mixin" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddc797d4386cd..165634d3c5908 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26123,9 +26123,6 @@ with pkgs; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { }; - prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { - inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; - }; prometheus-nut-exporter = callPackage ../servers/monitoring/prometheus/nut-exporter.nix { }; prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { } ; prometheus-pgbouncer-exporter = callPackage ../servers/monitoring/prometheus/pgbouncer-exporter.nix { };