From 62fdd02bc43748a1dbe91c395e4441065faf2169 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 18 Oct 2024 12:27:27 +0000 Subject: [PATCH 1/3] mimir: 2.13.0 -> 2.14.0 https://github.com/grafana/mimir/releases/tag/mimir-2.14.0 --- pkgs/servers/monitoring/mimir/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix index 1656ec909ea6..521224bb7c22 100644 --- a/pkgs/servers/monitoring/mimir/default.nix +++ b/pkgs/servers/monitoring/mimir/default.nix @@ -1,15 +1,13 @@ -{ lib, buildGo122Module, fetchFromGitHub, nixosTests, nix-update-script }: -# Does not build with Go 1.23 -# FIXME: check again for next release -buildGo122Module rec { +{ lib, buildGoModule, fetchFromGitHub, nixosTests, nix-update-script }: +buildGoModule rec { pname = "mimir"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - hash = "sha256-XBCwc3jpLx8uj+UitFsoIAWVgC/2G8rgjOqrrLLyYdM="; + hash = "sha256-XALr755tFYaMnI913NCjwFPieedS00RXv4KhjXfOPfw="; }; vendorHash = null; From 61290de65d000c2933a386b8db228395fbaa4b1e Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 18 Oct 2024 10:10:54 -0400 Subject: [PATCH 2/3] mimir: move to by-name --- .../mimir/default.nix => by-name/mi/mimir/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/monitoring/mimir/default.nix => by-name/mi/mimir/package.nix} (100%) diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/by-name/mi/mimir/package.nix similarity index 100% rename from pkgs/servers/monitoring/mimir/default.nix rename to pkgs/by-name/mi/mimir/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6e143b53a80..8dc337176a6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24295,8 +24295,6 @@ with pkgs; grafana-loki = callPackage ../servers/monitoring/loki { }; promtail = callPackage ../servers/monitoring/loki/promtail.nix { }; - mimir = callPackage ../servers/monitoring/mimir { }; - phlare = callPackage ../servers/monitoring/phlare { }; grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { }; From f1fd37250269d1b35b4351405dd4f2d32ebec59c Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 18 Oct 2024 10:11:30 -0400 Subject: [PATCH 3/3] mimir: add adamcstephens to maintainers --- pkgs/by-name/mi/mimir/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix index 521224bb7c22..82b6c120b5cd 100644 --- a/pkgs/by-name/mi/mimir/package.nix +++ b/pkgs/by-name/mi/mimir/package.nix @@ -51,6 +51,6 @@ buildGoModule rec { "Grafana Mimir provides horizontally scalable, highly available, multi-tenant, long-term storage for Prometheus. "; homepage = "https://github.com/grafana/mimir"; license = licenses.agpl3Only; - maintainers = with maintainers; [ happysalada bryanhonof ]; + maintainers = with maintainers; [ happysalada bryanhonof adamcstephens ]; }; }