Merge pull request #255 from nix-community/deadnix

apply deadnix

doc.nix

@@ -27,7 +27,7 @@ let
 
     EOF
     cat ${options.optionsCommonMark} >>$out
-  '').overrideAttrs (o: {
+  '').overrideAttrs (_o: {
     # Work around https://github.com/hercules-ci/hercules-ci-agent/issues/168
     allowSubstitutes = true;
   });

lib/default.nix

@@ -11,7 +11,7 @@ let
       name = "subType";
       description = "one of ${concatStringsSep "," (attrNames typeAttr)}";
       check = x: if x ? type then typeAttr.${x.type}.check x else throw "No type option set in:\n${generators.toPretty {} x}";
-      merge = loc: foldl' (res: def: typeAttr.${def.value.type}.merge loc [ def ]) { };
+      merge = loc: foldl' (_res: def: typeAttr.${def.value.type}.merge loc [ def ]) { };
       nestedTypes = typeAttr;
     };
 
@@ -171,10 +171,6 @@ let
         readOnly = true;
         type = lib.types.functionTo lib.types.str;
         default = args:
-          let
-            name = "format";
-            test = lib.optionalString (config ? name) "${config.${name}}";
-          in
           ''
             ( # ${config.type} ${concatMapStringsSep " " (n: toString (config.${n} or "")) ["name" "device" "format" "mountpoint"]}
               ${diskoLib.defineHookVariables { inherit config options; }}

lib/types/btrfs.nix

@@ -59,7 +59,7 @@
       internal = true;
       readOnly = true;
       type = lib.types.functionTo diskoLib.jsonType;
-      default = dev: { };
+      default = _dev: { };
       description = "Metadata";
     };
     _create = diskoLib.mkCreateOption {

lib/types/filesystem.nix

@@ -29,7 +29,7 @@
       internal = true;
       readOnly = true;
       type = lib.types.functionTo diskoLib.jsonType;
-      default = dev: { };
+      default = _dev: { };
       description = "Metadata";
     };
     _create = diskoLib.mkCreateOption {

lib/types/lvm_pv.nix

@@ -34,7 +34,7 @@
     _config = lib.mkOption {
       internal = true;
       readOnly = true;
-      default = dev: [ ];
+      default = _dev: [ ];
       description = "NixOS configuration";
     };
     _pkgs = lib.mkOption {

lib/types/mdraid.nix

@@ -34,7 +34,7 @@
     _config = lib.mkOption {
       internal = true;
       readOnly = true;
-      default = dev: [ ];
+      default = _dev: [ ];
       description = "NixOS configuration";
     };
     _pkgs = lib.mkOption {

lib/types/nodev.nix

@@ -65,7 +65,7 @@
       internal = true;
       readOnly = true;
       type = lib.types.functionTo (lib.types.listOf lib.types.package);
-      default = pkgs: [ ];
+      default = _pkgs: [ ];
       description = "Packages";
     };
   };

lib/types/swap.nix

@@ -15,7 +15,7 @@
       internal = true;
       readOnly = true;
       type = lib.types.functionTo diskoLib.jsonType;
-      default = dev: { };
+      default = _dev: { };
       description = "Metadata";
     };
     _create = diskoLib.mkCreateOption {

lib/types/table.nix

@@ -12,7 +12,7 @@
       description = "The kind of partition table";
     };
     partitions = lib.mkOption {
-      type = lib.types.listOf (lib.types.submodule ({ config, ... }: {
+      type = lib.types.listOf (lib.types.submodule ({ ... }: {
         options = {
           part-type = lib.mkOption {
             type = lib.types.enum [ "primary" "logical" "extended" ];
@@ -60,7 +60,7 @@
       type = lib.types.functionTo diskoLib.jsonType;
       default = dev:
         lib.foldr lib.recursiveUpdate { } (lib.imap
-          (index: partition:
+          (_index: partition:
             lib.optionalAttrs (partition.content != null) (partition.content._meta dev)
           )
           config.partitions);

lib/types/zfs.nix

@@ -33,7 +33,7 @@
     _config = lib.mkOption {
       internal = true;
       readOnly = true;
-      default = dev: [ ];
+      default = _dev: [ ];
       description = "NixOS configuration";
     };
     _pkgs = lib.mkOption {

lib/types/zfs_fs.nix

@@ -33,7 +33,7 @@
       internal = true;
       readOnly = true;
       type = lib.types.functionTo diskoLib.jsonType;
-      default = dev: { };
+      default = _dev: { };
       description = "Metadata";
     };
     _create = diskoLib.mkCreateOption {

lib/types/zfs_volume.nix

@@ -1,4 +1,4 @@
-{ config, options, lib, diskoLib, rootMountPoint, ... }:
+{ config, options, lib, diskoLib, ... }:
 {
   options = {
     name = lib.mkOption {

tests/bcachefs.nix

@@ -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 = [ ];
         });

tests/default.nix

@@ -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

tests/lib.nix

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