From 20c0c789f7db146bd685c0bf70a42450c0921f10 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 2 Sep 2024 10:35:19 +0200 Subject: [PATCH 1/2] feat: Support store subpaths in partitions..extraInputsFlake --- extras/partitions.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/extras/partitions.nix b/extras/partitions.nix index c55bdfa5..cabfa186 100644 --- a/extras/partitions.nix +++ b/extras/partitions.nix @@ -74,6 +74,7 @@ let p = options.extraInputsFlake.value; flake = if builtins.typeOf p == "path" + || (builtins.typeOf p == "string" && lib.strings.hasPrefix "${builtins.storeDir}/" p) then get-flake p else builtins.getFlake p; in From 9bfd9e4a83551f69605a7c5556851303e4a6448a Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 2 Sep 2024 10:39:20 +0200 Subject: [PATCH 2/2] Set type of partitions..extraInputsFlake --- extras/partitions.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/partitions.nix b/extras/partitions.nix index cabfa186..ce48de80 100644 --- a/extras/partitions.nix +++ b/extras/partitions.nix @@ -11,7 +11,7 @@ let partitionModule = { config, options, name, ... }: { options = { extraInputsFlake = mkOption { - type = types.raw; + type = types.either types.path types.str; default = { }; description = '' Location of a flake whose inputs to add to the inputs module argument in the partition.