apply deadnix

This commit is contained in:
Jörg Thalheim 2023-06-06 13:32:47 +02:00
parent 29d632d7e8
commit a8d85d9f89
15 changed files with 16 additions and 29 deletions

View file

@ -16,7 +16,7 @@ makeDiskoTest {
boot.supportedFilesystems = [ "bcachefs" ];
# disable zfs so we can support latest kernel
nixpkgs.overlays = [
(final: super: {
(_final: super: {
zfs = super.zfs.overrideAttrs (_: {
meta.platforms = [ ];
});

View file

@ -1,20 +1,11 @@
{ makeTest ? import <nixpkgs/nixos/tests/make-test-python.nix>
, eval-config ? import <nixpkgs/nixos/lib/eval-config.nix>
, pkgs ? (import <nixpkgs> { })
}@args:
}:
let
lib = pkgs.lib;
makeDiskoTest = (pkgs.callPackage ./lib.nix { inherit makeTest eval-config; }).makeDiskoTest;
evalTest = name: configFile:
let
disko-config = import configFile;
in
{
"${name}-tsp-create" = (pkgs.callPackage ../. { checked = true; }).createScript disko-config pkgs;
"${name}-tsp-mount" = (pkgs.callPackage ../. { checked = true; }).mountScript disko-config pkgs;
};
allTestFilenames =
builtins.map (lib.removeSuffix ".nix") (
builtins.filter

View file

@ -74,7 +74,7 @@
name = "disko-${name}";
inherit enableOCR;
nodes.machine = { config, pkgs, modulesPath, ... }: {
nodes.machine = { pkgs, modulesPath, ... }: {
imports = [
(lib.optionalAttrs (testMode == "module") {
imports = [