diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-09-28 17:15:11 +0200 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-09-28 17:15:11 +0200 |
| commit | 7da8d25d8727b0f54f4918196b1ba13d946486b6 (patch) | |
| tree | 7adcef207df68aa7483af231bd1c9e4367472a71 /nixos/lib/default.nix | |
| parent | 7ddee326c2b49e0da7d96801fa703fe884455871 (diff) | |
| parent | 530b2323c94597d1f7efe2c8ceaf46ec2e026e9b (diff) | |
| download | nixpkgs-7da8d25d8727b0f54f4918196b1ba13d946486b6.tar nixpkgs-7da8d25d8727b0f54f4918196b1ba13d946486b6.tar.gz nixpkgs-7da8d25d8727b0f54f4918196b1ba13d946486b6.tar.bz2 nixpkgs-7da8d25d8727b0f54f4918196b1ba13d946486b6.tar.lz nixpkgs-7da8d25d8727b0f54f4918196b1ba13d946486b6.tar.xz nixpkgs-7da8d25d8727b0f54f4918196b1ba13d946486b6.tar.zst nixpkgs-7da8d25d8727b0f54f4918196b1ba13d946486b6.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'nixos/lib/default.nix')
| -rw-r--r-- | nixos/lib/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/nixos/lib/default.nix b/nixos/lib/default.nix index 2b3056e0145..65d91342d4d 100644 --- a/nixos/lib/default.nix +++ b/nixos/lib/default.nix @@ -21,6 +21,8 @@ let seqAttrsIf = cond: a: lib.mapAttrs (_: v: seqIf cond a v); eval-config-minimal = import ./eval-config-minimal.nix { inherit lib; }; + + testing-lib = import ./testing/default.nix { inherit lib; }; in /* This attribute set appears as lib.nixos in the flake, or can be imported @@ -30,4 +32,10 @@ in inherit (seqAttrsIf (!featureFlags?minimalModules) minimalModulesWarning eval-config-minimal) evalModules ; + + inherit (testing-lib) + evalTest + runTest + ; + } |