From 18fd82d03e7939ff3b5e9fda79782d9e5bf5beb6 Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Wed, 29 Apr 2026 19:36:34 +0000 Subject: [PATCH] fix: use nixpkgs-uconsole (89dbf01) for uConsole host - Matches nixos-uconsole module's expected nixpkgs version - Other hosts (lazyworkhorse, cyt-pi) stay on nixos-unstable - Enables full nixos-uconsole module support --- flake.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 00fe783..f62895c 100644 --- a/flake.nix +++ b/flake.nix @@ -12,15 +12,18 @@ url = "git+https://git.lix.systems/lix-project/lix?ref=main"; inputs.nixpkgs.follows = "nixpkgs"; }; - # uConsole CM5 hardware support - nixos-uconsole.url = "github:nixos-uconsole/nixos-uconsole"; - # Note: nixos-uconsole manages its own nixpkgs input internally + # uConsole CM5 hardware support (uses its own nixpkgs for module compatibility) + nixpkgs-uconsole.url = "github:nixos/nixpkgs/89dbf01"; # Matches nixos-uconsole's nixpkgs (2025-12-29) + nixos-uconsole = { + url = "github:nixos-uconsole/nixos-uconsole"; + inputs.nixpkgs.follows = "nixpkgs-uconsole"; + }; # Raspberry Pi 5 hardware support nixos-hardware.url = "github:nixos/nixos-hardware/master"; self.submodules = true; }; - outputs = { self, nixpkgs, agenix, lix, nixos-uconsole, nixos-hardware, ... }@inputs: + outputs = { self, nixpkgs, nixpkgs-uconsole, agenix, lix, nixos-uconsole, nixos-hardware, ... }@inputs: let system = "x86_64-linux"; keys = import ./lib/keys.nix; @@ -85,7 +88,7 @@ ]; }; - uConsole = nixos-uconsole.lib.nixosSystem { + uConsole = nixpkgs-uconsole.lib.nixosSystem { system = "aarch64-linux"; specialArgs = { inherit self keys paths inputs; }; modules = [