From 9baa4c3d44dbe3c9e10acaaca5b599913176eb2a Mon Sep 17 00:00:00 2001 From: Kat Huang Date: Fri, 29 May 2026 23:55:52 -0700 Subject: [PATCH] Fix taffybar weeder flake input --- dotfiles/config/taffybar/flake.nix | 5 +++- nixos/flake.lock | 41 ++++++++++++++++++++---------- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/dotfiles/config/taffybar/flake.nix b/dotfiles/config/taffybar/flake.nix index 940c0341..c1e36a5b 100644 --- a/dotfiles/config/taffybar/flake.nix +++ b/dotfiles/config/taffybar/flake.nix @@ -4,7 +4,10 @@ # Keep the default source usable in CI. Local iteration uses # IMALISON_TAFFYBAR_LIVE_CHECKOUT below via `just switch-local-taffybar`. url = "github:taffybar/taffybar"; - inputs.weeder-nix.inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; + inputs.weeder-nix = { + url = "github:NorfairKing/weeder-nix"; + inputs.pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; + }; }; # Follow the vendored taffybar flake's pins so the config shell and the # library shell mostly share their nixpkgs/Haskell dependency graph. diff --git a/nixos/flake.lock b/nixos/flake.lock index 25c5c6d9..9c2261a2 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -226,23 +226,20 @@ }, "emacs-overlay": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_7", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1769448145, - "narHash": "sha256-499V3+SiDzp+Vkwo2Osp1AkstlWeDc3KzfOn+xoiu6Y=", + "lastModified": 1780112698, + "narHash": "sha256-vHBRy/IXXoYSVJFwgpn23kSYRIis2xsBXEGR5QV8hDo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2d2050b17743f564ffed290602e7816614a0dbdd", + "rev": "5a6425a7a1144748a49b25ab5d2d91ccd0ec09d1", "type": "github" }, "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" + "id": "emacs-overlay", + "type": "indirect" } }, "fenix": { @@ -1428,7 +1425,7 @@ "nix-utils": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1744222205, @@ -1539,16 +1536,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1767313136, - "narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=", + "lastModified": 1779796641, + "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d", + "rev": "25f538306313eae3927264466c70d7001dcea1df", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -1634,6 +1631,22 @@ } }, "nixpkgs_7": { + "locked": { + "lastModified": 1779560665, + "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1629252929, "narHash": "sha256-Aj20gmGBs8TG7pyaQqgbsqAQ6cB+TVuL18Pk3DPBxcQ=",