From 8079585c06940c496f89eda719355810bca90c22 Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 30 Dec 2024 17:27:24 -0500 Subject: [PATCH] make grafana work again by overlaying from small --- flake.lock | 17 +++++++++++++++++ flake.nix | 4 ++++ hosts/chunk/default.nix | 1 + 3 files changed, 22 insertions(+) diff --git a/flake.lock b/flake.lock index 2db332a..d6a1d09 100644 --- a/flake.lock +++ b/flake.lock @@ -89,6 +89,22 @@ "type": "github" } }, + "nixpkgs-small": { + "locked": { + "lastModified": 1735581264, + "narHash": "sha256-q4ocr/efe8RXw7/SPpTZVqw6GNRWTEMdOUMt66QephQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "98f9d01a955f7d568df2d1d362481f5423318216", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1733097829, @@ -112,6 +128,7 @@ "nixpkgs": "nixpkgs", "nixpkgs-borg": "nixpkgs-borg", "nixpkgs-btrbk": "nixpkgs-btrbk", + "nixpkgs-small": "nixpkgs-small", "sops-nix": "sops-nix", "treefmt": "treefmt" } diff --git a/flake.nix b/flake.nix index 99e8f24..50709b2 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -55,6 +56,9 @@ flake: pkgNames: final: prev: overridePkgsFromFlake prev flake pkgNames; overlays = [ + (overlayPkgsFromFlake inputs.nixpkgs-small [ + "prometheus" # fails to build on unstable + ]) ]; pkgsFor = lib.genAttrs systems ( diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix index 9c58b91..4f9b932 100644 --- a/hosts/chunk/default.nix +++ b/hosts/chunk/default.nix @@ -21,6 +21,7 @@ ./redlib.nix ./vaultwarden.nix ./wireguard.nix + ./grafana.nix ./tor.nix ./conduit.nix ./immich.nix