From 57b8882cb9a2cc49cdde9e8620ba8573404b7450 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sun, 6 Apr 2025 15:55:21 +0800 Subject: [PATCH] flake-parts/setups/wrapper-manager: replace src with branch for top-level configs --- .../flake-parts/setups/wrapper-manager.nix | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/modules/flake-parts/setups/wrapper-manager.nix b/modules/flake-parts/setups/wrapper-manager.nix index f2339bbf..74f46cef 100644 --- a/modules/flake-parts/setups/wrapper-manager.nix +++ b/modules/flake-parts/setups/wrapper-manager.nix @@ -4,21 +4,11 @@ let partsConfig = config; cfg = config.setups.wrapper-manager; - mkWrapperManagerPackage = { pkgs, src, modules ? [ ], specialArgs ? { }, }: - let wrapperManagerEntrypoint = import src { }; - in wrapperManagerEntrypoint.lib.build { inherit pkgs modules specialArgs; }; + mkWrapperManagerPackage = { pkgs, wrapperManagerBranch ? "wrapper-manager-fds", modules ? [ ], specialArgs ? { }, }: + inputs.${wrapperManagerBranch}.lib.build { inherit pkgs modules specialArgs; }; wrapperManagerIntegrationModule = { name, config, lib, ... }: { options.wrapper-manager = { - src = lib.mkOption { - type = lib.types.path; - default = ../../../subprojects/wrapper-manager-fds; - description = '' - The path of the wrapper-manager-fds to be used to properly initialize - to the environment. - ''; - }; - additionalModules = lib.mkOption { type = with lib.types; listOf deferredModule; default = [ ]; @@ -28,6 +18,15 @@ let ''; }; + branch = lib.mkOption { + type = lib.types.str; + default = "wrapper-manager-fds"; + example = "wrapper-manager-fds-stable"; + description = '' + Name of the flake input containing the wrapper-manager-fds dependency. + ''; + }; + packages = lib.mkOption { type = with lib.types; attrsOf (submodule { @@ -137,7 +136,9 @@ in { ({ config, lib, ... }: { config = lib.mkIf (config.wrapper-manager.packages != { }) { modules = - [ (import config.wrapper-manager.src { }).nixosModules.default ]; + [ + inputs.${config.wrapper-manager.branch}.nixosModules.default + ]; }; }) ]); @@ -150,7 +151,9 @@ in { ({ config, lib, ... }: { config = lib.mkIf (config.wrapper-manager.packages != { }) { modules = - [ (import config.wrapper-manager.src { }).homeModules.default ]; + [ + inputs.${config.wrapper-manager.branch}.homeModules.default + ]; }; }) ]); @@ -181,7 +184,7 @@ in { in mkWrapperManagerPackage { inherit pkgs; inherit (metadata) specialArgs; - inherit (metadata.wrapper-manager) src; + wrapperManagerBranch = metadata.wrapper-manager.branch; modules = cfg.sharedModules ++ cfg.standaloneModules ++ metadata.modules; }) validWrapperManagerConfigs;