put flake input overrides into a helper function
This commit is contained in:
@@ -37,6 +37,7 @@ lib.fix (
|
|||||||
inventory = clanLib.callLib ./modules/inventory { };
|
inventory = clanLib.callLib ./modules/inventory { };
|
||||||
modules = clanLib.callLib ./modules/inventory/frontmatter { };
|
modules = clanLib.callLib ./modules/inventory/frontmatter { };
|
||||||
test = clanLib.callLib ./test { };
|
test = clanLib.callLib ./test { };
|
||||||
|
flake-inputs = clanLib.callLib ./flake-inputs.nix { };
|
||||||
# Custom types
|
# Custom types
|
||||||
types = clanLib.callLib ./types { };
|
types = clanLib.callLib ./types { };
|
||||||
|
|
||||||
|
|||||||
16
lib/flake-inputs.nix
Normal file
16
lib/flake-inputs.nix
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
{ ... }:
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
Generate nix-unit input overrides for tests
|
||||||
|
|
||||||
|
# Example
|
||||||
|
```nix
|
||||||
|
inputOverrides = clanLib.flake-inputs.getOverrides inputs;
|
||||||
|
```
|
||||||
|
*/
|
||||||
|
getOverrides =
|
||||||
|
inputs:
|
||||||
|
builtins.concatStringsSep " " (
|
||||||
|
builtins.map (input: " --override-input ${input} ${inputs.${input}}") (builtins.attrNames inputs)
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,8 +1,6 @@
|
|||||||
{ self, inputs, ... }:
|
{ self, inputs, ... }:
|
||||||
let
|
let
|
||||||
inputOverrides = builtins.concatStringsSep " " (
|
inputOverrides = self.clanLib.flake-inputs.getOverrides inputs;
|
||||||
builtins.map (input: " --override-input ${input} ${inputs.${input}}") (builtins.attrNames inputs)
|
|
||||||
);
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
perSystem =
|
perSystem =
|
||||||
|
|||||||
@@ -4,9 +4,7 @@
|
|||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inputOverrides = builtins.concatStringsSep " " (
|
inputOverrides = self.clanLib.flake-inputs.getOverrides inputs;
|
||||||
builtins.map (input: " --override-input ${input} ${inputs.${input}}") (builtins.attrNames inputs)
|
|
||||||
);
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
{ self, inputs, ... }:
|
{ self, inputs, ... }:
|
||||||
let
|
let
|
||||||
inputOverrides = builtins.concatStringsSep " " (
|
inputOverrides = self.clanLib.flake-inputs.getOverrides inputs;
|
||||||
builtins.map (input: " --override-input ${input} ${inputs.${input}}") (builtins.attrNames inputs)
|
|
||||||
);
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
perSystem =
|
perSystem =
|
||||||
|
|||||||
@@ -5,9 +5,7 @@
|
|||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inputOverrides = builtins.concatStringsSep " " (
|
inputOverrides = self.clanLib.flake-inputs.getOverrides inputs;
|
||||||
builtins.map (input: " --override-input ${input} ${inputs.${input}}") (builtins.attrNames inputs)
|
|
||||||
);
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
|||||||
@@ -24,9 +24,7 @@
|
|||||||
testArgs ? { },
|
testArgs ? { },
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inputOverrides = builtins.concatStringsSep " " (
|
inputOverrides = self.clanLib.flake-inputs.getOverrides inputs;
|
||||||
builtins.map (input: " --override-input ${input} ${inputs.${input}}") (builtins.attrNames inputs)
|
|
||||||
);
|
|
||||||
attrName = "eval-tests-${testName}";
|
attrName = "eval-tests-${testName}";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -5,9 +5,7 @@
|
|||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inputOverrides = builtins.concatStringsSep " " (
|
inputOverrides = self.clanLib.flake-inputs.getOverrides inputs;
|
||||||
builtins.map (input: " --override-input ${input} ${inputs.${input}}") (builtins.attrNames inputs)
|
|
||||||
);
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
perSystem =
|
perSystem =
|
||||||
|
|||||||
Reference in New Issue
Block a user