From 1f9f56ac9172c2f667c745675ae1629e61bd8ba1 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Fri, 22 Nov 2024 12:56:14 +0100 Subject: [PATCH] chore(lix): Use the global patch infrastructure for lix --- hive.nix | 15 ++------------- patches/default.nix | 7 +++++++ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/hive.nix b/hive.nix index 9917839..ec85d59 100644 --- a/hive.nix +++ b/hive.nix @@ -64,23 +64,12 @@ in }; defaults = - { - pkgs, - name, - nodeMeta, - ... - }: + { name, nodeMeta, ... }: { # Import the default modules imports = [ ./modules - (import "${sources.lix-module}/module.nix" { - lix = pkgs.applyPatches { - name = "lix-2.90.patched"; - src = sources.lix; - patches = [ ./patches/00-disable-installChecks-lix.patch ]; - }; - }) + (import "${sources.lix-module}/module.nix" { inherit (sources) lix; }) ]; # Include default secrets diff --git a/patches/default.nix b/patches/default.nix index 0cb2d81..4332474 100644 --- a/patches/default.nix +++ b/patches/default.nix @@ -1,4 +1,11 @@ { + lix = [ + { + _type = "static"; + path = ./00-disable-installChecks-lix.patch; + } + ]; + "nixos-24.05" = [ { _type = "static";