From 461017e7924c2aa2813a7ae55fb473742c023d3a Mon Sep 17 00:00:00 2001 From: ulve Date: Fri, 4 Sep 2026 14:22:22 +0200 Subject: [PATCH] Make herdr follow main nixpkgs input Avoids pulling in a separate nixos-unstable nixpkgs just for herdr. --- flake.lock | 22 ++++------------------ flake.nix | 5 ++++- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index c08cddd..d7d618c 100644 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,9 @@ "nodes": { "herdr": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "rust-overlay": "rust-overlay" }, "locked": { @@ -41,22 +43,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1779911860, - "narHash": "sha256-ubcLAcKBDCZjhxw/kH5DL5GdBZQdzLqpkTe7HonvJVs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c0a89c379b4ac67c7b13b051ddbd4e0dbc9b0eaf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1788405554, "narHash": "sha256-z3ACU3NTAstjK+JNjW0zmIH2Q0GYo2pgGfJddesv7Xo=", @@ -74,7 +60,7 @@ "inputs": { "herdr": "herdr", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "rssdownloader-src": "rssdownloader-src" } }, diff --git a/flake.nix b/flake.nix index da6b264..3bc6c9c 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - herdr.url = "github:ogulcancelik/herdr"; + herdr = { + url = "github:ogulcancelik/herdr"; + inputs.nixpkgs.follows = "nixpkgs"; + }; rssdownloader-src = { url = "git+https://codeberg.org/ulve/rssdownloader";