From c532076bc03d26751a2164f8451ccbe499a99645 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Fri, 27 Jun 2025 14:47:33 +0200 Subject: [PATCH] move nixops4 to overlay --- panel/nix/configuration.nix | 15 +-------------- panel/nix/overlay.nix | 13 +++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/panel/nix/configuration.nix b/panel/nix/configuration.nix index 3178eae0..41bb293f 100644 --- a/panel/nix/configuration.nix +++ b/panel/nix/configuration.nix @@ -2,7 +2,6 @@ config, pkgs, lib, - inputs, ... }: let @@ -148,19 +147,7 @@ in NixOps4 from the package's npins-based code, we will have to do with this workaround. ''; - default = - let - sources = import ../../npins; - inherit (import sources.flake-inputs) import-flake load-flake; - inherit - (import-flake { - src = ../../.; - }) - inputs - ; - inherit (inputs) nixops4; - in - (load-flake nixops4).packages.${pkgs.system}.default; + default = pkgs.nixops4; }; deployment = { diff --git a/panel/nix/overlay.nix b/panel/nix/overlay.nix index 88c8df9c..b6e0b98c 100644 --- a/panel/nix/overlay.nix +++ b/panel/nix/overlay.nix @@ -8,4 +8,17 @@ let in { python3 = prev.lib.attrsets.recursiveUpdate prev.python3 { pkgs = extraPython3Packages; }; + nixops4 = + let + sources = import ../../npins; + inherit (import sources.flake-inputs) import-flake load-flake; + inherit + (import-flake { + src = ../../.; + }) + inputs + ; + inherit (inputs) nixops4; + in + (load-flake nixops4).packages.${prev.system}.default; }