From 9ac67db10979db8067f1ba95781b9ee1f7a34e28 Mon Sep 17 00:00:00 2001 From: cy Date: Sat, 4 Jan 2025 20:21:36 -0500 Subject: [PATCH] we can use unstable prometheus now --- flake.lock | 23 +++-------------------- flake.nix | 3 +-- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 65cad98..4700268 100644 --- a/flake.lock +++ b/flake.lock @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1735947440, - "narHash": "sha256-jnEcfmOhWntmVEcqlvs+j532+mvmgsKtQSSfukgkn+A=", + "lastModified": 1736013363, + "narHash": "sha256-P4lsS2Y5GzBfC8OfXtD/xWEucX6oHGTjOzjEjEJbXfc=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9987622b7b93c82e147f198574e8e6ffbf5e327", + "rev": "0d7908bd09165db6699908b7e3970f137327cbf0", "type": "github" }, "original": { @@ -230,22 +230,6 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1735669367, - "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -281,7 +265,6 @@ "nixpkgs": "nixpkgs", "nixpkgs-borg": "nixpkgs-borg", "nixpkgs-btrbk": "nixpkgs-btrbk", - "nixpkgs-stable": "nixpkgs-stable_2", "sops-nix": "sops-nix", "treefmt": "treefmt" } diff --git a/flake.nix b/flake.nix index 0151d61..87af009 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -64,7 +63,7 @@ overridePkgsFromFlake prev flake pkgNames; overlays = [ (overlayPkgsFromFlake inputs.nixpkgs-stable [ - "prometheus" # fails to build on unstable + # "prometheus" # fails to build on unstable ]) ];