From 7dea715b94dea5b42fc1432f5a80b44e7659ca8b Mon Sep 17 00:00:00 2001 From: cy Date: Mon, 30 Dec 2024 23:54:20 -0500 Subject: [PATCH] take prometheus from stable instead wants to build locally on *every* nixos-rebuild on unstable and small but luckily stable works --- flake.lock | 12 ++++++------ flake.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 50d58f4..8eadffa 100644 --- a/flake.lock +++ b/flake.lock @@ -89,18 +89,18 @@ "type": "github" } }, - "nixpkgs-small": { + "nixpkgs-stable": { "locked": { - "lastModified": 1735581264, - "narHash": "sha256-q4ocr/efe8RXw7/SPpTZVqw6GNRWTEMdOUMt66QephQ=", + "lastModified": 1735531152, + "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "98f9d01a955f7d568df2d1d362481f5423318216", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable-small", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -128,7 +128,7 @@ "nixpkgs": "nixpkgs", "nixpkgs-borg": "nixpkgs-borg", "nixpkgs-btrbk": "nixpkgs-btrbk", - "nixpkgs-small": "nixpkgs-small", + "nixpkgs-stable": "nixpkgs-stable", "sops-nix": "sops-nix", "treefmt": "treefmt" } diff --git a/flake.nix b/flake.nix index a9d63f4..d8c515d 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -56,7 +56,7 @@ flake: pkgNames: final: prev: overridePkgsFromFlake prev flake pkgNames; overlays = [ - (overlayPkgsFromFlake inputs.nixpkgs-small [ + (overlayPkgsFromFlake inputs.nixpkgs-stable [ "prometheus" # fails to build on unstable ]) ];