From 9c14449a5b9c3f14a70413d5d1c3c639ea664677 Mon Sep 17 00:00:00 2001 From: Cathal Mullan Date: Thu, 8 Dec 2022 12:41:03 +0000 Subject: [PATCH 1/2] maintainers: add cathalmullan --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 21e53a2ecc94..59576c45bb0f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2287,6 +2287,12 @@ githubId = 5394722; name = "Spencer Baugh"; }; + cathalmullan = { + email = "contact@cathal.dev"; + github = "CathalMullan"; + githubId = 37139470; + name = "Cathal Mullan"; + }; catouc = { email = "catouc@philipp.boeschen.me"; github = "catouc"; From 44f8fcf2231bb8a3019ce7ac234c727200e94dcc Mon Sep 17 00:00:00 2001 From: Cathal Mullan Date: Thu, 8 Dec 2022 12:42:14 +0000 Subject: [PATCH 2/2] phlare: init at 0.3.0 --- pkgs/servers/monitoring/phlare/default.nix | 40 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/servers/monitoring/phlare/default.nix diff --git a/pkgs/servers/monitoring/phlare/default.nix b/pkgs/servers/monitoring/phlare/default.nix new file mode 100644 index 000000000000..2730686bdc81 --- /dev/null +++ b/pkgs/servers/monitoring/phlare/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "phlare"; + version = "0.3.0"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "grafana"; + repo = "phlare"; + sha256 = "sha256-z1PT5chkpHQJPziY7bGf6W1X5uezL6E2GUV6w/NlyFk="; + }; + + proxyVendor = true; + vendorSha256 = "sha256-KJbh+M9jYxUW9akVBHZoB/mtOHWpMPtlwIgC9fu+NYY="; + + ldflags = let + prefix = "github.com/grafana/phlare/pkg/util/build"; + in [ + "-s" "-w" + # https://github.com/grafana/phlare/blob/v0.3.0/Makefile#L32 + "-X ${prefix}.Version=${version}" + "-X ${prefix}.Branch=v${version}" + "-X ${prefix}.Revision=v${version}" + "-X ${prefix}.BuildUser=nix" + "-X ${prefix}.BuildDate=1980-01-01T00:00:00Z" + ]; + + subPackages = [ + "cmd/phlare" + "cmd/profilecli" + ]; + + meta = with lib; { + description = "Grafana Phlare is an open source database that provides fast, scalable, highly available, and efficient storage and querying of profiling data."; + license = licenses.agpl3; + homepage = "https://grafana.com/oss/phlare"; + maintainers = with maintainers; [ cathalmullan ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96d9cb14ea13..d9ee56c0edd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23831,6 +23831,8 @@ with pkgs; mimir = callPackage ../servers/monitoring/mimir { }; + phlare = callPackage ../servers/monitoring/phlare { }; + grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; grafana-image-renderer = callPackage ../servers/monitoring/grafana-image-renderer { };