From 109714a9cb0f7efeeeef7e8b939b9978e374edb2 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Fri, 28 Oct 2022 09:36:04 -0700 Subject: [PATCH] prometheus-node-exporter: drop already-applied patch on darwin --- .../monitoring/prometheus/node-exporter.nix | 5 ----- .../node-exporter/node-exporter-darwin.patch | 17 ----------------- 2 files changed, 22 deletions(-) delete mode 100644 pkgs/servers/monitoring/prometheus/node-exporter/node-exporter-darwin.patch diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 4fa5476e7d4c..15116c10235b 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -21,11 +21,6 @@ buildGoModule rec { doCheck = false; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation IOKit ]; - # upstream currently doesn't work with the version of the macOS SDK - # we're building against in nix-darwin without a patch. - # this patch has been submitted upstream at https://github.com/prometheus/node_exporter/pull/2327 - # and only needs to be carried until it lands in a new release. - patches = lib.optionals stdenv.isDarwin [ ./node-exporter/node-exporter-darwin.patch ]; excludedPackages = [ "docs/node-mixin" ]; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter/node-exporter-darwin.patch b/pkgs/servers/monitoring/prometheus/node-exporter/node-exporter-darwin.patch deleted file mode 100644 index 8077bbc47511..000000000000 --- a/pkgs/servers/monitoring/prometheus/node-exporter/node-exporter-darwin.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/collector/powersupplyclass_darwin.go b/collector/powersupplyclass_darwin.go -index a070f64..01d7f18 100644 ---- a/collector/powersupplyclass_darwin.go -+++ b/collector/powersupplyclass_darwin.go -@@ -18,9 +18,11 @@ package collector - - /* - #cgo LDFLAGS: -framework IOKit -framework CoreFoundation -+#include -+#include -+#include - #include - #include --#include - - // values collected from IOKit Power Source APIs - // Functions documentation available at