From 7ef0acadb36d2de3228597f00d3ef131b16cb322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?= Date: Wed, 4 Jun 2025 15:23:20 +0200 Subject: [PATCH] [HACK] Apply panel overlay in the whole flake This is to circumvent the fact that I cannot do `nixpkgs.overlay` in the node in the NixOS test. Probably we can still apply it somewhat locally, but I couldn't think of a good solution. --- flake.nix | 6 ++++++ panel/nix/configuration.nix | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 6e97183b..eb2e9398 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,7 @@ perSystem = { pkgs, + system, lib, inputs', ... @@ -39,6 +40,11 @@ { formatter = pkgs.nixfmt-rfc-style; + _module.args.pkgs = import inputs.nixpkgs { + inherit system; + overlays = [ (import ./panel/nix/overlay.nix) ]; + }; + pre-commit.settings.hooks = let ## Add a directory here if pre-commit hooks shouldn't apply to it. diff --git a/panel/nix/configuration.nix b/panel/nix/configuration.nix index b0bcd5c4..0598d2f1 100644 --- a/panel/nix/configuration.nix +++ b/panel/nix/configuration.nix @@ -136,8 +136,6 @@ in }; config = mkIf cfg.enable { - nixpkgs.overlays = [ (import ./overlay.nix) ]; - environment.systemPackages = [ manage-admin ]; services = {