From e4964a7e106b31166b8bffe8e624beb195aa6bd9 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Mon, 20 Apr 2026 21:13:12 +0000 Subject: [PATCH 1/2] prometheus: Include TestFsType patch The upstream test TestFsType used a regexp to match filesystem magic constant names (e.g. EXT4_SUPER_MAGIC) against the string returned by FsType(). This fails in Nix sandbox builds where the filesystem type does not match that naming pattern. The patch (prometheus/prometheus#18519) relaxes the assertion to simply require a non-zero value for a valid path. --- pkgs/by-name/pr/prometheus/package.nix | 4 +++ .../prometheus-pr18519-fix-TestFsType.patch | 25 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/by-name/pr/prometheus/prometheus-pr18519-fix-TestFsType.patch diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index fae4e2500a89..703fbda70fd0 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -92,6 +92,10 @@ buildGoModule (finalAttrs: { proxyVendor = true; + patches = [ + ./prometheus-pr18519-fix-TestFsType.patch + ]; + outputs = [ "out" "doc" diff --git a/pkgs/by-name/pr/prometheus/prometheus-pr18519-fix-TestFsType.patch b/pkgs/by-name/pr/prometheus/prometheus-pr18519-fix-TestFsType.patch new file mode 100644 index 000000000000..a7ad2c20b32c --- /dev/null +++ b/pkgs/by-name/pr/prometheus/prometheus-pr18519-fix-TestFsType.patch @@ -0,0 +1,25 @@ +--- a/util/runtime/statfs_unix_test.go ++++ b/util/runtime/statfs_unix_test.go +@@ -19,20 +19,18 @@ import ( + "os" + "testing" + +- "github.com/grafana/regexp" + "github.com/stretchr/testify/require" + ) + +-var regexpFsType = regexp.MustCompile("^[A-Z][A-Z0-9_]*_MAGIC$") +- + func TestFsType(t *testing.T) { + var fsType string + + path, err := os.Getwd() + require.NoError(t, err) + ++ // A real path must yield a non-zero filesystem type. + fsType = FsType(path) +- require.Regexp(t, regexpFsType, fsType) ++ require.NotEqual(t, "0", fsType) + + fsType = FsType("/no/where/to/be/found") + require.Equal(t, "0", fsType) From 444fdee5efa8deb141c50c431208e8df29c853ae Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Mon, 20 Apr 2026 21:14:17 +0000 Subject: [PATCH 2/2] prometheus: Allow local networking on Darwin for assets build The npm test suite performs a localhost DNS lookup which fails in the Darwin sandbox without this. --- pkgs/by-name/pr/prometheus/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix index 703fbda70fd0..40cfe2fec8f0 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -63,6 +63,8 @@ let env.CI = true; + __darwinAllowLocalNetworking = true; + doCheck = true; checkPhase = '' runHook preCheck