mirror of
https://github.com/nix-community/disko
synced 2024-11-10 06:14:14 +00:00
replace statix with deadnix
statix does sometimes weird stuff while deadnix is even better at finding deadcode
This commit is contained in:
parent
88bdb254fe
commit
3850c29595
3 changed files with 5 additions and 5 deletions
|
@ -60,14 +60,14 @@
|
||||||
name = "format";
|
name = "format";
|
||||||
runtimeInputs = with pkgs; [
|
runtimeInputs = with pkgs; [
|
||||||
nixpkgs-fmt
|
nixpkgs-fmt
|
||||||
statix
|
|
||||||
deno
|
deno
|
||||||
|
deadnix
|
||||||
];
|
];
|
||||||
text = ''
|
text = ''
|
||||||
set -o xtrace
|
set -o xtrace
|
||||||
nixpkgs-fmt "$@"
|
nixpkgs-fmt "$@"
|
||||||
statix fix "$@"
|
|
||||||
deno fmt "$@"
|
deno fmt "$@"
|
||||||
|
deadnix --edit "$@"
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
|
@ -86,7 +86,7 @@ let
|
||||||
tsp-config = tsp-generator.config testConfigBooted;
|
tsp-config = tsp-generator.config testConfigBooted;
|
||||||
num-disks = builtins.length (lib.attrNames testConfigBooted.disko.devices.disk);
|
num-disks = builtins.length (lib.attrNames testConfigBooted.disko.devices.disk);
|
||||||
|
|
||||||
installed-system = { modulesPath, ... }: {
|
installed-system = { ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
(lib.optionalAttrs (testMode == "direct") tsp-config)
|
(lib.optionalAttrs (testMode == "direct") tsp-config)
|
||||||
(lib.optionalAttrs (testMode == "module") {
|
(lib.optionalAttrs (testMode == "module") {
|
||||||
|
@ -149,7 +149,7 @@ let
|
||||||
makeTest' {
|
makeTest' {
|
||||||
name = "disko-${name}";
|
name = "disko-${name}";
|
||||||
|
|
||||||
nodes.machine = { pkgs, modulesPath, ... }: {
|
nodes.machine = { pkgs, ... }: {
|
||||||
imports = [
|
imports = [
|
||||||
(lib.optionalAttrs (testMode == "module") {
|
(lib.optionalAttrs (testMode == "module") {
|
||||||
imports = [
|
imports = [
|
||||||
|
|
|
@ -68,7 +68,7 @@
|
||||||
internal = true;
|
internal = true;
|
||||||
readOnly = true;
|
readOnly = true;
|
||||||
type = lib.types.functionTo diskoLib.jsonType;
|
type = lib.types.functionTo diskoLib.jsonType;
|
||||||
default = dev: { };
|
default = _dev: { };
|
||||||
description = "Metadata";
|
description = "Metadata";
|
||||||
};
|
};
|
||||||
_create = diskoLib.mkCreateOption {
|
_create = diskoLib.mkCreateOption {
|
||||||
|
|
Loading…
Reference in a new issue