From d1d438c8dd6d6713882bfcc0da42bca6616c05cb Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Wed, 10 Jun 2026 15:27:52 +0100 Subject: [PATCH] =?UTF-8?q?prometheus:=203.11.3=20=E2=86=92=203.12.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop fstype test patch. --- pkgs/by-name/pr/prometheus/package.nix | 4 --- .../prometheus-pr18519-fix-TestFsType.patch | 25 ------------------- pkgs/by-name/pr/prometheus/source.nix | 8 +++--- 3 files changed, 4 insertions(+), 33 deletions(-) delete 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 7ab27fa8cefa..23deee23b54f 100644 --- a/pkgs/by-name/pr/prometheus/package.nix +++ b/pkgs/by-name/pr/prometheus/package.nix @@ -94,10 +94,6 @@ 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 deleted file mode 100644 index a7ad2c20b32c..000000000000 --- a/pkgs/by-name/pr/prometheus/prometheus-pr18519-fix-TestFsType.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- 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) diff --git a/pkgs/by-name/pr/prometheus/source.nix b/pkgs/by-name/pr/prometheus/source.nix index 7a582275a2f2..f1322bb8c0ca 100644 --- a/pkgs/by-name/pr/prometheus/source.nix +++ b/pkgs/by-name/pr/prometheus/source.nix @@ -1,6 +1,6 @@ { - version = "3.11.3"; - hash = "sha256-JmnVTVW6LsrdiQspKznksyhAYkmCXQcqCLK8q5nZI48="; - npmDepsHash = "sha256-6uE8d3+v5wobSyCl8oYlbNQZjRj/WtvVrpzo/PR2hQA="; - vendorHash = "sha256-wR1b5jV/2B50OeKokv8Ss+tpSXNjJBsLIZrK7gOb168="; + version = "3.12.0"; + hash = "sha256-xeENUVmG9tbIF+7i2u9zuvo7RXI9iNWFVDNUfNpF6/4="; + npmDepsHash = "sha256-cHMI5DqSRpIanrgk/H3aFUHLrGXH1v796PH1qDrCnbE="; + vendorHash = "sha256-caSI9uzbH93j06sJus9jSqo6qHKbP8D9DuDkiAlnfF4="; }