diff options
279 files changed, 419 insertions, 424 deletions
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index e14105f5f011..48288cf5962c 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -47,7 +47,7 @@ rec { machinesNumbered = zipLists machines (range 1 254); nodes_ = flip map machinesNumbered (m: nameValuePair m.fst - [ ( { config, pkgs, nodes, ... }: + [ ( { config, nodes, ... }: let interfacesNumbered = zipLists config.virtualisation.vlans (range 1 255); interfaces = flip map interfacesNumbered ({ fst, snd }: diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index ebfb09db7b7e..bf32a36895c5 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -24,9 +24,6 @@ # most likely fails as GRUB will probably refuse to install. partitionTableType ? "legacy" - # Whether to invoke switch-to-configuration boot during image creation -, installBootLoader ? true - , # The root file system type. fsType ? "ext4" diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index c6bafd48f9db..8cd19b6e1874 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, closureInfo, xorriso, syslinux +{ stdenv, closureInfo, xorriso, syslinux , # The file name of the resulting ISO image. isoName ? "cd.iso" diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 57acc990a48f..42a0c60c7e19 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -222,7 +222,7 @@ in rec { runInMachineWithX = { require ? [], ... } @ args: let client = - { config, pkgs, ... }: + { ... }: { inherit require; virtualisation.memorySize = 1024; diff --git a/nixos/maintainers/option-usages.nix b/nixos/maintainers/option-usages.nix index 371ee7d91808..242c2a4dd442 100644 --- a/nixos/maintainers/option-usages.nix +++ b/nixos/maintainers/option-usages.nix @@ -149,7 +149,7 @@ let else testOptions; checkAll = checkList == []; in - flip filter graph ({option, usedBy}: + flip filter graph ({option, ...}: (checkAll || elem option checkList) && !(elem option excludedTestOptions) ); @@ -165,7 +165,7 @@ let ''; graphToText = graph: - concatMapStrings ({option, usedBy}: + concatMapStrings ({usedBy, ...}: concatMapStrings (user: '' ${user} '') usedBy diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index c7a6c943bc27..d9ecaa4818ba 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -1,7 +1,7 @@ # This module gets rid of all dependencies on X11 client libraries # (including fontconfig). -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index c595c6932946..a74d551f50df 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -1,6 +1,6 @@ # Configuration for the Name Service Switch (/etc/nsswitch.conf). -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix index 4c37e8a6208c..0277f1ad11e9 100644 --- a/nixos/modules/config/power-management.nix +++ b/nixos/modules/config/power-management.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index 2114fb2b9d49..74bff602a477 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/config/unix-odbc-drivers.nix b/nixos/modules/config/unix-odbc-drivers.nix index 9565a09b3a1e..8dd811727389 100644 --- a/nixos/modules/config/unix-odbc-drivers.nix +++ b/nixos/modules/config/unix-odbc-drivers.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 621ca36fb6b8..0290eff22fbd 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -282,7 +282,7 @@ let }; - groupOpts = { name, config, ... }: { + groupOpts = { name, ... }: { options = { diff --git a/nixos/modules/config/vpnc.nix b/nixos/modules/config/vpnc.nix index c7ac1b3530e1..356e007c0a3e 100644 --- a/nixos/modules/config/vpnc.nix +++ b/nixos/modules/config/vpnc.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/hardware/network/smc-2632w/default.nix b/nixos/modules/hardware/network/smc-2632w/default.nix index 650011aca817..b00286464f34 100644 --- a/nixos/modules/hardware/network/smc-2632w/default.nix +++ b/nixos/modules/hardware/network/smc-2632w/default.nix @@ -1,4 +1,4 @@ -{lib, config, ...}: +{lib, ...}: { hardware = { diff --git a/nixos/modules/hardware/network/zydas-zd1211.nix b/nixos/modules/hardware/network/zydas-zd1211.nix index c8428a7241b1..5dd7f30ed82b 100644 --- a/nixos/modules/hardware/network/zydas-zd1211.nix +++ b/nixos/modules/hardware/network/zydas-zd1211.nix @@ -1,4 +1,4 @@ -{pkgs, config, ...}: +{pkgs, ...}: { hardware.firmware = [ pkgs.zd1211fw ]; diff --git a/nixos/modules/hardware/video/ati.nix b/nixos/modules/hardware/video/ati.nix index 022fdea0a0a3..2fa37af6ca58 100644 --- a/nixos/modules/hardware/video/ati.nix +++ b/nixos/modules/hardware/video/ati.nix @@ -1,6 +1,6 @@ # This module provides the proprietary ATI X11 / OpenGL drivers. -{ config, lib, pkgs, pkgs_i686, ... }: +{ config, lib, pkgs_i686, ... }: with lib; diff --git a/nixos/modules/hardware/video/capture/mwprocapture.nix b/nixos/modules/hardware/video/capture/mwprocapture.nix index aee15dcec6e5..61bab533edaf 100644 --- a/nixos/modules/hardware/video/capture/mwprocapture.nix +++ b/nixos/modules/hardware/video/capture/mwprocapture.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix index 832e61966120..2cf5f13bc159 100644 --- a/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix +++ b/nixos/modules/hardware/video/uvcvideo/uvcdynctrl-udev-rules.nix @@ -1,6 +1,4 @@ -{ lib -, stdenv -, buildEnv +{ buildEnv , libwebcam , makeWrapper , runCommand diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix index a4bcd7079a4f..3336d512cfd8 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { imports = [ ./installation-cd-graphical-kde.nix ]; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix index 4363c8e6c93b..3911a2b01b1e 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { imports = [ ./installation-cd-minimal.nix ]; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix index 7ec55f159d0e..3dc0f606bf60 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -1,7 +1,7 @@ # This module defines a small NixOS installation CD. It does not # contain any graphical stuff. -{ config, lib, pkgs, ... }: +{ ... }: { imports = diff --git a/nixos/modules/installer/netboot/netboot-base.nix b/nixos/modules/installer/netboot/netboot-base.nix index 5e8f7f93d92a..da7d760ad2fc 100644 --- a/nixos/modules/installer/netboot/netboot-base.nix +++ b/nixos/modules/installer/netboot/netboot-base.nix @@ -1,7 +1,7 @@ # This module contains the basic configuration for building netboot # images -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/installer/netboot/netboot-minimal.nix b/nixos/modules/installer/netboot/netboot-minimal.nix index 8ad6234edc77..1563501a7e01 100644 --- a/nixos/modules/installer/netboot/netboot-minimal.nix +++ b/nixos/modules/installer/netboot/netboot-minimal.nix @@ -1,6 +1,6 @@ # This module defines a small netboot environment. -{ config, lib, ... }: +{ ... }: { imports = diff --git a/nixos/modules/installer/scan/detected.nix b/nixos/modules/installer/scan/detected.nix index 7e181acb93b1..5c5fba56f517 100644 --- a/nixos/modules/installer/scan/detected.nix +++ b/nixos/modules/installer/scan/detected.nix @@ -1,6 +1,6 @@ # List all devices which are detected by nixos-generate-config. # Common devices are enabled by default. -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 05029628672b..af0a3a2fcc88 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -1,7 +1,7 @@ # This module generates nixos-install, nixos-rebuild, # nixos-generate-config, etc. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index f58c36587801..f823c0d83bb6 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/misc/assertions.nix b/nixos/modules/misc/assertions.nix index 3b50e60a0ffb..550b3ac97f6a 100644 --- a/nixos/modules/misc/assertions.nix +++ b/nixos/modules/misc/assertions.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix index f4ee94ecc0d7..8716e3d9fef2 100644 --- a/nixos/modules/misc/extra-arguments.nix +++ b/nixos/modules/misc/extra-arguments.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ pkgs, ... }: { _module.args = { diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 14c661553c6b..782f6c8f69df 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -9,7 +9,7 @@ # Systemd can also change ownership of service directories using the # RuntimeDirectory/StateDirectory options. -{ config, pkgs, lib, ... }: +{ lib, ... }: { options = { diff --git a/nixos/modules/misc/label.nix b/nixos/modules/misc/label.nix index 8e5e57b3b83b..02b91555b3c2 100644 --- a/nixos/modules/misc/label.nix +++ b/nixos/modules/misc/label.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/misc/lib.nix b/nixos/modules/misc/lib.nix index be8000ac029d..121f396701ea 100644 --- a/nixos/modules/misc/lib.nix +++ b/nixos/modules/misc/lib.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ lib, ... }: { options = { diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index dd6a2f67b30d..449149e4bb65 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -1,4 +1,4 @@ -{ config, options, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix index 7a1e751394c0..be3f4cbbcfe4 100644 --- a/nixos/modules/misc/meta.nix +++ b/nixos/modules/misc/meta.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/misc/passthru.nix b/nixos/modules/misc/passthru.nix index f3c9f6ba651b..4e99631fdd85 100644 --- a/nixos/modules/misc/passthru.nix +++ b/nixos/modules/misc/passthru.nix @@ -1,7 +1,7 @@ # This module allows you to export something from configuration # Use case: export kernel source expression for ease of configuring -{ config, lib, ... }: +{ lib, ... }: { options = { diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index f56640f19782..0d7124be0a5c 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -3,7 +3,7 @@ # enabled in the initrd. Its primary use is in the NixOS installation # CDs. -{ config, pkgs, ... }: +{ ... }: { diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 406a69722de6..5aaffa4f1f2a 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -1,7 +1,7 @@ # This module defines the software packages included in the "minimal" # installation CD. It might be useful elsewhere. -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: { # Include some utilities that are useful for installing or repairing diff --git a/nixos/modules/profiles/demo.nix b/nixos/modules/profiles/demo.nix index 7477795a94e9..18f190071bad 100644 --- a/nixos/modules/profiles/demo.nix +++ b/nixos/modules/profiles/demo.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { imports = [ ./graphical.nix ]; diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix index fe9851e79a6d..332cf58aa538 100644 --- a/nixos/modules/profiles/graphical.nix +++ b/nixos/modules/profiles/graphical.nix @@ -1,7 +1,7 @@ # This module defines a NixOS configuration with the Plasma 5 desktop. # It's used by the graphical installation CD. -{ config, pkgs, ... }: +{ pkgs, ... }: { services.xserver = { diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 456538742f51..2af8bf1f8e30 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -1,7 +1,7 @@ # A profile with most (vanilla) hardening options enabled by default, # potentially at the cost of features and performance. -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: with lib; diff --git a/nixos/modules/profiles/headless.nix b/nixos/modules/profiles/headless.nix index 67f8d633bab5..131ee272859a 100644 --- a/nixos/modules/profiles/headless.nix +++ b/nixos/modules/profiles/headless.nix @@ -1,7 +1,7 @@ # Common configuration for headless machines (e.g., Amazon EC2 # instances). -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix index 40df7063a9bf..ed04e46c77d1 100644 --- a/nixos/modules/profiles/minimal.nix +++ b/nixos/modules/profiles/minimal.nix @@ -1,7 +1,7 @@ # This module defines a small NixOS configuration. It does not # contain any graphical stuff. -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix index a1ec1d45395e..315d04093b13 100644 --- a/nixos/modules/profiles/qemu-guest.nix +++ b/nixos/modules/profiles/qemu-guest.nix @@ -1,7 +1,7 @@ # Common configuration for virtual machines running under QEMU (using # virtio). -{ config, pkgs, ... }: +{ ... }: { boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ]; diff --git a/nixos/modules/programs/atop.nix b/nixos/modules/programs/atop.nix index b91bd98047ee..4651cdb76e0b 100644 --- a/nixos/modules/programs/atop.nix +++ b/nixos/modules/programs/atop.nix @@ -1,6 +1,6 @@ # Global configuration for atop. -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/programs/bcc.nix b/nixos/modules/programs/bcc.nix index 3522ab22fa8e..d76249bb5cab 100644 --- a/nixos/modules/programs/bcc.nix +++ b/nixos/modules/programs/bcc.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: { options.programs.bcc.enable = lib.mkEnableOption "bcc"; diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 06ebb7bc729b..3bac8d98990a 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -2,7 +2,7 @@ # Most of the stuff here should probably be moved elsewhere sometime. -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix index 26ef18759921..3b5212c9e76b 100644 --- a/nixos/modules/programs/shell.nix +++ b/nixos/modules/programs/shell.nix @@ -1,6 +1,6 @@ # This module defines a standard configuration for NixOS shells. -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/programs/systemtap.nix b/nixos/modules/programs/systemtap.nix index fd84732cd412..ca81e018c9dc 100644 --- a/nixos/modules/programs/systemtap.nix +++ b/nixos/modules/programs/systemtap.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/security/hidepid.nix b/nixos/modules/security/hidepid.nix index 96443fda758c..55a48ea3c9c6 100644 --- a/nixos/modules/security/hidepid.nix +++ b/nixos/modules/security/hidepid.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: with lib; { diff --git a/nixos/modules/security/oath.nix b/nixos/modules/security/oath.nix index 20f3e2dd9f83..93bdc851117a 100644 --- a/nixos/modules/security/oath.nix +++ b/nixos/modules/security/oath.nix @@ -1,6 +1,6 @@ # This module provides configuration for the OATH PAM modules. -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index be02ba567956..a0565ca26204 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -97,7 +97,7 @@ let ${dir_cfg.extraConfig} ''; - directorOptions = {name, config, ...}: + directorOptions = {...}: { options = { password = mkOption { @@ -117,7 +117,7 @@ let }; }; - deviceOptions = {name, config, ...}: + deviceOptions = {...}: { options = { archiveDevice = mkOption { diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index 0c3fc9af6f88..415a70ea5ad4 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -510,7 +510,7 @@ in { ''; default = { }; type = types.attrsOf (types.submodule ( - { name, config, ... }: { + { ... }: { options = { path = mkOption { diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index 409c05221d03..9b31ff3b5824 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -6,7 +6,7 @@ with lib; description = '' Periodic backups to create with Restic. ''; - type = types.attrsOf (types.submodule ({ name, config, ... }: { + type = types.attrsOf (types.submodule ({ name, ... }: { options = { passwordFile = mkOption { type = types.str; diff --git a/nixos/modules/services/continuous-integration/jenkins/slave.nix b/nixos/modules/services/continuous-integration/jenkins/slave.nix index d8f55fb826f2..92deabc3dd3b 100644 --- a/nixos/modules/services/continuous-integration/jenkins/slave.nix +++ b/nixos/modules/services/continuous-integration/jenkins/slave.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; let cfg = config.services.jenkinsSlave; diff --git a/nixos/modules/services/hardware/actkbd.nix b/nixos/modules/services/hardware/actkbd.nix index b16a8f50a3d8..4168140b287a 100644 --- a/nixos/modules/services/hardware/actkbd.nix +++ b/nixos/modules/services/hardware/actkbd.nix @@ -15,7 +15,7 @@ let ${cfg.extraConfig} ''; - bindingCfg = { config, ... }: { + bindingCfg = { ... }: { options = { keys = mkOption { diff --git a/nixos/modules/services/hardware/nvidia-optimus.nix b/nixos/modules/services/hardware/nvidia-optimus.nix index eb1713baa140..d53175052c74 100644 --- a/nixos/modules/services/hardware/nvidia-optimus.nix +++ b/nixos/modules/services/hardware/nvidia-optimus.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: let kernel = config.boot.kernelPackages; in diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix index 1923addeb3ac..f6ed4e25e9cb 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix @@ -9,7 +9,7 @@ let etcFiles = pkgs.callPackage ./brscan4_etc_files.nix { netDevices = netDeviceList; }; - netDeviceOpts = { name, config, ... }: { + netDeviceOpts = { name, ... }: { options = { diff --git a/nixos/modules/services/logging/journalwatch.nix b/nixos/modules/services/logging/journalwatch.nix index 2c9bc18c8c3c..d0824df38ae3 100644 --- a/nixos/modules/services/logging/journalwatch.nix +++ b/nixos/modules/services/logging/journalwatch.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, services, ... }: +{ config, lib, pkgs, ... }: with lib; let diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 04df97fdbbec..e6091182b2ab 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -110,7 +110,7 @@ let special_use = \${toString mailbox.specialUse} '' + "}"; - mailboxes = { lib, pkgs, ... }: { + mailboxes = { ... }: { options = { name = mkOption { type = types.strMatching ''[^"]+''; diff --git a/nixos/modules/services/mail/mail.nix b/nixos/modules/services/mail/mail.nix index cfe1b5496a45..fed313e4738e 100644 --- a/nixos/modules/services/mail/mail.nix +++ b/nixos/modules/services/mail/mail.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix index 92a68b602510..64cc9c610ac3 100644 --- a/nixos/modules/services/misc/emby.nix +++ b/nixos/modules/services/misc/emby.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, mono, ... }: +{ config, pkgs, lib, ... }: with lib; diff --git a/nixos/modules/services/misc/jackett.nix b/nixos/modules/services/misc/jackett.nix index db72d36f2ac7..8d1b3d225a44 100644 --- a/nixos/modules/services/misc/jackett.nix +++ b/nixos/modules/services/misc/jackett.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, mono, ... }: +{ config, pkgs, lib, ... }: with lib; diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix index 8b493041b2c9..12bed05757ad 100644 --- a/nixos/modules/services/misc/nix-gc.nix +++ b/nixos/modules/services/misc/nix-gc.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix index 295e7fb0ba03..6f75e4dd03ea 100644 --- a/nixos/modules/services/misc/nix-optimise.nix +++ b/nixos/modules/services/misc/nix-optimise.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/services/misc/nix-ssh-serve.nix b/nixos/modules/services/misc/nix-ssh-serve.nix index 87ed7f0a61b9..7ce3841be2f5 100644 --- a/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/nixos/modules/services/misc/nix-ssh-serve.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; let cfg = config.nix.sshServe; diff --git a/nixos/modules/services/misc/radarr.nix b/nixos/modules/services/misc/radarr.nix index 7738eacc6ae9..1a9fad3883c3 100644 --- a/nixos/modules/services/misc/radarr.nix +++ b/nixos/modules/services/misc/radarr.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, mono, ... }: +{ config, pkgs, lib, ... }: with lib; diff --git a/nixos/modules/services/misc/sonarr.nix b/nixos/modules/services/misc/sonarr.nix index edba4e6c23eb..97b67a0b5033 100644 --- a/nixos/modules/services/misc/sonarr.nix +++ b/nixos/modules/services/misc/sonarr.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, mono, ... }: +{ config, pkgs, lib, ... }: with lib; diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 7daf12f91714..5f97abf18715 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -84,7 +84,7 @@ let in flatten (mapAttrsToList mkSublist attrs); in all isNull (findPkiDefinitions [] manualPkiOptions); - orgOptions = { name, ... }: { + orgOptions = { ... }: { options.users = mkOption { type = types.uniq (types.listOf types.str); default = []; diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 8d2c303a69e8..9c58a15bcd73 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -94,7 +94,7 @@ let }; }); - mkSubModule = { name, port, extraOpts, serviceOpts }: { + mkSubModule = { name, port, extraOpts, ... }: { ${name} = mkOption { type = types.submodule { options = (mkExporterOpts { diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index fecae4ca1b36..c345ec48a018 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -64,7 +64,7 @@ let "DEVICESCAN ${notifyOpts}${cfg.defaults.autodetected}"} ''; - smartdDeviceOpts = { name, ... }: { + smartdDeviceOpts = { ... }: { options = { diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix index 182fabf6405f..e06a80e443d9 100644 --- a/nixos/modules/services/network-filesystems/beegfs.nix +++ b/nixos/modules/services/network-filesystems/beegfs.nix @@ -139,7 +139,7 @@ in description = '' BeeGFS configurations. Every mount point requires a separate configuration. ''; - type = with types; attrsOf (submodule ({ config, ... } : { + type = with types; attrsOf (submodule ({ ... } : { options = { mgmtdHost = mkOption { type = types.str; diff --git a/nixos/modules/services/network-filesystems/openafs/lib.nix b/nixos/modules/services/network-filesystems/openafs/lib.nix index 255740ac65ef..a0d4a3a9705c 100644 --- a/nixos/modules/services/network-filesystems/openafs/lib.nix +++ b/nixos/modules/services/network-filesystems/openafs/lib.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ...}: +{ config, lib, ...}: let inherit (lib) concatStringsSep getBin mkOption types; diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 81e11db10409..2ec5a10b4818 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -1,5 +1,5 @@ # Avahi daemon. -{ config, lib, utils, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index 39b62bdc7094..c40962f4aa82 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -9,7 +9,7 @@ let cfg = config.services.cjdns; connectToSubmodule = - { options, ... }: + { ... }: { options = { password = mkOption { type = types.str; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 4f219fe56b4c..3afafaf3fed5 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -405,7 +405,7 @@ in outTunnels = mkOption { default = {}; type = with types; loaOf (submodule ( - { name, config, ... }: { + { name, ... }: { options = { destinationPort = mkOption { type = types.int; @@ -426,7 +426,7 @@ in inTunnels = mkOption { default = {}; type = with types; loaOf (submodule ( - { name, config, ... }: { + { name, ... }: { options = { inPort = mkOption { type = types.int; diff --git a/nixos/modules/services/networking/nghttpx/nghttpx-options.nix b/nixos/modules/services/networking/nghttpx/nghttpx-options.nix index cce65be321a8..51f1d081b971 100644 --- a/nixos/modules/services/networking/nghttpx/nghttpx-options.nix +++ b/nixos/modules/services/networking/nghttpx/nghttpx-options.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ lib, ... }: { options.services.nghttpx = { enable = lib.mkEnableOption "nghttpx"; diff --git a/nixos/modules/services/networking/nylon.nix b/nixos/modules/services/networking/nylon.nix index b7b59d95bf02..613b0e0fb51a 100644 --- a/nixos/modules/services/networking/nylon.nix +++ b/nixos/modules/services/networking/nylon.nix @@ -22,7 +22,7 @@ let Deny-IP=${concatStringsSep " " cfg.deniedIPRanges} ''; - nylonOpts = { name, config, ... }: { + nylonOpts = { name, ... }: { options = { diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix index 513e6174752c..56a612b91052 100644 --- a/nixos/modules/services/networking/pptpd.nix +++ b/nixos/modules/services/networking/pptpd.nix @@ -1,4 +1,4 @@ -{ config, stdenv, pkgs, lib, ... }: +{ config, pkgs, lib, ... }: with lib; diff --git a/nixos/modules/services/networking/shout.nix b/nixos/modules/services/networking/shout.nix index 9784f1d160f3..1ea676d0f929 100644 --- a/nixos/modules/services/networking/shout.nix +++ b/nixos/modules/services/networking/shout.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, options, ... }: +{ pkgs, lib, config, ... }: with lib; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 7b2d1920f0f1..c16fbe8a52fa 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -479,7 +479,7 @@ in assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; message = "cannot enable X11 forwarding without setting xauth location";}] - ++ flip map cfg.listenAddresses ({ addr, port, ... }: { + ++ flip map cfg.listenAddresses ({ addr, ... }: { assertion = addr != null; message = "addr must be specified in each listenAddresses entry"; }); diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix index f5baea9222be..b7655f4bec62 100644 --- a/nixos/modules/services/networking/toxvpn.nix +++ b/nixos/modules/services/networking/toxvpn.nix @@ -1,4 +1,4 @@ -{ config, stdenv, pkgs, lib, ... }: +{ config, pkgs, lib, ... }: with lib; diff --git a/nixos/modules/services/networking/tvheadend.nix b/nixos/modules/services/networking/tvheadend.nix index f495c39967e8..ccf879996631 100644 --- a/nixos/modules/services/networking/tvheadend.nix +++ b/nixos/modules/services/networking/tvheadend.nix @@ -1,4 +1,4 @@ -{ config, coreutils, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index acb4778d8485..1b87b77f9768 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -10,7 +10,7 @@ let # interface options - interfaceOpts = { name, ... }: { + interfaceOpts = { ... }: { options = { diff --git a/nixos/modules/services/networking/xl2tpd.nix b/nixos/modules/services/networking/xl2tpd.nix index 5e006c13f0d0..46111a76af80 100644 --- a/nixos/modules/services/networking/xl2tpd.nix +++ b/nixos/modules/services/networking/xl2tpd.nix @@ -1,4 +1,4 @@ -{ config, stdenv, pkgs, lib, ... }: +{ config, pkgs, lib, ... }: with lib; diff --git a/nixos/modules/services/networking/zerobin.nix b/nixos/modules/services/networking/zerobin.nix index 274bbca53fa3..06ccd7032e6c 100644 --- a/nixos/modules/services/networking/zerobin.nix +++ b/nixos/modules/services/networking/zerobin.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, nodes, ... }: +{ config, pkgs, lib, ... }: with lib; let cfg = config.services.zerobin; diff --git a/nixos/modules/services/security/oauth2_proxy_nginx.nix b/nixos/modules/services/security/oauth2_proxy_nginx.nix index 2aa2c57fd22c..a9ad5497a657 100644 --- a/nixos/modules/services/security/oauth2_proxy_nginx.nix +++ b/nixos/modules/services/security/oauth2_proxy_nginx.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: +{ config, lib, ... }: with lib; let cfg = config.services.oauth2_proxy.nginx; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index dcb41d187c2b..def77ba69e58 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -578,7 +578,7 @@ in ]; } ''; - type = types.loaOf (types.submodule ({name, config, ...}: { + type = types.loaOf (types.submodule ({name, ...}: { options = { name = mkOption { @@ -638,7 +638,7 @@ in authorizeClient = mkOption { default = null; description = "If configured, the hidden service is accessible for authorized clients only."; - type = types.nullOr (types.submodule ({config, ...}: { + type = types.nullOr (types.submodule ({...}: { options = { diff --git a/nixos/modules/services/torrent/flexget.nix b/nixos/modules/services/torrent/flexget.nix index 4b9038e3e251..ca63f529a5df 100644 --- a/nixos/modules/services/torrent/flexget.nix +++ b/nixos/modules/services/torrent/flexget.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, timezone, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/web-apps/matomo.nix b/nixos/modules/services/web-apps/matomo.nix index 42affb06b51f..fbbd7715c6b3 100644 --- a/nixos/modules/services/web-apps/matomo.nix +++ b/nixos/modules/services/web-apps/matomo.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, services, ... }: +{ config, lib, pkgs, ... }: with lib; let cfg = config.services.matomo; diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix index e057e3025629..8c675c642005 100644 --- a/nixos/modules/services/web-apps/youtrack.nix +++ b/nixos/modules/services/web-apps/youtrack.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, options, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix b/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix index 6f1f67970f6c..77194f347492 100644 --- a/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix +++ b/nixos/modules/services/web-servers/apache-httpd/limesurvey.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, serverInfo, php, ... }: +{ config, lib, pkgs, serverInfo, ... }: with lib; diff --git a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix index 6dd91be00a73..4b8ee2b17ea7 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mercurial.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mercurial.nix @@ -1,4 +1,4 @@ -{ config, pkgs, serverInfo, lib, ... }: +{ config, pkgs, lib, ... }: let inherit (pkgs) mercurial; diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix index 1c654667dfc7..c810b914e258 100644 --- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix +++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, serverInfo, php, ... }: +{ config, lib, pkgs, serverInfo, ... }: # http://codex.wordpress.org/Hardening_WordPress with lib; diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index e4494dff37da..1075b00768fd 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -3,7 +3,7 @@ # has additional options that affect the web server as a whole, like # the user/group to run under.) -{ config, lib }: +{ lib, ... }: with lib; { diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix index 1dcc3ac9d8d4..4cad2a2ff777 100644 --- a/nixos/modules/services/web-servers/zope2.nix +++ b/nixos/modules/services/web-servers/zope2.nix @@ -6,7 +6,7 @@ let cfg = config.services.zope2; - zope2Opts = { name, config, ... }: { + zope2Opts = { name, ... }: { options = { name = mkOption { diff --git a/nixos/modules/services/x11/display-managers/auto.nix b/nixos/modules/services/x11/display-managers/auto.nix index c02ccdf12b65..d2aae64bf225 100644 --- a/nixos/modules/services/x11/display-managers/auto.nix +++ b/nixos/modules/services/x11/display-managers/auto.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix index 09a7f386876f..503c14c9b624 100644 --- a/nixos/modules/services/x11/terminal-server.nix +++ b/nixos/modules/services/x11/terminal-server.nix @@ -5,7 +5,7 @@ # not, a X server (Xvfb) is started for that user. The Xvfb instances # persist across VNC sessions. -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: with lib; diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix index e617e55a7a57..06c59342b45a 100644 --- a/nixos/modules/services/x11/window-managers/default.nix +++ b/nixos/modules/services/x11/window-managers/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/services/x11/window-managers/wmii.nix b/nixos/modules/services/x11/window-managers/wmii.nix index 30c8df782245..a414d8d4ac6b 100644 --- a/nixos/modules/services/x11/window-managers/wmii.nix +++ b/nixos/modules/services/x11/window-managers/wmii.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, options, modulesPath, ... }: +{ config, lib, pkgs, ... }: with lib; let diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 3048cd02683f..b45e510f6b83 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, pkgs_i686, ... }: +{ config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index e2d1dd49ef0e..da29e08b3691 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -226,7 +226,7 @@ in default = []; example = lib.literalExample "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { }; }) ]"; type = types.listOf (types.submodule ( - { options, ... }: { + { ... }: { options.original = mkOption { type = types.package; description = "The original package to override."; diff --git a/nixos/modules/system/boot/kexec.nix b/nixos/modules/system/boot/kexec.nix index 3fc1af28f628..3e5d7b40f2c5 100644 --- a/nixos/modules/system/boot/kexec.nix +++ b/nixos/modules/system/boot/kexec.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ pkgs, lib, ... }: { config = lib.mkIf (pkgs.kexectools.meta.available) { diff --git a/nixos/modules/system/boot/loader/loader.nix b/nixos/modules/system/boot/loader/loader.nix index 28cceafea7ca..7fbda9ef0f57 100644 --- a/nixos/modules/system/boot/loader/loader.nix +++ b/nixos/modules/system/boot/loader/loader.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 9aa557ac8595..ce770d067608 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -523,7 +523,7 @@ let }; - networkConfig = { name, config, ... }: { + networkConfig = { config, ... }: { config = { matchConfig = optionalAttrs (config.name != null) { Name = config.name; diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index e1095fb988eb..fc68904ae080 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; let diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 500c2d406615..ed149f4791bf 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -193,7 +193,7 @@ let x = pkgs.writeTextFile { name = "unit-script"; executable = true; destination = "/bin/${mkScriptName name}"; inherit text; }; in "${x}/bin/${mkScriptName name}"; - unitConfig = { name, config, ... }: { + unitConfig = { config, ... }: { config = { unitConfig = optionalAttrs (config.requires != []) @@ -275,7 +275,7 @@ let ]; }; - mountConfig = { name, config, ... }: { + mountConfig = { config, ... }: { config = { mountConfig = { What = config.what; @@ -288,7 +288,7 @@ let }; }; - automountConfig = { name, config, ... }: { + automountConfig = { config, ... }: { config = { automountConfig = { Where = config.where; diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix index 18aad58b36cc..8d8bfe5900a9 100644 --- a/nixos/modules/system/boot/timesyncd.nix +++ b/nixos/modules/system/boot/timesyncd.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/tasks/bcache.nix b/nixos/modules/tasks/bcache.nix index 3bfdf89e0cf5..8bab91c721fd 100644 --- a/nixos/modules/tasks/bcache.nix +++ b/nixos/modules/tasks/bcache.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { diff --git a/nixos/modules/tasks/filesystems/ext.nix b/nixos/modules/tasks/filesystems/ext.nix index 3a8999c242bd..a14a3ac38549 100644 --- a/nixos/modules/tasks/filesystems/ext.nix +++ b/nixos/modules/tasks/filesystems/ext.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { config = { diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index c640e886fca8..2318bdd1d582 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, utils, ... }: +{ config, lib, utils, ... }: with utils; with lib; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 7053aa57f803..20a740ce1f0c 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1,4 +1,4 @@ -{ config, options, lib, pkgs, utils, stdenv, ... }: +{ config, options, lib, pkgs, utils, ... }: with lib; with utils; diff --git a/nixos/modules/tasks/scsi-link-power-management.nix b/nixos/modules/tasks/scsi-link-power-management.nix index 69599bda6d32..a9d987780ee1 100644 --- a/nixos/modules/tasks/scsi-link-power-management.nix +++ b/nixos/modules/tasks/scsi-link-power-management.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix index 1b142fb8fd36..93e03c44c868 100644 --- a/nixos/modules/tasks/swraid.nix +++ b/nixos/modules/tasks/swraid.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index 1f8f2891e98c..3575a291b2b4 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: with lib; diff --git a/nixos/modules/testing/service-runner.nix b/nixos/modules/testing/service-runner.nix index dfe8b430e045..25490d671152 100644 --- a/nixos/modules/testing/service-runner.nix +++ b/nixos/modules/testing/service-runner.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: with lib; diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index 9ecdcf23e5fb..1a45c3093b78 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: { options = { ec2 = { diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix index 5cd2304a2953..03239991b95a 100644 --- a/nixos/modules/virtualisation/azure-common.nix +++ b/nixos/modules/virtualisation/azure-common.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, pkgs, ... }: with lib; { diff --git a/nixos/modules/virtualisation/azure-config-user.nix b/nixos/modules/virtualisation/azure-config-user.nix index de1b3857923f..267ba50ae025 100644 --- a/nixos/modules/virtualisation/azure-config-user.nix +++ b/nixos/modules/virtualisation/azure-config-user.nix @@ -1,4 +1,4 @@ -{ config, pkgs, modulesPath, ... }: +{ modulesPath, ... }: { # To build the configuration or use nix-env, you need to run diff --git a/nixos/modules/virtualisation/azure-config.nix b/nixos/modules/virtualisation/azure-config.nix index 5c9f18ef52a5..780bd1b78dce 100644 --- a/nixos/modules/virtualisation/azure-config.nix +++ b/nixos/modules/virtualisation/azure-config.nix @@ -1,4 +1,4 @@ -{ config, pkgs, modulesPath, ... }: +{ modulesPath, ... }: { imports = [ "${modulesPath}/virtualisation/azure-image.nix" ]; diff --git a/nixos/modules/virtualisation/brightbox-config.nix b/nixos/modules/virtualisation/brightbox-config.nix index 528ffecc0bf2..0a018e4cd695 100644 --- a/nixos/modules/virtualisation/brightbox-config.nix +++ b/nixos/modules/virtualisation/brightbox-config.nix @@ -1,4 +1,4 @@ -{ config, pkgs, modulesPath, ... }: +{ modulesPath, ... }: { imports = [ "${modulesPath}/virtualisation/brightbox-image.nix" ]; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index c3044ea124cf..31f5f6fe7807 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -257,7 +257,7 @@ let system = config.nixpkgs.localSystem.system; - bindMountOpts = { name, config, ... }: { + bindMountOpts = { name, ... }: { options = { mountPoint = mkOption { @@ -284,7 +284,7 @@ let }; - allowedDeviceOpts = { name, config, ... }: { + allowedDeviceOpts = { ... }: { options = { node = mkOption { example = "/dev/net/tun"; diff --git a/nixos/modules/virtualisation/docker-image.nix b/nixos/modules/virtualisation/docker-image.nix index 9535e3e0d677..2f304094d55b 100644 --- a/nixos/modules/virtualisation/docker-image.nix +++ b/nixos/modules/virtualisation/docker-image.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { imports = [ diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix index f6bca1aa8579..8f20100bc1b1 100644 --- a/nixos/modules/virtualisation/google-compute-config.nix +++ b/nixos/modules/virtualisation/google-compute-config.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { imports = [ <nixpkgs/nixos/modules/virtualisation/google-compute-image.nix> ]; diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix index dbb7b881955a..d49364840187 100644 --- a/nixos/modules/virtualisation/lxc-container.nix +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix index c1d2a314daf2..cecf2a3f144c 100644 --- a/nixos/modules/virtualisation/nova-config.nix +++ b/nixos/modules/virtualisation/nova-config.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ lib, ... }: with lib; diff --git a/nixos/modules/virtualisation/xen-domU.nix b/nixos/modules/virtualisation/xen-domU.nix index b46002c10b54..c00b984c2ce0 100644 --- a/nixos/modules/virtualisation/xen-domU.nix +++ b/nixos/modules/virtualisation/xen-domU.nix @@ -1,6 +1,6 @@ # Common configuration for Xen DomU NixOS virtual machines. -{ config, pkgs, ... }: +{ ... }: { boot.loader.grub.version = 2; diff --git a/nixos/release.nix b/nixos/release.nix index f11f372335a0..dfa4ee9e1278 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -45,7 +45,7 @@ let makeIso = - { module, type, maintainers ? ["eelco"], system }: + { module, type, system, ... }: with import nixpkgs { inherit system; }; @@ -56,7 +56,7 @@ let makeSdImage = - { module, maintainers ? ["dezgeg"], system }: + { module, system, ... }: with import nixpkgs { inherit system; }; @@ -96,7 +96,7 @@ let buildFromConfig = module: sel: forAllSystems (system: hydraJob (sel (import ./lib/eval-config.nix { inherit system; modules = [ module versionModule ] ++ singleton - ({ config, lib, ... }: + ({ ... }: { fileSystems."/".device = mkDefault "/dev/sda1"; boot.loader.grub.device = mkDefault "/dev/sda"; }); @@ -128,15 +128,15 @@ in rec { channel = import lib/make-channel.nix { inherit pkgs nixpkgs version versionSuffix; }; - manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual); - manualEpub = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualEpub)); - manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages); - manualGeneratedSources = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.generatedSources); - options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux; + manual = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manual); + manualEpub = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manualEpub)); + manpages = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.manpages); + manualGeneratedSources = buildFromConfig ({ ... }: { }) (config: config.system.build.manual.generatedSources); + options = (buildFromConfig ({ ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux; # Build the initial ramdisk so Hydra can keep track of its size over time. - initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk); + initialRamdisk = buildFromConfig ({ ... }: { }) (config: config.system.build.initialRamdisk); netboot = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeNetboot { inherit system; @@ -195,7 +195,7 @@ in rec { dummy = forAllSystems (system: pkgs.runCommand "dummy" { toplevel = (import lib/eval-config.nix { inherit system; - modules = singleton ({ config, pkgs, ... }: + modules = singleton ({ ... }: { fileSystems."/".device = mkDefault "/dev/sda1"; boot.loader.grub.device = mkDefault "/dev/sda"; system.nixos.stateVersion = mkDefault "18.03"; @@ -424,27 +424,27 @@ in rec { closures = { - smallContainer = makeClosure ({ pkgs, ... }: + smallContainer = makeClosure ({ ... }: { boot.isContainer = true; services.openssh.enable = true; }); - tinyContainer = makeClosure ({ pkgs, ... }: + tinyContainer = makeClosure ({ ... }: { boot.isContainer = true; imports = [ modules/profiles/minimal.nix ]; }); - ec2 = makeClosure ({ pkgs, ... }: + ec2 = makeClosure ({ ... }: { imports = [ modules/virtualisation/amazon-image.nix ]; }); - kde = makeClosure ({ pkgs, ... }: + kde = makeClosure ({ ... }: { services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; services.xserver.desktopManager.plasma5.enable = true; }); - xfce = makeClosure ({ pkgs, ... }: + xfce = makeClosure ({ ... }: { services.xserver.enable = true; services.xserver.desktopManager.xfce.enable = true; }); diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index c5898db6b325..6d728b387e14 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -1,5 +1,5 @@ let - commonConfig = { config, lib, pkgs, nodes, ... }: { + commonConfig = { lib, nodes, ... }: { networking.nameservers = [ nodes.letsencrypt.config.networking.primaryIPAddress ]; diff --git a/nixos/tests/ammonite.nix b/nixos/tests/ammonite.nix index e1dee71fddf2..fedfde233e8d 100644 --- a/nixos/tests/ammonite.nix +++ b/nixos/tests/ammonite.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { amm = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.ammonite ]; }; diff --git a/nixos/tests/atd.nix b/nixos/tests/atd.nix index ef848c2a374f..9f367d4c1d2a 100644 --- a/nixos/tests/atd.nix +++ b/nixos/tests/atd.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, lib, ... }: +import ./make-test.nix ({ pkgs, ... }: { name = "atd"; @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, lib, ... }: }; machine = - { config, pkgs, ... }: + { ... }: { services.atd.enable = true; users.users.alice = { isNormalUser = true; }; }; diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix index 976a770e887c..dfb60998941b 100644 --- a/nixos/tests/avahi.nix +++ b/nixos/tests/avahi.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... } : { }; nodes = let - cfg = { config, pkgs, ... }: { + cfg = { ... }: { services.avahi = { enable = true; nssmdns = true; diff --git a/nixos/tests/beegfs.nix b/nixos/tests/beegfs.nix index 433910feafe3..9c241fd2301a 100644 --- a/nixos/tests/beegfs.nix +++ b/nixos/tests/beegfs.nix @@ -1,9 +1,9 @@ -import ./make-test.nix ({ pkgs, ... } : +import ./make-test.nix ({ ... } : let connAuthFile="beegfs/auth-def.key"; - client = { config, pkgs, lib, ... } : { + client = { pkgs, ... } : { networking.firewall.enable = false; services.beegfsEnable = true; services.beegfs.default = { @@ -31,7 +31,7 @@ let }; - server = service : { config, pkgs, lib, ... } : { + server = service : { pkgs, ... } : { networking.firewall.enable = false; boot.initrd.postDeviceCommands = '' ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 50c98664660a..609b1ff7a83a 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -30,7 +30,7 @@ in nodes = { tracker = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.transmission pkgs.opentracker ]; # We need Apache on the tracker to serve the torrents. @@ -42,7 +42,7 @@ in }; router = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.miniupnpd ]; virtualisation.vlans = [ 1 2 ]; networking.nat.enable = true; @@ -52,7 +52,7 @@ in }; client1 = - { config, pkgs, nodes, ... }: + { pkgs, nodes, ... }: { environment.systemPackages = [ pkgs.transmission ]; virtualisation.vlans = [ 2 ]; networking.defaultGateway = @@ -61,7 +61,7 @@ in }; client2 = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.transmission ]; networking.firewall.enable = false; }; diff --git a/nixos/tests/borgbackup.nix b/nixos/tests/borgbackup.nix index 36731773de27..9b39abdfa8ed 100644 --- a/nixos/tests/borgbackup.nix +++ b/nixos/tests/borgbackup.nix @@ -41,7 +41,7 @@ in { }; nodes = { - client = { config, pkgs, ... }: { + client = { ... }: { services.borgbackup.jobs = { local = rec { @@ -84,7 +84,7 @@ in { }; }; - server = { config, pkgs, ... }: { + server = { ... }: { services.openssh = { enable = true; passwordAuthentication = false; diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix index 828846f17c89..cf408dc7fec9 100644 --- a/nixos/tests/buildbot.nix +++ b/nixos/tests/buildbot.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ... } : { name = "buildbot"; nodes = { - bbmaster = { config, pkgs, ... }: { + bbmaster = { pkgs, ... }: { services.buildbot-master = { enable = true; package = pkgs.buildbot-full; @@ -22,7 +22,7 @@ import ./make-test.nix ({ pkgs, ... } : { environment.systemPackages = with pkgs; [ git buildbot-full ]; }; - bbworker = { config, pkgs, ... }: { + bbworker = { pkgs, ... }: { services.buildbot-worker = { enable = true; masterUrl = "bbmaster:9989"; @@ -30,7 +30,7 @@ import ./make-test.nix ({ pkgs, ... } : { environment.systemPackages = with pkgs; [ git buildbot-worker ]; }; - gitrepo = { config, pkgs, ... }: { + gitrepo = { pkgs, ... }: { services.openssh.enable = true; networking.firewall.allowedTCPPorts = [ 22 9418 ]; environment.systemPackages = with pkgs; [ git ]; diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix index f0083ab18e45..e60bae4b7003 100644 --- a/nixos/tests/cadvisor.nix +++ b/nixos/tests/cadvisor.nix @@ -5,11 +5,11 @@ import ./make-test.nix ({ pkgs, ... } : { }; nodes = { - machine = { config, pkgs, ... }: { + machine = { ... }: { services.cadvisor.enable = true; }; - influxdb = { config, pkgs, lib, ... }: with lib; { + influxdb = { lib, ... }: with lib; { services.cadvisor.enable = true; services.cadvisor.storageDriver = "influxdb"; services.influxdb.enable = true; diff --git a/nixos/tests/cassandra.nix b/nixos/tests/cassandra.nix index b729e6b158bc..ca8f35ef3bff 100644 --- a/nixos/tests/cassandra.nix +++ b/nixos/tests/cassandra.nix @@ -24,9 +24,9 @@ in name = "cassandra-ci"; nodes = { - cass0 = {pkgs, config, nodes, ...}: nodeCfg nodes "192.168.1.1" {}; - cass1 = {pkgs, config, nodes, ...}: nodeCfg nodes "192.168.1.2" {}; - cass2 = {pkgs, config, nodes, ...}: nodeCfg nodes "192.168.1.3" { + cass0 = { nodes, ... }: nodeCfg nodes "192.168.1.1" {}; + cass1 = { nodes, ... }: nodeCfg nodes "192.168.1.2" {}; + cass2 = { nodes, ... }: nodeCfg nodes "192.168.1.3" { extraParams = [ ''JVM_OPTS="$JVM_OPTS -Dcassandra.replace_address=192.168.1.2"'' ]; diff --git a/nixos/tests/ceph.nix b/nixos/tests/ceph.nix index b9993062c079..dd45f0157b01 100644 --- a/nixos/tests/ceph.nix +++ b/nixos/tests/ceph.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({pkgs, ...}: rec { }; nodes = { - aio = { config, pkgs, ... }: { + aio = { pkgs, ... }: { virtualisation = { emptyDiskImages = [ 20480 20480 ]; vlans = [ 1 ]; @@ -55,7 +55,7 @@ import ./make-test.nix ({pkgs, ...}: rec { }; }; - testScript = { nodes, ... }: '' + testScript = { ... }: '' startAll; $aio->waitForUnit("network.target"); diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index db89c496944e..ab5f8e0bcf3e 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -4,7 +4,7 @@ let carolPassword = "678287829ce4c67bc8b227e56d94422ee1b85fa11618157b2f591de6c6322b52"; basicConfig = - { config, pkgs, ... }: + { ... }: { services.cjdns.enable = true; # Turning off DHCP isn't very realistic but makes @@ -29,7 +29,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = rec { # Alice finds peers over over ETHInterface. alice = - { config, ... }: + { ... }: { imports = [ basicConfig ]; services.cjdns.ETHInterface.bind = "eth1"; @@ -41,7 +41,7 @@ import ./make-test.nix ({ pkgs, ...} : { # Bob explicitly connects to Carol over UDPInterface. bob = - { config, lib, nodes, ... }: + { ... }: { imports = [ basicConfig ]; @@ -63,7 +63,7 @@ import ./make-test.nix ({ pkgs, ...} : { # Carol listens on ETHInterface and UDPInterface, # but knows neither Alice or Bob. carol = - { config, lib, nodes, ... }: + { ... }: { imports = [ basicConfig ]; environment.etc."cjdns.keys".text = '' diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix index 2a258e4bff54..303e74086460 100644 --- a/nixos/tests/cloud-init.nix +++ b/nixos/tests/cloud-init.nix @@ -31,7 +31,7 @@ in makeTest { maintainers = [ lewo ]; }; machine = - { config, pkgs, ... }: + { ... }: { virtualisation.qemu.options = [ "-cdrom" "${metadataDrive}/metadata.iso" ]; services.cloud-init.enable = true; diff --git a/nixos/tests/common/user-account.nix b/nixos/tests/common/user-account.nix index dc50e14750b0..9cd531a1f96c 100644 --- a/nixos/tests/common/user-account.nix +++ b/nixos/tests/common/user-account.nix @@ -1,4 +1,4 @@ -{ lib, ... }: +{ ... }: { users.users.alice = { isNormalUser = true; diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix index dfef46a2ada4..bd8bd5dee9c8 100644 --- a/nixos/tests/containers-bridge.nix +++ b/nixos/tests/containers-bridge.nix @@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix index df3f3354b2d9..8f874b3585dc 100644 --- a/nixos/tests/containers-extra_veth.nix +++ b/nixos/tests/containers-extra_veth.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; diff --git a/nixos/tests/containers-hosts.nix b/nixos/tests/containers-hosts.nix index df1ef6d14936..8cf298c62258 100644 --- a/nixos/tests/containers-hosts.nix +++ b/nixos/tests/containers-hosts.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, lib, ... }: + { lib, ... }: { virtualisation.memorySize = 256; virtualisation.vlans = []; diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix index 821ce1cd07d2..c4d954592ef0 100644 --- a/nixos/tests/containers-ipv4.nix +++ b/nixos/tests/containers-ipv4.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix index f676ed122bb3..7db389a18e72 100644 --- a/nixos/tests/containers-ipv6.nix +++ b/nixos/tests/containers-ipv6.nix @@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; diff --git a/nixos/tests/containers-macvlans.nix b/nixos/tests/containers-macvlans.nix index 390dc4ad2c29..2bdb926a8e2b 100644 --- a/nixos/tests/containers-macvlans.nix +++ b/nixos/tests/containers-macvlans.nix @@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { machine1 = - { config, pkgs, lib, ... }: + { lib, ... }: { virtualisation.memorySize = 256; virtualisation.vlans = [ 1 ]; @@ -55,7 +55,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine2 = - { config, pkgs, ... }: + { ... }: { virtualisation.memorySize = 256; virtualisation.vlans = [ 1 ]; diff --git a/nixos/tests/containers-physical_interfaces.nix b/nixos/tests/containers-physical_interfaces.nix index bde8e175f953..1e312f59f437 100644 --- a/nixos/tests/containers-physical_interfaces.nix +++ b/nixos/tests/containers-physical_interfaces.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - server = { config, pkgs, ... }: + server = { ... }: { virtualisation.memorySize = 256; virtualisation.vlans = [ 1 ]; @@ -23,7 +23,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; }; - bridged = { config, pkgs, ... }: { + bridged = { ... }: { virtualisation.memorySize = 128; virtualisation.vlans = [ 1 ]; @@ -41,7 +41,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; - bonded = { config, pkgs, ... }: { + bonded = { ... }: { virtualisation.memorySize = 128; virtualisation.vlans = [ 1 ]; @@ -62,7 +62,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; - bridgedbond = { config, pkgs, ... }: { + bridgedbond = { ... }: { virtualisation.memorySize = 128; virtualisation.vlans = [ 1 ]; diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix index 78cc445c2dd0..be83f82445ed 100644 --- a/nixos/tests/containers-portforward.nix +++ b/nixos/tests/containers-portforward.nix @@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix index 15862ac64c12..9726ca0cb0e7 100644 --- a/nixos/tests/containers-reloadable.nix +++ b/nixos/tests/containers-reloadable.nix @@ -21,11 +21,11 @@ in { }; nodes = { - client = { lib, pkgs, ... }: { + client = { ... }: { imports = [ client_base ]; }; - client_c1 = { lib, pkgs, ... }: { + client_c1 = { lib, ... }: { imports = [ client_base ]; containers.test1.config = { @@ -34,7 +34,7 @@ in { services.httpd.adminAddr = "nixos@example.com"; }; }; - client_c2 = { lib, pkgs, ... }: { + client_c2 = { lib, ... }: { imports = [ client_base ]; containers.test1.config = { diff --git a/nixos/tests/containers-restart_networking.nix b/nixos/tests/containers-restart_networking.nix index f68c9b07759b..aeb0a6e68e21 100644 --- a/nixos/tests/containers-restart_networking.nix +++ b/nixos/tests/containers-restart_networking.nix @@ -17,7 +17,7 @@ let }; }; }; -in import ./make-test.nix ({ pkgs, lib, ...} : +in import ./make-test.nix ({ pkgs, ...} : { name = "containers-restart_networking"; meta = with pkgs.stdenv.lib.maintainers; { @@ -25,7 +25,7 @@ in import ./make-test.nix ({ pkgs, lib, ...} : }; nodes = { - client = { lib, pkgs, ... }: client_base // { + client = { lib, ... }: client_base // { virtualisation.vlans = [ 1 ]; networking.bridges.br0 = { @@ -38,7 +38,7 @@ in import ./make-test.nix ({ pkgs, lib, ...} : }; }; - client_eth1 = { lib, pkgs, ... }: client_base // { + client_eth1 = { lib, ... }: client_base // { networking.bridges.br0 = { interfaces = [ "eth1" ]; rstp = false; @@ -48,7 +48,7 @@ in import ./make-test.nix ({ pkgs, lib, ...} : br0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ]; }; }; - client_eth1_rstp = { lib, pkgs, ... }: client_base // { + client_eth1_rstp = { lib, ... }: client_base // { networking.bridges.br0 = { interfaces = [ "eth1" ]; rstp = true; diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix index 873dd364369f..05c21f4907bf 100644 --- a/nixos/tests/containers-tmpfs.nix +++ b/nixos/tests/containers-tmpfs.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/installer/cd-dvd/channel.nix ]; virtualisation.writableStore = true; virtualisation.memorySize = 768; diff --git a/nixos/tests/couchdb.nix b/nixos/tests/couchdb.nix index a3f675236bc6..48ea48eebbb3 100644 --- a/nixos/tests/couchdb.nix +++ b/nixos/tests/couchdb.nix @@ -10,14 +10,14 @@ with lib; nodes = { couchdb1 = - { pkgs, config, ... }: + { pkgs, ... }: { environment.systemPackages = with pkgs; [ jq ]; services.couchdb.enable = true; }; couchdb2 = - { pkgs, config, ... }: + { pkgs, ... }: { environment.systemPackages = with pkgs; [ jq ]; services.couchdb.enable = true; diff --git a/nixos/tests/deluge.nix b/nixos/tests/deluge.nix index 6119fd58447c..b4be5e465cc0 100644 --- a/nixos/tests/deluge.nix +++ b/nixos/tests/deluge.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { server = - { pkgs, config, ... }: + { ... }: { services.deluge = { enable = true; diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix index 1fcf3903b13e..13bc9d3d9168 100644 --- a/nixos/tests/dnscrypt-proxy.nix +++ b/nixos/tests/dnscrypt-proxy.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }: { # A client running the recommended setup: DNSCrypt proxy as a forwarder # for a caching DNS client. client = - { config, pkgs, ... }: + { ... }: let localProxyPort = 43; in { security.apparmor.enable = true; diff --git a/nixos/tests/docker-edge.nix b/nixos/tests/docker-edge.nix index 38d25daff194..b306c149be91 100644 --- a/nixos/tests/docker-edge.nix +++ b/nixos/tests/docker-edge.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { docker = - { config, pkgs, ... }: + { pkgs, ... }: { virtualisation.docker.enable = true; virtualisation.docker.package = pkgs.docker-edge; diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix index 1fbd199c7bc4..8936421072a9 100644 --- a/nixos/tests/docker-registry.nix +++ b/nixos/tests/docker-registry.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - registry = { config, pkgs, ... }: { + registry = { ... }: { services.dockerRegistry.enable = true; services.dockerRegistry.enableDelete = true; services.dockerRegistry.port = 8080; @@ -16,12 +16,12 @@ import ./make-test.nix ({ pkgs, ...} : { networking.firewall.allowedTCPPorts = [ 8080 ]; }; - client1 = { config, pkgs, ...}: { + client1 = { ... }: { virtualisation.docker.enable = true; virtualisation.docker.extraOptions = "--insecure-registry registry:8080"; }; - client2 = { config, pkgs, ...}: { + client2 = { ... }: { virtualisation.docker.enable = true; virtualisation.docker.extraOptions = "--insecure-registry registry:8080"; }; diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix index 9d7fa3e7a8c5..637957bd3e8b 100644 --- a/nixos/tests/docker-tools-overlay.nix +++ b/nixos/tests/docker-tools-overlay.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ... }: nodes = { docker = - { config, pkgs, ... }: + { ... }: { virtualisation.docker.enable = true; virtualisation.docker.storageDriver = "overlay"; # defaults to overlay2 diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index e2bcfbbd1f96..db4eacc37287 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }: { nodes = { docker = - { config, pkgs, ... }: { + { ... }: { virtualisation = { diskSize = 2048; docker.enable = true; diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index c6c8f4cdb5fb..d67b2f8743d8 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { docker = - { config, pkgs, ... }: + { pkgs, ... }: { virtualisation.docker.enable = true; virtualisation.docker.package = pkgs.docker; diff --git a/nixos/tests/ecryptfs.nix b/nixos/tests/ecryptfs.nix index 041be0f5a624..3f02cecb8662 100644 --- a/nixos/tests/ecryptfs.nix +++ b/nixos/tests/ecryptfs.nix @@ -1,8 +1,8 @@ -import ./make-test.nix ({ pkgs, ... }: +import ./make-test.nix ({ ... }: { name = "ecryptfs"; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { imports = [ ./common/user-account.nix ]; boot.kernelModules = [ "ecryptfs" ]; security.pam.enableEcryptfs = true; diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index ed656b3628b9..8dba7a905fa6 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -11,7 +11,7 @@ let }; nodes = { one = - { config, pkgs, ... }: { + { pkgs, ... }: { # Not giving the machine at least 2060MB results in elasticsearch failing with the following error: # # OpenJDK 64-Bit Server VM warning: diff --git a/nixos/tests/emacs-daemon.nix b/nixos/tests/emacs-daemon.nix index 466e772a881f..3594e35e343c 100644 --- a/nixos/tests/emacs-daemon.nix +++ b/nixos/tests/emacs-daemon.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { enableOCR = true; machine = - { config, pkgs, ... }: + { ... }: { imports = [ ./common/x11.nix ]; services.emacs = { diff --git a/nixos/tests/env.nix b/nixos/tests/env.nix index c6b0424e97b9..064c498204ae 100644 --- a/nixos/tests/env.nix +++ b/nixos/tests/env.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ nequissimus ]; }; - machine = { config, lib, pkgs, ... }: + machine = { pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages; environment.etc."plainFile".text = '' diff --git a/nixos/tests/etcd-cluster.nix b/nixos/tests/etcd-cluster.nix index 3971997a9bf7..3c4de5950a79 100644 --- a/nixos/tests/etcd-cluster.nix +++ b/nixos/tests/etcd-cluster.nix @@ -102,7 +102,7 @@ in { }; nodes = { - node1 = { config, pkgs, nodes, ... }: { + node1 = { ... }: { require = [nodeConfig]; services.etcd = { initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"]; @@ -110,7 +110,7 @@ in { }; }; - node2 = { config, pkgs, ... }: { + node2 = { ... }: { require = [nodeConfig]; services.etcd = { initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380"]; @@ -118,7 +118,7 @@ in { }; }; - node3 = { config, pkgs, ... }: { + node3 = { ... }: { require = [nodeConfig]; services.etcd = { initialCluster = ["node1=https://node1:2380" "node2=https://node2:2380" "node3=https://node3:2380"]; diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix index f8a6791a834f..6c23b31779bc 100644 --- a/nixos/tests/etcd.nix +++ b/nixos/tests/etcd.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... } : { }; nodes = { - node = { config, pkgs, nodes, ... }: { + node = { ... }: { services.etcd.enable = true; }; }; diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix index bb7daae118c0..24b74df85ad1 100644 --- a/nixos/tests/ferm.nix +++ b/nixos/tests/ferm.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { client = - { config, pkgs, ... }: + { pkgs, ... }: with pkgs.lib; { networking = { @@ -16,7 +16,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; server = - { config, pkgs, ... }: + { pkgs, ... }: with pkgs.lib; { networking = { diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index e1b628c91445..58a80243ea9c 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ./common/x11.nix ]; environment.systemPackages = [ pkgs.firefox pkgs.xdotool ]; diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix index 1119a5312eb5..7207a880d8e2 100644 --- a/nixos/tests/firewall.nix +++ b/nixos/tests/firewall.nix @@ -8,7 +8,7 @@ import ./make-test.nix ( { pkgs, ... } : { nodes = { walled = - { config, pkgs, nodes, ... }: + { ... }: { networking.firewall.enable = true; networking.firewall.logRefusedPackets = true; services.httpd.enable = true; @@ -20,13 +20,13 @@ import ./make-test.nix ( { pkgs, ... } : { # original walled configuration so that there is a change in the service # file. walled2 = - { config, pkgs, nodes, ... }: + { ... }: { networking.firewall.enable = true; networking.firewall.rejectPackets = true; }; attacker = - { config, pkgs, ... }: + { ... }: { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; networking.firewall.enable = false; diff --git a/nixos/tests/flannel.nix b/nixos/tests/flannel.nix index 7f27903a3026..fb66fe282090 100644 --- a/nixos/tests/flannel.nix +++ b/nixos/tests/flannel.nix @@ -17,7 +17,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { networking.firewall.allowedUDPPorts = [ 8472 ]; }; in { - etcd = { config, pkgs, ... }: { + etcd = { ... }: { services = { etcd = { enable = true; @@ -31,11 +31,11 @@ import ./make-test.nix ({ pkgs, ...} : rec { networking.firewall.allowedTCPPorts = [ 2379 ]; }; - node1 = { config, ... }: { + node1 = { ... }: { require = [flannelConfig]; }; - node2 = { config, ... }: { + node2 = { ... }: { require = [flannelConfig]; }; }; diff --git a/nixos/tests/flatpak.nix b/nixos/tests/flatpak.nix index 9a5bdf070217..096b37e6e2cb 100644 --- a/nixos/tests/flatpak.nix +++ b/nixos/tests/flatpak.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }: maintainers = pkgs.flatpak.meta.maintainers; }; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { imports = [ ./common/x11.nix ]; services.xserver.desktopManager.gnome3.enable = true; # TODO: figure out minimal environment where the tests work environment.gnome3.excludePackages = pkgs.gnome3.optionalPackages; diff --git a/nixos/tests/fwupd.nix b/nixos/tests/fwupd.nix index bf4ef25130b3..2e64149b2db3 100644 --- a/nixos/tests/fwupd.nix +++ b/nixos/tests/fwupd.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... }: { maintainers = pkgs.fwupd.meta.maintainers; }; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { services.fwupd.enable = true; environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; environment.variables.XDG_DATA_DIRS = [ "${pkgs.fwupd.installedTests}/share" ]; diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index 7268636b62ad..3af2cbcd0988 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - gitlab = { config, pkgs, ... }: { + gitlab = { ... }: { virtualisation.memorySize = 768; services.nginx = { diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix index d4028efad1d8..690e456ed7c8 100644 --- a/nixos/tests/gitolite.nix +++ b/nixos/tests/gitolite.nix @@ -58,7 +58,7 @@ in nodes = { server = - { config, pkgs, lib, ... }: + { ... }: { services.gitolite = { enable = true; @@ -68,7 +68,7 @@ in }; client = - { config, pkgs, lib, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.git ]; programs.ssh.extraConfig = '' diff --git a/nixos/tests/gnome3-gdm.nix b/nixos/tests/gnome3-gdm.nix index 71ae1709d526..1f590f337fd9 100644 --- a/nixos/tests/gnome3-gdm.nix +++ b/nixos/tests/gnome3-gdm.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { ... }: { imports = [ ./common/user-account.nix ]; diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index 591ed8600685..3f51d04163a4 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { ... }: { imports = [ ./common/user-account.nix ]; diff --git a/nixos/tests/gocd-agent.nix b/nixos/tests/gocd-agent.nix index 5cadff089950..50470379576b 100644 --- a/nixos/tests/gocd-agent.nix +++ b/nixos/tests/gocd-agent.nix @@ -17,7 +17,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { gocd_agent = - { config, pkgs, ... }: + { ... }: { virtualisation.memorySize = 2046; services.gocd-agent = { diff --git a/nixos/tests/gocd-server.nix b/nixos/tests/gocd-server.nix index b473d4ad61c7..80cf04ed6404 100644 --- a/nixos/tests/gocd-server.nix +++ b/nixos/tests/gocd-server.nix @@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : nodes = { gocd_server = - { config, pkgs, ... }: + { ... }: { virtualisation.memorySize = 2046; services.gocd-server.enable = true; diff --git a/nixos/tests/grafana.nix b/nixos/tests/grafana.nix index d45776c3ee29..9dc765a879bc 100644 --- a/nixos/tests/grafana.nix +++ b/nixos/tests/grafana.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ lib, ... }: maintainers = [ willibutz ]; }; - machine = { config, pkgs, ... }: { + machine = { ... }: { services.grafana = { enable = true; addr = "localhost"; diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index 5a1f50bd29b1..1fe4357191e3 100644 --- a/nixos/tests/graphite.nix +++ b/nixos/tests/graphite.nix @@ -1,9 +1,9 @@ -import ./make-test.nix ({ pkgs, ...} : +import ./make-test.nix ({ ... } : { name = "graphite"; nodes = { one = - { config, pkgs, ... }: { + { ... }: { virtualisation.memorySize = 1024; time.timeZone = "UTC"; services.graphite = { diff --git a/nixos/tests/hadoop/hdfs.nix b/nixos/tests/hadoop/hdfs.nix index 4206c940c1af..e7d72a56e1e7 100644 --- a/nixos/tests/hadoop/hdfs.nix +++ b/nixos/tests/hadoop/hdfs.nix @@ -1,6 +1,6 @@ -import ../make-test.nix ({pkgs, ...}: { +import ../make-test.nix ({...}: { nodes = { - namenode = {pkgs, config, ...}: { + namenode = {pkgs, ...}: { services.hadoop = { package = pkgs.hadoop_3_1; hdfs.namenode.enabled = true; @@ -18,7 +18,7 @@ import ../make-test.nix ({pkgs, ...}: { 8020 # namenode.rpc-address ]; }; - datanode = {pkgs, config, ...}: { + datanode = {pkgs, ...}: { services.hadoop = { package = pkgs.hadoop_3_1; hdfs.datanode.enabled = true; diff --git a/nixos/tests/hadoop/yarn.nix b/nixos/tests/hadoop/yarn.nix index e97cc1acc902..031592301f17 100644 --- a/nixos/tests/hadoop/yarn.nix +++ b/nixos/tests/hadoop/yarn.nix @@ -1,6 +1,6 @@ -import ../make-test.nix ({pkgs, ...}: { +import ../make-test.nix ({...}: { nodes = { - resourcemanager = {pkgs, config, ...}: { + resourcemanager = {pkgs, ...}: { services.hadoop.package = pkgs.hadoop_3_1; services.hadoop.yarn.resourcemanager.enabled = true; services.hadoop.yarnSite = { @@ -11,7 +11,7 @@ import ../make-test.nix ({pkgs, ...}: { 8031 # resourcemanager.resource-tracker.address ]; }; - nodemanager = {pkgs, config, ...}: { + nodemanager = {pkgs, ...}: { services.hadoop.package = pkgs.hadoop_3_1; services.hadoop.yarn.nodemanager.enabled = true; services.hadoop.yarnSite = { diff --git a/nixos/tests/haka.nix b/nixos/tests/haka.nix index 40548f34690f..6277ebb4933f 100644 --- a/nixos/tests/haka.nix +++ b/nixos/tests/haka.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { haka = - { config, pkgs, ... }: + { ... }: { services.haka.enable = true; }; diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix index ce4094237db2..22a83e9d1eab 100644 --- a/nixos/tests/haproxy.nix +++ b/nixos/tests/haproxy.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...}: { name = "haproxy"; nodes = { - machine = { config, ...}: { + machine = { ... }: { imports = [ ../modules/profiles/minimal.nix ]; services.haproxy = { enable = true; diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index 0a0639d62796..2700b8e5935a 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, lib, pkgs, ... }: + { lib, pkgs, ... }: with lib; { users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; }; users.users.sybil = { isNormalUser = true; group = "wheel"; }; diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index 3ae2bdffed90..1f98bb739f21 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -16,7 +16,7 @@ import ./make-test.nix (pkgs: { systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444 -k"; }; - probe = { config, lib, pkgs, ...}: { + probe = { pkgs, ...}: { environment.systemPackages = [ pkgs.netcat ]; }; }; diff --git a/nixos/tests/hitch/default.nix b/nixos/tests/hitch/default.nix index b024306cde56..cb24c4dcffc2 100644 --- a/nixos/tests/hitch/default.nix +++ b/nixos/tests/hitch/default.nix @@ -4,7 +4,7 @@ import ../make-test.nix ({ pkgs, ... }: meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ jflanglois ]; }; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.curl ]; services.hitch = { enable = true; diff --git a/nixos/tests/hocker-fetchdocker/machine.nix b/nixos/tests/hocker-fetchdocker/machine.nix index 12c58a012243..78343f0e02f0 100644 --- a/nixos/tests/hocker-fetchdocker/machine.nix +++ b/nixos/tests/hocker-fetchdocker/machine.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { nixpkgs.config.packageOverrides = pkgs': { hello-world-container = pkgs'.callPackage ./hello-world-container.nix { }; }; diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix index 797706a062ca..0c027eaca619 100644 --- a/nixos/tests/home-assistant.nix +++ b/nixos/tests/home-assistant.nix @@ -12,7 +12,7 @@ in { nodes = { hass = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = with pkgs; [ mosquitto diff --git a/nixos/tests/hound.nix b/nixos/tests/hound.nix index 82fd44e8e36f..f21c0ad58a85 100644 --- a/nixos/tests/hound.nix +++ b/nixos/tests/hound.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ... } : { meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ grahamc ]; }; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { services.hound = { enable = true; config = '' diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index 74919444c16d..98d99811f3c0 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -31,7 +31,7 @@ in { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { virtualisation.memorySize = 1024; diff --git a/nixos/tests/i3wm.nix b/nixos/tests/i3wm.nix index 4685992d7a05..245c17eedf7e 100644 --- a/nixos/tests/i3wm.nix +++ b/nixos/tests/i3wm.nix @@ -4,14 +4,14 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ aszlig ]; }; - machine = { lib, pkgs, ... }: { + machine = { lib, ... }: { imports = [ ./common/x11.nix ./common/user-account.nix ]; services.xserver.displayManager.auto.user = "alice"; services.xserver.windowManager.default = lib.mkForce "i3"; services.xserver.windowManager.i3.enable = true; }; - testScript = { nodes, ... }: '' + testScript = { ... }: '' $machine->waitForX; $machine->waitForFile("/home/alice/.Xauthority"); $machine->succeed("xauth merge ~alice/.Xauthority"); diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix index ee126091667a..440049d95111 100644 --- a/nixos/tests/influxdb.nix +++ b/nixos/tests/influxdb.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - one = { config, pkgs, ... }: { + one = { ... }: { services.influxdb.enable = true; }; }; diff --git a/nixos/tests/initrd-network-ssh/default.nix b/nixos/tests/initrd-network-ssh/default.nix index b1f3d147e862..b2209f297a4f 100644 --- a/nixos/tests/initrd-network-ssh/default.nix +++ b/nixos/tests/initrd-network-ssh/default.nix @@ -1,4 +1,4 @@ -import ../make-test.nix ({ pkgs, lib, ... }: +import ../make-test.nix ({ lib, ... }: { name = "initrd-network-ssh"; @@ -8,7 +8,7 @@ import ../make-test.nix ({ pkgs, lib, ... }: nodes = with lib; rec { server = - { config, pkgs, ... }: + { config, ... }: { boot.kernelParams = [ "ip=${config.networking.primaryIPAddress}:::255.255.255.0::eth1:none" @@ -33,7 +33,7 @@ import ../make-test.nix ({ pkgs, lib, ... }: }; client = - { config, pkgs, ... }: + { config, ... }: { environment.etc.knownHosts = { text = concatStrings [ diff --git a/nixos/tests/initrd-network.nix b/nixos/tests/initrd-network.nix index db9f572d3c2f..ed9b82e2da77 100644 --- a/nixos/tests/initrd-network.nix +++ b/nixos/tests/initrd-network.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : { meta.maintainers = [ pkgs.stdenv.lib.maintainers.eelco ]; - machine = { config, pkgs, ... }: { + machine = { ... }: { imports = [ ../modules/profiles/minimal.nix ]; boot.initrd.network.enable = true; boot.initrd.network.postCommands = diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 96230940e873..2455b9152bd9 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -203,7 +203,7 @@ let # The configuration of the machine used to run "nixos-install". machine = - { config, lib, pkgs, ... }: + { pkgs, ... }: { imports = [ ../modules/profiles/installation-device.nix diff --git a/nixos/tests/ipfs.nix b/nixos/tests/ipfs.nix index c6bc61545245..3cff7e99ff88 100644 --- a/nixos/tests/ipfs.nix +++ b/nixos/tests/ipfs.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { adder = - { config, pkgs, ... }: + { ... }: { services.ipfs = { enable = true; @@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ...} : { networking.firewall.allowedTCPPorts = [ 4001 ]; }; getter = - { config, pkgs, ... }: + { ... }: { services.ipfs = { enable = true; diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix index 7a98fd85cfda..97f348a9beeb 100644 --- a/nixos/tests/ipv6.nix +++ b/nixos/tests/ipv6.nix @@ -8,17 +8,17 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = - { client = { config, pkgs, ... }: { }; + { client = { ... }: { }; server = - { config, pkgs, ... }: + { ... }: { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; networking.firewall.allowedTCPPorts = [ 80 ]; }; router = - { config, pkgs, ... }: + { ... }: { services.radvd.enable = true; services.radvd.config = '' diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index 25629efbfa49..4f2d2085cd1a 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { master = - { config, pkgs, ... }: + { ... }: { services.jenkins.enable = true; # should have no effect @@ -24,7 +24,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; slave = - { config, pkgs, ... }: + { ... }: { services.jenkinsSlave.enable = true; users.users.jenkins.extraGroups = [ "users" ]; diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index e48b25d67df3..c9fd74620efb 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -10,7 +10,7 @@ let }; nodes = { - zookeeper1 = { config, ... }: { + zookeeper1 = { ... }: { services.zookeeper = { enable = true; }; @@ -18,7 +18,7 @@ let networking.firewall.allowedTCPPorts = [ 2181 ]; virtualisation.memorySize = 1024; }; - kafka = { config, ... }: { + kafka = { ... }: { services.apache-kafka = { enable = true; extraProperties = '' diff --git a/nixos/tests/kernel-copperhead.nix b/nixos/tests/kernel-copperhead.nix index aa133c9b0aa7..652fbf055373 100644 --- a/nixos/tests/kernel-copperhead.nix +++ b/nixos/tests/kernel-copperhead.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ nequissimus ]; }; - machine = { config, lib, pkgs, ... }: + machine = { pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages_copperhead_lts; }; diff --git a/nixos/tests/kernel-latest.nix b/nixos/tests/kernel-latest.nix index 1350426654d7..f30bd2e2e760 100644 --- a/nixos/tests/kernel-latest.nix +++ b/nixos/tests/kernel-latest.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ nequissimus ]; }; - machine = { config, lib, pkgs, ... }: + machine = { pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages_latest; }; diff --git a/nixos/tests/kernel-lts.nix b/nixos/tests/kernel-lts.nix index 2aab4ce0b49e..28717fa6a844 100644 --- a/nixos/tests/kernel-lts.nix +++ b/nixos/tests/kernel-lts.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ nequissimus ]; }; - machine = { config, lib, pkgs, ... }: + machine = { pkgs, ... }: { boot.kernelPackages = pkgs.linuxPackages; }; diff --git a/nixos/tests/kexec.nix b/nixos/tests/kexec.nix index 0f5ddef7b1aa..db596189d46d 100644 --- a/nixos/tests/kexec.nix +++ b/nixos/tests/kexec.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ eelco chaoflow ]; }; - machine = { config, pkgs, ... }: + machine = { ... }: { virtualisation.vlans = [ ]; }; testScript = diff --git a/nixos/tests/krb5/deprecated-config.nix b/nixos/tests/krb5/deprecated-config.nix index 980b3e762dc6..7d7926309c95 100644 --- a/nixos/tests/krb5/deprecated-config.nix +++ b/nixos/tests/krb5/deprecated-config.nix @@ -8,7 +8,7 @@ import ../make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: { + { ... }: { krb5 = { enable = true; defaultRealm = "ATHENA.MIT.EDU"; diff --git a/nixos/tests/krb5/example-config.nix b/nixos/tests/krb5/example-config.nix index d5328720931e..f01cf6988eef 100644 --- a/nixos/tests/krb5/example-config.nix +++ b/nixos/tests/krb5/example-config.nix @@ -8,7 +8,7 @@ import ../make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: { + { pkgs, ... }: { krb5 = { enable = true; kerberos = pkgs.krb5Full; diff --git a/nixos/tests/kubernetes/certs.nix b/nixos/tests/kubernetes/certs.nix index 520c728b65ee..85e92f6330c9 100644 --- a/nixos/tests/kubernetes/certs.nix +++ b/nixos/tests/kubernetes/certs.nix @@ -1,9 +1,9 @@ { pkgs ? import <nixpkgs> {}, - internalDomain ? "cloud.yourdomain.net", externalDomain ? "myawesomecluster.cluster.yourdomain.net", serviceClusterIp ? "10.0.0.1", - kubelets + kubelets, + ... }: let runWithCFSSL = name: cmd: diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix index 8c488d271bcd..30e1acd255a0 100644 --- a/nixos/tests/kubernetes/dns.nix +++ b/nixos/tests/kubernetes/dns.nix @@ -60,7 +60,7 @@ let config.Entrypoint = "/bin/tail"; }; - extraConfiguration = { config, pkgs, lib, nodes, ... }: { + extraConfiguration = { config, pkgs, ... }: { environment.systemPackages = [ pkgs.bind.host ]; # virtualisation.docker.extraOptions = "--dns=${config.services.kubernetes.addons.dns.clusterIp}"; services.dnsmasq.enable = true; diff --git a/nixos/tests/ldap.nix b/nixos/tests/ldap.nix index b39f4124c958..035a81924174 100644 --- a/nixos/tests/ldap.nix +++ b/nixos/tests/ldap.nix @@ -37,7 +37,7 @@ let memberUid: ${ldapUser} ''; mkClient = useDaemon: - { config, pkgs, lib, ... }: + { lib, ... }: { virtualisation.memorySize = 256; virtualisation.vlans = [ 1 ]; @@ -61,7 +61,7 @@ in nodes = { server = - { config, pkgs, lib, ... }: + { pkgs, ... }: { virtualisation.memorySize = 256; virtualisation.vlans = [ 1 ]; diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix index d2b561fa67b4..8a9a7408d292 100644 --- a/nixos/tests/lightdm.nix +++ b/nixos/tests/lightdm.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ aszlig ]; }; - machine = { lib, ... }: { + machine = { ... }: { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.displayManager.lightdm.enable = true; diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix index a6a460fb0a7d..3dbb494b6895 100644 --- a/nixos/tests/login.nix +++ b/nixos/tests/login.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }: }; machine = - { config, pkgs, lib, ... }: + { pkgs, lib, ... }: { boot.kernelPackages = lib.mkIf latestKernel pkgs.linuxPackages_latest; }; diff --git a/nixos/tests/mathics.nix b/nixos/tests/mathics.nix index 310b751b4d84..fcbeeb18a727 100644 --- a/nixos/tests/mathics.nix +++ b/nixos/tests/mathics.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; nodes = { - machine = { config, pkgs, ... }: { + machine = { ... }: { services.mathics.enable = true; services.mathics.port = 8888; }; diff --git a/nixos/tests/memcached.nix b/nixos/tests/memcached.nix index f9ef3647bd1a..b120599c51dd 100644 --- a/nixos/tests/memcached.nix +++ b/nixos/tests/memcached.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { machine = - { config, pkgs, ... }: + { ... }: { imports = [ ../modules/profiles/minimal.nix ]; services.memcached.enable = true; diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix index 007d7ac21603..3ceb1d8125b2 100644 --- a/nixos/tests/mesos.nix +++ b/nixos/tests/mesos.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { }; nodes = { - master = { config, pkgs, ... }: { + master = { ... }: { networking.firewall.enable = false; services.zookeeper.enable = true; services.mesos.master = { @@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { }; }; - slave = { config, pkgs, ... }: { + slave = { ... }: { networking.firewall.enable = false; networking.nat.enable = true; virtualisation.docker.enable = true; diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix index 07a292a9baa5..40a599546650 100644 --- a/nixos/tests/minio.nix +++ b/nixos/tests/minio.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { services.minio = { enable = true; accessKey = "BKIKJAA5BMMU2RHO6IBB"; diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 179c95e76436..b0bc1d083b16 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ...} : rec { foo = pkgs.writeText "foo" "Hello World"; machine = - { config, lib, pkgs, ... }: + { lib, ... }: with lib; { swapDevices = mkOverride 0 [ { device = "/root/swapfile"; size = 128; } ]; diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix index 18535f51af9b..2f380ff543e9 100644 --- a/nixos/tests/mongodb.nix +++ b/nixos/tests/mongodb.nix @@ -13,7 +13,7 @@ in { nodes = { one = - { config, pkgs, ... }: + { ... }: { services = { mongodb.enable = true; diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix index 0a5324259ada..eab123bd50f8 100644 --- a/nixos/tests/morty.nix +++ b/nixos/tests/morty.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ... }: nodes = { mortyProxyWithKey = - { config, pkgs, ... }: + { ... }: { services.morty = { enable = true; key = "78a9cd0cfee20c672f78427efb2a2a96036027f0"; @@ -20,7 +20,7 @@ import ./make-test.nix ({ pkgs, ... }: }; testScript = - { nodes , ... }: + { ... }: '' $mortyProxyWithKey->waitForUnit("default.target"); diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix index 2950a8d809d6..ac2b810defe3 100644 --- a/nixos/tests/mpd.nix +++ b/nixos/tests/mpd.nix @@ -47,10 +47,10 @@ import ./make-test.nix ({ pkgs, ... }: nodes = { client = - { config, pkgs, ... }: { }; + { ... }: { }; serverALSA = - { config, pkgs, ... }: (mkServer { + { ... }: (mkServer { mpd = defaultMpdCfg // { network.listenAddress = "any"; extraConfig = '' @@ -66,7 +66,7 @@ import ./make-test.nix ({ pkgs, ... }: }) // { networking.firewall.allowedTCPPorts = [ 6600 ]; }; serverPulseAudio = - { config, pkgs, ... }: (mkServer { + { ... }: (mkServer { mpd = defaultMpdCfg // { extraConfig = '' audio_output { diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix index 7959b85a0cf0..8146453bfd55 100644 --- a/nixos/tests/mumble.nix +++ b/nixos/tests/mumble.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : let - client = { config, pkgs, ... }: { + client = { pkgs, ... }: { imports = [ ./common/x11.nix ]; environment.systemPackages = [ pkgs.mumble ]; }; @@ -13,7 +13,7 @@ in }; nodes = { - server = { config, pkgs, ... }: { + server = { config, ... }: { services.murmur.enable = true; services.murmur.registerName = "NixOS tests"; networking.firewall.allowedTCPPorts = [ config.services.murmur.port ]; diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index 40fafc625146..eb91d4d630bc 100644 --- a/nixos/tests/munin.nix +++ b/nixos/tests/munin.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { one = - { config, pkgs, ... }: + { config, ... }: { services = { munin-node.enable = true; diff --git a/nixos/tests/mutable-users.nix b/nixos/tests/mutable-users.nix index 4f11a4b83669..e590703ab2f4 100644 --- a/nixos/tests/mutable-users.nix +++ b/nixos/tests/mutable-users.nix @@ -7,10 +7,10 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - machine = { config, lib, pkgs, ... }: { + machine = { ... }: { users.mutableUsers = false; }; - mutable = { config, lib, pkgs, ... }: { + mutable = { ... }: { users.mutableUsers = true; }; }; diff --git a/nixos/tests/mysql-backup.nix b/nixos/tests/mysql-backup.nix index ff3650988836..81482dfef7e5 100644 --- a/nixos/tests/mysql-backup.nix +++ b/nixos/tests/mysql-backup.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... } : { }; nodes = { - master = { config, pkgs, ... }: { + master = { pkgs, ... }: { services.mysql = { enable = true; initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix index ed09ac10b75d..84d70cf35246 100644 --- a/nixos/tests/mysql-replication.nix +++ b/nixos/tests/mysql-replication.nix @@ -13,7 +13,7 @@ in nodes = { master = - { pkgs, config, ... }: + { pkgs, ... }: { services.mysql.enable = true; @@ -27,7 +27,7 @@ in }; slave1 = - { pkgs, config, nodes, ... }: + { pkgs, nodes, ... }: { services.mysql.enable = true; @@ -40,7 +40,7 @@ in }; slave2 = - { pkgs, config, nodes, ... }: + { pkgs, nodes, ... }: { services.mysql.enable = true; diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix index c18fee6c7495..7251c4a86499 100644 --- a/nixos/tests/mysql.nix +++ b/nixos/tests/mysql.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { master = - { pkgs, config, ... }: + { pkgs, ... }: { services.mysql.enable = true; diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index 7057158a829b..9c280fe8b5b6 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -30,7 +30,7 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, nodes = { client = - { config, pkgs, nodes, ... }: + { pkgs, nodes, ... }: lib.mkMerge [ { virtualisation.vlans = [ 1 ]; networking.firewall.allowPing = true; @@ -44,19 +44,19 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, ]; router = - { config, pkgs, ... }: lib.mkMerge [ + { ... }: lib.mkMerge [ routerBase { networking.nat.enable = true; } ]; routerDummyNoNat = - { config, pkgs, ... }: lib.mkMerge [ + { ... }: lib.mkMerge [ routerBase { networking.nat.enable = false; } ]; server = - { config, pkgs, ... }: + { ... }: { virtualisation.vlans = [ 2 ]; networking.firewall.enable = false; services.httpd.enable = true; diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix index 58733c1b3379..c56506ba2874 100644 --- a/nixos/tests/netdata.nix +++ b/nixos/tests/netdata.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { netdata = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = with pkgs; [ curl jq ]; services.netdata.enable = true; diff --git a/nixos/tests/networking-proxy.nix b/nixos/tests/networking-proxy.nix index 4c5725731404..ab908c96e5ee 100644 --- a/nixos/tests/networking-proxy.nix +++ b/nixos/tests/networking-proxy.nix @@ -19,13 +19,13 @@ in import ./make-test.nix ({ pkgs, ...} : { nodes = { # no proxy machine = - { config, pkgs, ... }: + { ... }: default-config; # proxy default machine2 = - { config, pkgs, ... }: + { ... }: default-config // { networking.proxy.default = "http://user:pass@host:port"; @@ -33,7 +33,7 @@ in import ./make-test.nix ({ pkgs, ...} : { # specific proxy options machine3 = - { config, pkgs, ... }: + { ... }: default-config // { @@ -51,7 +51,7 @@ in import ./make-test.nix ({ pkgs, ...} : { # mix default + proxy options machine4 = - { config, pkgs, ... }: + { ... }: default-config // { networking.proxy = { diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 5cb40af5799e..cd5d537a3be7 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -81,7 +81,7 @@ let static = { name = "Static"; nodes.router = router; - nodes.client = { config, pkgs, ... }: with pkgs.lib; { + nodes.client = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; @@ -98,7 +98,7 @@ let ]; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -134,7 +134,7 @@ let dhcpSimple = { name = "SimpleDHCP"; nodes.router = router; - nodes.client = { config, pkgs, ... }: with pkgs.lib; { + nodes.client = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; @@ -150,7 +150,7 @@ let }; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -189,7 +189,7 @@ let dhcpOneIf = { name = "OneInterfaceDHCP"; nodes.router = router; - nodes.client = { config, pkgs, ... }: with pkgs.lib; { + nodes.client = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; @@ -202,7 +202,7 @@ let interfaces.eth2.ipv4.addresses = mkOverride 0 [ ]; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -229,7 +229,7 @@ let ''; }; bond = let - node = address: { config, pkgs, ... }: with pkgs.lib; { + node = address: { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; @@ -249,7 +249,7 @@ let name = "Bond"; nodes.client1 = node "192.168.1.1"; nodes.client2 = node "192.168.1.2"; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -266,7 +266,7 @@ let ''; }; bridge = let - node = { address, vlan }: { config, pkgs, ... }: with pkgs.lib; { + node = { address, vlan }: { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ vlan ]; networking = { useNetworkd = networkd; @@ -280,7 +280,7 @@ let name = "Bridge"; nodes.client1 = node { address = "192.168.1.2"; vlan = 1; }; nodes.client2 = node { address = "192.168.1.3"; vlan = 2; }; - nodes.router = { config, pkgs, ... }: with pkgs.lib; { + nodes.router = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 2 ]; networking = { useNetworkd = networkd; @@ -293,7 +293,7 @@ let [ { address = "192.168.1.1"; prefixLength = 24; } ]; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -319,7 +319,7 @@ let macvlan = { name = "MACVLAN"; nodes.router = router; - nodes.client = { config, pkgs, ... }: with pkgs.lib; { + nodes.client = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; @@ -329,7 +329,7 @@ let interfaces.eth1.ipv4.addresses = mkOverride 0 [ ]; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -356,7 +356,7 @@ let ''; }; sit = let - node = { address4, remote, address6 }: { config, pkgs, ... }: with pkgs.lib; { + node = { address4, remote, address6 }: { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; @@ -377,7 +377,7 @@ let name = "Sit"; nodes.client1 = node { address4 = "192.168.1.1"; remote = "192.168.1.2"; address6 = "fc00::1"; }; nodes.client2 = node { address4 = "192.168.1.2"; remote = "192.168.1.1"; address6 = "fc00::2"; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -398,7 +398,7 @@ let ''; }; vlan = let - node = address: { config, pkgs, ... }: with pkgs.lib; { + node = address: { pkgs, ... }: with pkgs.lib; { #virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; @@ -418,7 +418,7 @@ let name = "vlan"; nodes.client1 = node "192.168.1.1"; nodes.client2 = node "192.168.1.2"; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; @@ -476,7 +476,7 @@ let }; privacy = { name = "Privacy"; - nodes.router = { config, pkgs, ... }: { + nodes.router = { ... }: { virtualisation.vlans = [ 1 ]; boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true; networking = { @@ -502,7 +502,7 @@ let ''; }; }; - nodes.client = { config, pkgs, ... }: with pkgs.lib; { + nodes.client = { pkgs, ... }: with pkgs.lib; { virtualisation.vlans = [ 1 ]; networking = { useNetworkd = networkd; @@ -514,7 +514,7 @@ let }; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' startAll; diff --git a/nixos/tests/nexus.nix b/nixos/tests/nexus.nix index be8862018777..bf49d2247bd8 100644 --- a/nixos/tests/nexus.nix +++ b/nixos/tests/nexus.nix @@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { server = - { config, pkgs, ... }: + { ... }: { virtualisation.memorySize = 2047; # qemu-system-i386 has a 2047M limit virtualisation.diskSize = 2048; diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix index 6ed1995f262a..1992f240e7b0 100644 --- a/nixos/tests/nfs.nix +++ b/nixos/tests/nfs.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, version ? 4, ... }: let client = - { config, pkgs, ... }: + { pkgs, ... }: { fileSystems = pkgs.lib.mkVMOverride [ { mountPoint = "/data"; device = "server:/data"; @@ -27,7 +27,7 @@ in client2 = client; server = - { config, pkgs, ... }: + { ... }: { services.nfs.server.enable = true; services.nfs.server.exports = '' diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix index 7f7bc0f0b4fe..32b113649237 100644 --- a/nixos/tests/nginx.nix +++ b/nixos/tests/nginx.nix @@ -10,7 +10,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { webserver = - { config, pkgs, ... }: + { ... }: { services.nginx.enable = true; services.nginx.commonHttpConfig = '' log_format ceeformat '@cee: {"status":"$status",' diff --git a/nixos/tests/novacomd.nix b/nixos/tests/novacomd.nix index 21b86f6dae27..2b56aee0a2e7 100644 --- a/nixos/tests/novacomd.nix +++ b/nixos/tests/novacomd.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ dtzWill ]; }; - machine = { config, pkgs, ... }: { + machine = { ... }: { services.novacomd.enable = true; }; diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index 230b45206847..c66b90b802d5 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -11,7 +11,7 @@ in { nodes = { server = - { config, pkgs, ... }: + { ... }: { services.openssh.enable = true; @@ -23,7 +23,7 @@ in { }; server_lazy = - { config, pkgs, ... }: + { ... }: { services.openssh = { enable = true; startWhenNeeded = true; }; @@ -35,7 +35,7 @@ in { }; client = - { config, pkgs, ... }: { }; + { ... }: { }; }; diff --git a/nixos/tests/owncloud.nix b/nixos/tests/owncloud.nix index 0dcdea40b064..c968569f2008 100644 --- a/nixos/tests/owncloud.nix +++ b/nixos/tests/owncloud.nix @@ -1,10 +1,10 @@ -import ./make-test.nix ({ pkgs, ... }: +import ./make-test.nix ({ ... }: { name = "owncloud"; nodes = { web = - { config, pkgs, ... }: + { ... }: { services.postgresql.enable = true; services.httpd = { diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix index 9f40ecfe865f..b9d489950e72 100644 --- a/nixos/tests/pam-oath-login.nix +++ b/nixos/tests/pam-oath-login.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, latestKernel ? false, ... }: +import ./make-test.nix ({ ... }: let oathSnakeoilSecret = "cdd4083ef8ff1fa9178c6d46bfb1a3"; @@ -22,7 +22,7 @@ in name = "pam-oath-login"; machine = - { config, pkgs, lib, ... }: + { ... }: { security.pam.oath = { enable = true; diff --git a/nixos/tests/partition.nix b/nixos/tests/partition.nix index 291d9b278d3b..01a08995950f 100644 --- a/nixos/tests/partition.nix +++ b/nixos/tests/partition.nix @@ -65,7 +65,7 @@ let in { name = "partitiion"; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.pythonPackages.nixpart0 pkgs.file pkgs.btrfs-progs pkgs.xfsprogs pkgs.lvm2 diff --git a/nixos/tests/peerflix.nix b/nixos/tests/peerflix.nix index eb729f22f913..fae37fedaac7 100644 --- a/nixos/tests/peerflix.nix +++ b/nixos/tests/peerflix.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { peerflix = - { config, pkgs, ... }: + { ... }: { services.peerflix.enable = true; }; diff --git a/nixos/tests/pgjwt.nix b/nixos/tests/pgjwt.nix index d186c42a2a98..a2d81288c812 100644 --- a/nixos/tests/pgjwt.nix +++ b/nixos/tests/pgjwt.nix @@ -14,7 +14,7 @@ with pkgs; { }; nodes = { - master = { pkgs, config, ... }: + master = { ... }: { services.postgresql = { enable = true; diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix index fdc39393faea..20b3b838aba8 100644 --- a/nixos/tests/phabricator.nix +++ b/nixos/tests/phabricator.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... }: { nodes = { storage = - { config, pkgs, ... }: + { ... }: { services.nfs.server.enable = true; services.nfs.server.exports = '' /repos 192.168.1.0/255.255.255.0(rw,no_root_squash) @@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; webserver = - { config, pkgs, ... }: + { pkgs, ... }: { fileSystems = pkgs.lib.mkVMOverride [ { mountPoint = "/repos"; device = "storage:/repos"; @@ -52,7 +52,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; client = - { config, pkgs, ... }: + { ... }: { imports = [ ./common/x11.nix ]; services.xserver.desktopManager.plasma5.enable = true; }; diff --git a/nixos/tests/php-pcre.nix b/nixos/tests/php-pcre.nix index f618a39a2293..19bde9babad5 100644 --- a/nixos/tests/php-pcre.nix +++ b/nixos/tests/php-pcre.nix @@ -1,9 +1,9 @@ let testString = "can-use-subgroups"; in -import ./make-test.nix ({ pkgs, ...}: { +import ./make-test.nix ({ ...}: { name = "php-httpd-pcre-jit-test"; - machine = { config, lib, pkgs, ... }: { + machine = { lib, pkgs, ... }: { time.timeZone = "UTC"; services.httpd = { enable = true; @@ -34,7 +34,7 @@ import ./make-test.nix ({ pkgs, ...}: { }; }; }; - testScript = { nodes, ... }: + testScript = { ... }: '' $machine->waitForUnit('httpd.service'); # Ensure php evaluation by matching on the var_dump syntax diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index e479d3f1cb8f..eb705536827e 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : maintainers = [ ttuegel ]; }; - machine = { lib, ... }: + machine = { ... }: let sddm_theme = pkgs.stdenv.mkDerivation { name = "breeze-ocr-theme"; diff --git a/nixos/tests/plotinus.nix b/nixos/tests/plotinus.nix index 9058c59c92de..609afe7b2145 100644 --- a/nixos/tests/plotinus.nix +++ b/nixos/tests/plotinus.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ./common/x11.nix ]; programs.plotinus.enable = true; diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index 7fe905eb4254..f8b63c5b6a27 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { master = - { pkgs, config, ... }: + { pkgs, ... }: { services.postgresql = let mypg = pkgs.postgresql100; in { diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index 2381939552e2..f1f09277f342 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -22,7 +22,7 @@ let maintainers = [ zagy ]; }; - machine = {pkgs, config, ...}: + machine = {...}: { services.postgresql.package=postgresql-package; services.postgresql.enable = true; diff --git a/nixos/tests/powerdns.nix b/nixos/tests/powerdns.nix index 0d5b0f715f52..8addcc784012 100644 --- a/nixos/tests/powerdns.nix +++ b/nixos/tests/powerdns.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ... }: { name = "powerdns"; - nodes.server = { config, pkgs, ... }: { + nodes.server = { ... }: { services.powerdns.enable = true; }; diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix index 0b431034a7a9..0d73436c1c3f 100644 --- a/nixos/tests/predictable-interface-names.nix +++ b/nixos/tests/predictable-interface-names.nix @@ -9,7 +9,7 @@ in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: { name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}"; meta = {}; - machine = { config, lib, ... }: { + machine = { lib, ... }: { networking.usePredictableInterfaceNames = lib.mkForce predictable; networking.useNetworkd = withNetworkd; networking.dhcpcd.enable = !withNetworkd; diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix index 989008830613..d85abf3c105c 100644 --- a/nixos/tests/printing.nix +++ b/nixos/tests/printing.nix @@ -9,7 +9,7 @@ import ./make-test.nix ({pkgs, ... }: { nodes = { server = - { config, pkgs, ... }: + { ... }: { services.printing.enable = true; services.printing.listenAddresses = [ "*:631" ]; services.printing.defaultShared = true; @@ -24,7 +24,7 @@ import ./make-test.nix ({pkgs, ... }: { }; client = - { config, pkgs, nodes, ... }: + { ... }: { services.printing.enable = true; }; diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix index 374fb2d634b4..87a6510f40fd 100644 --- a/nixos/tests/prometheus.nix +++ b/nixos/tests/prometheus.nix @@ -2,7 +2,7 @@ import ./make-test.nix { name = "prometheus"; nodes = { - one = { config, pkgs, ... }: { + one = { ... }: { services.prometheus = { enable = true; scrapeConfigs = [{ diff --git a/nixos/tests/prosody.nix b/nixos/tests/prosody.nix index fcebfaf74e12..5d33aaf8d65d 100644 --- a/nixos/tests/prosody.nix +++ b/nixos/tests/prosody.nix @@ -1,7 +1,7 @@ import ./make-test.nix { name = "prosody"; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { services.prosody = { enable = true; # TODO: use a self-signed certificate diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix index 3fee1d325384..181953120282 100644 --- a/nixos/tests/proxy.nix +++ b/nixos/tests/proxy.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ...} : let backend = - { config, pkgs, ... }: + { pkgs, ... }: { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; @@ -21,7 +21,7 @@ in nodes = { proxy = - { config, pkgs, nodes, ... }: + { nodes, ... }: { services.httpd.enable = true; services.httpd.adminAddr = "bar@example.org"; @@ -57,7 +57,7 @@ in backend1 = backend; backend2 = backend; - client = { config, pkgs, ... }: { }; + client = { ... }: { }; }; testScript = diff --git a/nixos/tests/quagga.nix b/nixos/tests/quagga.nix index 613180942c41..0ff14a21584a 100644 --- a/nixos/tests/quagga.nix +++ b/nixos/tests/quagga.nix @@ -30,14 +30,14 @@ import ./make-test.nix ({ pkgs, ... }: nodes = { client = - { config, pkgs, nodes, ... }: + { nodes, ... }: { virtualisation.vlans = [ 1 ]; networking.defaultGateway = ifAddr nodes.router1 "eth1"; }; router1 = - { config, pkgs, nodes, ... }: + { ... }: { virtualisation.vlans = [ 1 2 ]; boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; @@ -49,7 +49,7 @@ import ./make-test.nix ({ pkgs, ... }: }; router2 = - { config, pkgs, nodes, ... }: + { ... }: { virtualisation.vlans = [ 3 2 ]; boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; @@ -61,7 +61,7 @@ import ./make-test.nix ({ pkgs, ... }: }; server = - { config, pkgs, nodes, ... }: + { nodes, ... }: { virtualisation.vlans = [ 3 ]; networking.defaultGateway = ifAddr nodes.router2 "eth1"; @@ -73,7 +73,7 @@ import ./make-test.nix ({ pkgs, ... }: }; testScript = - { nodes, ... }: + { ... }: '' startAll; diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix index 22d71595cb48..75c82cca63f5 100644 --- a/nixos/tests/quake3.nix +++ b/nixos/tests/quake3.nix @@ -29,7 +29,7 @@ rec { #makeCoverageReport = true; client = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ./common/x11.nix ]; hardware.opengl.driSupport = true; @@ -40,7 +40,7 @@ rec { nodes = { server = - { config, pkgs, ... }: + { pkgs, ... }: { systemd.services."quake3-server" = { wantedBy = [ "multi-user.target" ]; diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix index 23a7e2ed538f..34ab05787867 100644 --- a/nixos/tests/rabbitmq.nix +++ b/nixos/tests/rabbitmq.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; nodes = { - one = { config, pkgs, ... }: { + one = { ... }: { services.rabbitmq.enable = true; }; }; diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix index e38430385415..0a9c2d394a7a 100644 --- a/nixos/tests/radicale.nix +++ b/nixos/tests/radicale.nix @@ -28,7 +28,7 @@ let in - import ./make-test.nix ({ pkgs, lib, ... }@args: { + import ./make-test.nix ({ lib, ... }@args: { name = "radicale"; meta.maintainers = with lib.maintainers; [ aneeshusa infinisil ]; diff --git a/nixos/tests/riak.nix b/nixos/tests/riak.nix index 18d028232ac2..68a9b7315b35 100644 --- a/nixos/tests/riak.nix +++ b/nixos/tests/riak.nix @@ -3,7 +3,7 @@ import ./make-test.nix { nodes = { master = - { pkgs, config, ... }: + { pkgs, ... }: { services.riak.enable = true; diff --git a/nixos/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix index a6dfece44a92..bd90dc3080bd 100644 --- a/nixos/tests/run-in-machine.nix +++ b/nixos/tests/run-in-machine.nix @@ -5,7 +5,7 @@ with import ../lib/testing.nix { inherit system; }; let output = runInMachine { drv = pkgs.hello; - machine = { config, pkgs, ... }: { /* services.sshd.enable = true; */ }; + machine = { ... }: { /* services.sshd.enable = true; */ }; }; in pkgs.runCommand "verify-output" { inherit output; } '' if [ ! -e "$output/bin/hello" ]; then diff --git a/nixos/tests/rxe.nix b/nixos/tests/rxe.nix index cfe64a75a635..d0b53db8eeb6 100644 --- a/nixos/tests/rxe.nix +++ b/nixos/tests/rxe.nix @@ -1,7 +1,7 @@ -import ./make-test.nix ({ pkgs, ... } : +import ./make-test.nix ({ ... } : let - node = { config, pkgs, lib, ... } : { + node = { pkgs, ... } : { networking = { firewall = { allowedUDPPorts = [ 4791 ]; # open RoCE port diff --git a/nixos/tests/samba.nix b/nixos/tests/samba.nix index e446284fc0ef..2802e00a5b1a 100644 --- a/nixos/tests/samba.nix +++ b/nixos/tests/samba.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }: nodes = { client = - { config, pkgs, ... }: + { pkgs, ... }: { fileSystems = pkgs.lib.mkVMOverride { "/public" = { fsType = "cifs"; @@ -18,7 +18,7 @@ import ./make-test.nix ({ pkgs, ... }: }; server = - { config, pkgs, ... }: + { ... }: { services.samba.enable = true; services.samba.shares.public = { path = "/public"; diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix index ac91a89f6695..7b9fdc0b3441 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -9,7 +9,7 @@ let default = { name = "sddm"; - machine = { lib, ... }: { + machine = { ... }: { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.displayManager.sddm.enable = true; @@ -39,7 +39,7 @@ let maintainers = [ ttuegel ]; }; - machine = { lib, ... }: { + machine = { ... }: { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.displayManager.sddm = { @@ -54,7 +54,7 @@ let services.xserver.desktopManager.default = "none"; }; - testScript = { nodes, ... }: '' + testScript = { ... }: '' startAll; $machine->waitForFile("/home/alice/.Xauthority"); $machine->succeed("xauth merge ~alice/.Xauthority"); diff --git a/nixos/tests/simple.nix b/nixos/tests/simple.nix index 04d624adcfe9..84c5621d962f 100644 --- a/nixos/tests/simple.nix +++ b/nixos/tests/simple.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ eelco ]; }; - machine = { config, pkgs, ... }: { + machine = { ... }: { imports = [ ../modules/profiles/minimal.nix ]; }; diff --git a/nixos/tests/slim.nix b/nixos/tests/slim.nix index 5c76c58cf3f3..42c87dfa039d 100644 --- a/nixos/tests/slim.nix +++ b/nixos/tests/slim.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ aszlig ]; }; - machine = { pkgs, lib, ... }: { + machine = { pkgs, ... }: { imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.windowManager.default = "icewm"; diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix index ec67ea092874..60f44c3c8459 100644 --- a/nixos/tests/slurm.nix +++ b/nixos/tests/slurm.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, ... }: +import ./make-test.nix ({ ... }: let mungekey = "mungeverryweakkeybuteasytointegratoinatest"; slurmconfig = { controlMachine = "control"; @@ -14,7 +14,7 @@ in { nodes = let computeNode = - { config, pkgs, ...}: + { ...}: { # TODO slrumd port and slurmctld port should be configurations and # automatically allowed by the firewall. @@ -26,7 +26,7 @@ in { in { control = - { config, pkgs, ...}: + { ...}: { networking.firewall.enable = false; services.slurm = { @@ -35,7 +35,7 @@ in { }; submit = - { config, pkgs, ...}: + { ...}: { networking.firewall.enable = false; services.slurm = { diff --git a/nixos/tests/smokeping.nix b/nixos/tests/smokeping.nix index 4c77e4b78613..07d228051127 100644 --- a/nixos/tests/smokeping.nix +++ b/nixos/tests/smokeping.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { sm = - { pkgs, config, ... }: + { ... }: { services.smokeping = { enable = true; diff --git a/nixos/tests/strongswan-swanctl.nix b/nixos/tests/strongswan-swanctl.nix index 021743021b40..8bbebd423003 100644 --- a/nixos/tests/strongswan-swanctl.nix +++ b/nixos/tests/strongswan-swanctl.nix @@ -34,7 +34,7 @@ in { meta.maintainers = with pkgs.stdenv.lib.maintainers; [ basvandijk ]; nodes = { - alice = { nodes, ... } : { + alice = { ... } : { virtualisation.vlans = [ 0 ]; networking = { dhcpcd.enable = false; @@ -42,7 +42,7 @@ in { }; }; - moon = {pkgs, config, nodes, ...} : + moon = { config, ...} : let strongswan = config.services.strongswan-swanctl.package; in { virtualisation.vlans = [ 0 1 ]; @@ -94,7 +94,7 @@ in { }; }; - carol = {pkgs, config, nodes, ...} : + carol = { config, ...} : let strongswan = config.services.strongswan-swanctl.package; in { virtualisation.vlans = [ 1 ]; diff --git a/nixos/tests/subversion.nix b/nixos/tests/subversion.nix index a8e33a6f7e59..6175155cdfc9 100644 --- a/nixos/tests/subversion.nix +++ b/nixos/tests/subversion.nix @@ -39,7 +39,7 @@ in nodes = { webserver = - { config, pkgs, ... }: + { ... }: { services.httpd.enable = true; @@ -55,7 +55,7 @@ in }; client = - { config, pkgs, ... }: + { pkgs, ... }: { environment.systemPackages = [ pkgs.subversion ]; diff --git a/nixos/tests/sudo.nix b/nixos/tests/sudo.nix index 5d6c8691230a..fc16b99cc19c 100644 --- a/nixos/tests/sudo.nix +++ b/nixos/tests/sudo.nix @@ -11,7 +11,7 @@ in }; machine = - { config, lib, pkgs, ... }: + { lib, ... }: with lib; { users.groups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; }; diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 46f2563af8d9..32010838e67b 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -7,10 +7,10 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - machine = { config, lib, pkgs, ... }: { + machine = { ... }: { users.mutableUsers = false; }; - other = { config, lib, pkgs, ... }: { + other = { ... }: { users.mutableUsers = true; }; }; diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix index 475c947e72d9..af63c7ee8e02 100644 --- a/nixos/tests/tomcat.nix +++ b/nixos/tests/tomcat.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ...} : { nodes = { server = - { pkgs, config, ... }: + { ... }: { services.tomcat.enable = true; services.httpd.enable = true; diff --git a/nixos/tests/tor.nix b/nixos/tests/tor.nix index 24d46a03897e..0cb44ddff248 100644 --- a/nixos/tests/tor.nix +++ b/nixos/tests/tor.nix @@ -5,14 +5,14 @@ rec { meta.maintainers = with maintainers; [ joachifm ]; common = - { config, ... }: + { ... }: { boot.kernelParams = [ "audit=0" "apparmor=0" "quiet" ]; networking.firewall.enable = false; networking.useDHCP = false; }; nodes.client = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ common ]; environment.systemPackages = with pkgs; [ netcat ]; services.tor.enable = true; diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix index 5da5717d7f86..4599885acde6 100644 --- a/nixos/tests/trac.nix +++ b/nixos/tests/trac.nix @@ -6,7 +6,7 @@ import ./make-test.nix ({ pkgs, ... }: { nodes = { storage = - { config, pkgs, ... }: + { ... }: { services.nfs.server.enable = true; services.nfs.server.exports = '' /repos 192.168.1.0/255.255.255.0(rw,no_root_squash) @@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; postgresql = - { config, pkgs, ... }: + { pkgs, ... }: { services.postgresql.enable = true; services.postgresql.package = pkgs.postgresql; services.postgresql.enableTCPIP = true; @@ -29,7 +29,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; webserver = - { config, pkgs, ... }: + { pkgs, ... }: { fileSystems = pkgs.lib.mkVMOverride [ { mountPoint = "/repos"; device = "storage:/repos"; @@ -43,7 +43,7 @@ import ./make-test.nix ({ pkgs, ... }: { }; client = - { config, pkgs, ... }: + { ... }: { imports = [ ./common/x11.nix ]; services.xserver.desktopManager.plasma5.enable = true; }; diff --git a/nixos/tests/transmission.nix b/nixos/tests/transmission.nix index 34c49bd7f15b..f1c238730ebb 100644 --- a/nixos/tests/transmission.nix +++ b/nixos/tests/transmission.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ...} : { maintainers = [ coconnor ]; }; - machine = { config, pkgs, ... }: { + machine = { ... }: { imports = [ ../modules/profiles/minimal.nix ]; networking.firewall.allowedTCPPorts = [ 9091 ]; diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix index 70a999267a54..8bbbe286efcf 100644 --- a/nixos/tests/udisks2.nix +++ b/nixos/tests/udisks2.nix @@ -16,7 +16,7 @@ in }; machine = - { config, pkgs, ... }: + { ... }: { services.udisks2.enable = true; imports = [ ./common/user-account.nix ]; diff --git a/nixos/tests/vault.nix b/nixos/tests/vault.nix index 515d5c8bac25..caf0cbb2abfe 100644 --- a/nixos/tests/vault.nix +++ b/nixos/tests/vault.nix @@ -4,7 +4,7 @@ import ./make-test.nix ({ pkgs, ... }: meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ lnl7 ]; }; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.vault ]; environment.variables.VAULT_ADDR = "http://127.0.0.1:8200"; services.vault.enable = true; diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix index c51306a8c7a0..2c0bbbfd7161 100644 --- a/nixos/tests/wordpress.nix +++ b/nixos/tests/wordpress.nix @@ -8,7 +8,7 @@ import ./make-test.nix ({ pkgs, ... }: nodes = { web = - { config, pkgs, ... }: + { pkgs, ... }: { services.mysql = { enable = true; @@ -41,7 +41,7 @@ import ./make-test.nix ({ pkgs, ... }: }; testScript = - { nodes, ... }: + { ... }: '' startAll; diff --git a/nixos/tests/xdg-desktop-portal.nix b/nixos/tests/xdg-desktop-portal.nix index d954b07f73d6..79ebb83c49a5 100644 --- a/nixos/tests/xdg-desktop-portal.nix +++ b/nixos/tests/xdg-desktop-portal.nix @@ -7,7 +7,7 @@ import ./make-test.nix ({ pkgs, ... }: maintainers = pkgs.xdg-desktop-portal.meta.maintainers; }; - machine = { config, pkgs, ... }: { + machine = { pkgs, ... }: { environment.systemPackages = with pkgs; [ gnome-desktop-testing ]; }; diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index c8b18f122658..47717e8cf7d9 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; machine = - { config, pkgs, ... }: + { pkgs, ... }: { imports = [ ./common/user-account.nix ]; diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix index 3ea455c393c4..61fa7c1a67d3 100644 --- a/nixos/tests/xmonad.nix +++ b/nixos/tests/xmonad.nix @@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; - testScript = { nodes, ... }: '' + testScript = { ... }: '' $machine->waitForX; $machine->waitForFile("/home/alice/.Xauthority"); $machine->succeed("xauth merge ~alice/.Xauthority"); diff --git a/nixos/tests/xrdp.nix b/nixos/tests/xrdp.nix index c997e36cc442..0106aefe8318 100644 --- a/nixos/tests/xrdp.nix +++ b/nixos/tests/xrdp.nix @@ -5,14 +5,14 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - server = { lib, pkgs, ... }: { + server = { pkgs, ... }: { imports = [ ./common/user-account.nix ]; services.xrdp.enable = true; services.xrdp.defaultWindowManager = "${pkgs.xterm}/bin/xterm"; networking.firewall.allowedTCPPorts = [ 3389 ]; }; - client = { lib, pkgs, ... }: { + client = { pkgs, ... }: { imports = [ ./common/x11.nix ./common/user-account.nix ]; services.xserver.displayManager.auto.user = "alice"; environment.systemPackages = [ pkgs.freerdp ]; @@ -21,7 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; - testScript = { nodes, ... }: '' + testScript = { ... }: '' startAll; $client->waitForX; diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index a6908024de9b..1434038e90c1 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -17,7 +17,7 @@ let maintainers = [ adisbladis ]; }; - machine = { config, lib, pkgs, ... }: + machine = { pkgs, ... }: { virtualisation.emptyDiskImages = [ 4096 ]; networking.hostId = "deadbeef"; diff --git a/nixos/tests/zookeeper.nix b/nixos/tests/zookeeper.nix index d247654adade..f343ebd39e44 100644 --- a/nixos/tests/zookeeper.nix +++ b/nixos/tests/zookeeper.nix @@ -5,7 +5,7 @@ import ./make-test.nix ({ pkgs, ...} : { }; nodes = { - server = { pkgs, config, ... }: { + server = { ... }: { services.zookeeper = { enable = true; }; |