Merge pull request #43863 from volth/unused4
[bot] nixos/*: remove unused arguments in lambdas
This commit is contained in:
commit
e9ff0f9448
@ -47,7 +47,7 @@ rec {
|
|||||||
machinesNumbered = zipLists machines (range 1 254);
|
machinesNumbered = zipLists machines (range 1 254);
|
||||||
|
|
||||||
nodes_ = flip map machinesNumbered (m: nameValuePair m.fst
|
nodes_ = flip map machinesNumbered (m: nameValuePair m.fst
|
||||||
[ ( { config, pkgs, nodes, ... }:
|
[ ( { config, nodes, ... }:
|
||||||
let
|
let
|
||||||
interfacesNumbered = zipLists config.virtualisation.vlans (range 1 255);
|
interfacesNumbered = zipLists config.virtualisation.vlans (range 1 255);
|
||||||
interfaces = flip map interfacesNumbered ({ fst, snd }:
|
interfaces = flip map interfacesNumbered ({ fst, snd }:
|
||||||
|
@ -24,9 +24,6 @@
|
|||||||
# most likely fails as GRUB will probably refuse to install.
|
# most likely fails as GRUB will probably refuse to install.
|
||||||
partitionTableType ? "legacy"
|
partitionTableType ? "legacy"
|
||||||
|
|
||||||
# Whether to invoke switch-to-configuration boot during image creation
|
|
||||||
, installBootLoader ? true
|
|
||||||
|
|
||||||
, # The root file system type.
|
, # The root file system type.
|
||||||
fsType ? "ext4"
|
fsType ? "ext4"
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, perl, closureInfo, xorriso, syslinux
|
{ stdenv, closureInfo, xorriso, syslinux
|
||||||
|
|
||||||
, # The file name of the resulting ISO image.
|
, # The file name of the resulting ISO image.
|
||||||
isoName ? "cd.iso"
|
isoName ? "cd.iso"
|
||||||
|
@ -222,7 +222,7 @@ in rec {
|
|||||||
runInMachineWithX = { require ? [], ... } @ args:
|
runInMachineWithX = { require ? [], ... } @ args:
|
||||||
let
|
let
|
||||||
client =
|
client =
|
||||||
{ config, pkgs, ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
inherit require;
|
inherit require;
|
||||||
virtualisation.memorySize = 1024;
|
virtualisation.memorySize = 1024;
|
||||||
|
@ -149,7 +149,7 @@ let
|
|||||||
else testOptions;
|
else testOptions;
|
||||||
checkAll = checkList == [];
|
checkAll = checkList == [];
|
||||||
in
|
in
|
||||||
flip filter graph ({option, usedBy}:
|
flip filter graph ({option, ...}:
|
||||||
(checkAll || elem option checkList)
|
(checkAll || elem option checkList)
|
||||||
&& !(elem option excludedTestOptions)
|
&& !(elem option excludedTestOptions)
|
||||||
);
|
);
|
||||||
@ -165,7 +165,7 @@ let
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
graphToText = graph:
|
graphToText = graph:
|
||||||
concatMapStrings ({option, usedBy}:
|
concatMapStrings ({usedBy, ...}:
|
||||||
concatMapStrings (user: ''
|
concatMapStrings (user: ''
|
||||||
${user}
|
${user}
|
||||||
'') usedBy
|
'') usedBy
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# This module gets rid of all dependencies on X11 client libraries
|
# This module gets rid of all dependencies on X11 client libraries
|
||||||
# (including fontconfig).
|
# (including fontconfig).
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# Configuration for the Name Service Switch (/etc/nsswitch.conf).
|
# Configuration for the Name Service Switch (/etc/nsswitch.conf).
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -282,7 +282,7 @@ let
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
groupOpts = { name, config, ... }: {
|
groupOpts = { name, ... }: {
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{lib, config, ...}:
|
{lib, ...}:
|
||||||
|
|
||||||
{
|
{
|
||||||
hardware = {
|
hardware = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{pkgs, config, ...}:
|
{pkgs, ...}:
|
||||||
|
|
||||||
{
|
{
|
||||||
hardware.firmware = [ pkgs.zd1211fw ];
|
hardware.firmware = [ pkgs.zd1211fw ];
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# This module provides the proprietary ATI X11 / OpenGL drivers.
|
# This module provides the proprietary ATI X11 / OpenGL drivers.
|
||||||
|
|
||||||
{ config, lib, pkgs, pkgs_i686, ... }:
|
{ config, lib, pkgs_i686, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,6 +1,4 @@
|
|||||||
{ lib
|
{ buildEnv
|
||||||
, stdenv
|
|
||||||
, buildEnv
|
|
||||||
, libwebcam
|
, libwebcam
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, runCommand
|
, runCommand
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ ./installation-cd-graphical-kde.nix ];
|
imports = [ ./installation-cd-graphical-kde.nix ];
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ ./installation-cd-minimal.nix ];
|
imports = [ ./installation-cd-minimal.nix ];
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# This module defines a small NixOS installation CD. It does not
|
# This module defines a small NixOS installation CD. It does not
|
||||||
# contain any graphical stuff.
|
# contain any graphical stuff.
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# This module contains the basic configuration for building netboot
|
# This module contains the basic configuration for building netboot
|
||||||
# images
|
# images
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# This module defines a small netboot environment.
|
# This module defines a small netboot environment.
|
||||||
|
|
||||||
{ config, lib, ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# List all devices which are detected by nixos-generate-config.
|
# List all devices which are detected by nixos-generate-config.
|
||||||
# Common devices are enabled by default.
|
# Common devices are enabled by default.
|
||||||
{ config, lib, pkgs, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# This module generates nixos-install, nixos-rebuild,
|
# This module generates nixos-install, nixos-rebuild,
|
||||||
# nixos-generate-config, etc.
|
# nixos-generate-config, etc.
|
||||||
|
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ lib, pkgs, config, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
_module.args = {
|
_module.args = {
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
# Systemd can also change ownership of service directories using the
|
# Systemd can also change ownership of service directories using the
|
||||||
# RuntimeDirectory/StateDirectory options.
|
# RuntimeDirectory/StateDirectory options.
|
||||||
|
|
||||||
{ config, pkgs, lib, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, options, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# This module allows you to export something from configuration
|
# This module allows you to export something from configuration
|
||||||
# Use case: export kernel source expression for ease of configuring
|
# Use case: export kernel source expression for ease of configuring
|
||||||
|
|
||||||
{ config, lib, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
# enabled in the initrd. Its primary use is in the NixOS installation
|
# enabled in the initrd. Its primary use is in the NixOS installation
|
||||||
# CDs.
|
# CDs.
|
||||||
|
|
||||||
{ config, pkgs, ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# This module defines the software packages included in the "minimal"
|
# This module defines the software packages included in the "minimal"
|
||||||
# installation CD. It might be useful elsewhere.
|
# installation CD. It might be useful elsewhere.
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ lib, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# Include some utilities that are useful for installing or repairing
|
# Include some utilities that are useful for installing or repairing
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [ ./graphical.nix ];
|
imports = [ ./graphical.nix ];
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# This module defines a NixOS configuration with the Plasma 5 desktop.
|
# This module defines a NixOS configuration with the Plasma 5 desktop.
|
||||||
# It's used by the graphical installation CD.
|
# It's used by the graphical installation CD.
|
||||||
|
|
||||||
{ config, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# A profile with most (vanilla) hardening options enabled by default,
|
# A profile with most (vanilla) hardening options enabled by default,
|
||||||
# potentially at the cost of features and performance.
|
# potentially at the cost of features and performance.
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Common configuration for headless machines (e.g., Amazon EC2
|
# Common configuration for headless machines (e.g., Amazon EC2
|
||||||
# instances).
|
# instances).
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# This module defines a small NixOS configuration. It does not
|
# This module defines a small NixOS configuration. It does not
|
||||||
# contain any graphical stuff.
|
# contain any graphical stuff.
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Common configuration for virtual machines running under QEMU (using
|
# Common configuration for virtual machines running under QEMU (using
|
||||||
# virtio).
|
# virtio).
|
||||||
|
|
||||||
{ config, pkgs, ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ];
|
boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ];
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# Global configuration for atop.
|
# Global configuration for atop.
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
{
|
{
|
||||||
options.programs.bcc.enable = lib.mkEnableOption "bcc";
|
options.programs.bcc.enable = lib.mkEnableOption "bcc";
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# Most of the stuff here should probably be moved elsewhere sometime.
|
# Most of the stuff here should probably be moved elsewhere sometime.
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# This module defines a standard configuration for NixOS shells.
|
# This module defines a standard configuration for NixOS shells.
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{ config, lib, ... }:
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# This module provides configuration for the OATH PAM modules.
|
# This module provides configuration for the OATH PAM modules.
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -97,7 +97,7 @@ let
|
|||||||
${dir_cfg.extraConfig}
|
${dir_cfg.extraConfig}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
directorOptions = {name, config, ...}:
|
directorOptions = {...}:
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
password = mkOption {
|
password = mkOption {
|
||||||
@ -117,7 +117,7 @@ let
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
deviceOptions = {name, config, ...}:
|
deviceOptions = {...}:
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
archiveDevice = mkOption {
|
archiveDevice = mkOption {
|
||||||
|
@ -510,7 +510,7 @@ in {
|
|||||||
'';
|
'';
|
||||||
default = { };
|
default = { };
|
||||||
type = types.attrsOf (types.submodule (
|
type = types.attrsOf (types.submodule (
|
||||||
{ name, config, ... }: {
|
{ ... }: {
|
||||||
options = {
|
options = {
|
||||||
|
|
||||||
path = mkOption {
|
path = mkOption {
|
||||||
|
@ -6,7 +6,7 @@ with lib;
|
|||||||
description = ''
|
description = ''
|
||||||
Periodic backups to create with Restic.
|
Periodic backups to create with Restic.
|
||||||
'';
|
'';
|
||||||
type = types.attrsOf (types.submodule ({ name, config, ... }: {
|
type = types.attrsOf (types.submodule ({ name, ... }: {
|
||||||
options = {
|
options = {
|
||||||
passwordFile = mkOption {
|
passwordFile = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
cfg = config.services.jenkinsSlave;
|
cfg = config.services.jenkinsSlave;
|
||||||
|
@ -15,7 +15,7 @@ let
|
|||||||
${cfg.extraConfig}
|
${cfg.extraConfig}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
bindingCfg = { config, ... }: {
|
bindingCfg = { ... }: {
|
||||||
options = {
|
options = {
|
||||||
|
|
||||||
keys = mkOption {
|
keys = mkOption {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
let kernel = config.boot.kernelPackages; in
|
let kernel = config.boot.kernelPackages; in
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ let
|
|||||||
|
|
||||||
etcFiles = pkgs.callPackage ./brscan4_etc_files.nix { netDevices = netDeviceList; };
|
etcFiles = pkgs.callPackage ./brscan4_etc_files.nix { netDevices = netDeviceList; };
|
||||||
|
|
||||||
netDeviceOpts = { name, config, ... }: {
|
netDeviceOpts = { name, ... }: {
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, services, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -110,7 +110,7 @@ let
|
|||||||
special_use = \${toString mailbox.specialUse}
|
special_use = \${toString mailbox.specialUse}
|
||||||
'' + "}";
|
'' + "}";
|
||||||
|
|
||||||
mailboxes = { lib, pkgs, ... }: {
|
mailboxes = { ... }: {
|
||||||
options = {
|
options = {
|
||||||
name = mkOption {
|
name = mkOption {
|
||||||
type = types.strMatching ''[^"]+'';
|
type = types.strMatching ''[^"]+'';
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, mono, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, mono, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
let cfg = config.nix.sshServe;
|
let cfg = config.nix.sshServe;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, mono, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, mono, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -84,7 +84,7 @@ let
|
|||||||
in flatten (mapAttrsToList mkSublist attrs);
|
in flatten (mapAttrsToList mkSublist attrs);
|
||||||
in all isNull (findPkiDefinitions [] manualPkiOptions);
|
in all isNull (findPkiDefinitions [] manualPkiOptions);
|
||||||
|
|
||||||
orgOptions = { name, ... }: {
|
orgOptions = { ... }: {
|
||||||
options.users = mkOption {
|
options.users = mkOption {
|
||||||
type = types.uniq (types.listOf types.str);
|
type = types.uniq (types.listOf types.str);
|
||||||
default = [];
|
default = [];
|
||||||
|
@ -94,7 +94,7 @@ let
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
mkSubModule = { name, port, extraOpts, serviceOpts }: {
|
mkSubModule = { name, port, extraOpts, ... }: {
|
||||||
${name} = mkOption {
|
${name} = mkOption {
|
||||||
type = types.submodule {
|
type = types.submodule {
|
||||||
options = (mkExporterOpts {
|
options = (mkExporterOpts {
|
||||||
|
@ -64,7 +64,7 @@ let
|
|||||||
"DEVICESCAN ${notifyOpts}${cfg.defaults.autodetected}"}
|
"DEVICESCAN ${notifyOpts}${cfg.defaults.autodetected}"}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
smartdDeviceOpts = { name, ... }: {
|
smartdDeviceOpts = { ... }: {
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
|
||||||
|
@ -139,7 +139,7 @@ in
|
|||||||
description = ''
|
description = ''
|
||||||
BeeGFS configurations. Every mount point requires a separate configuration.
|
BeeGFS configurations. Every mount point requires a separate configuration.
|
||||||
'';
|
'';
|
||||||
type = with types; attrsOf (submodule ({ config, ... } : {
|
type = with types; attrsOf (submodule ({ ... } : {
|
||||||
options = {
|
options = {
|
||||||
mgmtdHost = mkOption {
|
mgmtdHost = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ...}:
|
{ config, lib, ...}:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (lib) concatStringsSep mkOption types;
|
inherit (lib) concatStringsSep mkOption types;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# Avahi daemon.
|
# Avahi daemon.
|
||||||
{ config, lib, utils, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ let
|
|||||||
cfg = config.services.cjdns;
|
cfg = config.services.cjdns;
|
||||||
|
|
||||||
connectToSubmodule =
|
connectToSubmodule =
|
||||||
{ options, ... }:
|
{ ... }:
|
||||||
{ options =
|
{ options =
|
||||||
{ password = mkOption {
|
{ password = mkOption {
|
||||||
type = types.str;
|
type = types.str;
|
||||||
|
@ -405,7 +405,7 @@ in
|
|||||||
outTunnels = mkOption {
|
outTunnels = mkOption {
|
||||||
default = {};
|
default = {};
|
||||||
type = with types; loaOf (submodule (
|
type = with types; loaOf (submodule (
|
||||||
{ name, config, ... }: {
|
{ name, ... }: {
|
||||||
options = {
|
options = {
|
||||||
destinationPort = mkOption {
|
destinationPort = mkOption {
|
||||||
type = types.int;
|
type = types.int;
|
||||||
@ -426,7 +426,7 @@ in
|
|||||||
inTunnels = mkOption {
|
inTunnels = mkOption {
|
||||||
default = {};
|
default = {};
|
||||||
type = with types; loaOf (submodule (
|
type = with types; loaOf (submodule (
|
||||||
{ name, config, ... }: {
|
{ name, ... }: {
|
||||||
options = {
|
options = {
|
||||||
inPort = mkOption {
|
inPort = mkOption {
|
||||||
type = types.int;
|
type = types.int;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, ... }:
|
{ lib, ... }:
|
||||||
{ options.services.nghttpx = {
|
{ options.services.nghttpx = {
|
||||||
enable = lib.mkEnableOption "nghttpx";
|
enable = lib.mkEnableOption "nghttpx";
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ let
|
|||||||
Deny-IP=${concatStringsSep " " cfg.deniedIPRanges}
|
Deny-IP=${concatStringsSep " " cfg.deniedIPRanges}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nylonOpts = { name, config, ... }: {
|
nylonOpts = { name, ... }: {
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, stdenv, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, lib, config, options, ... }:
|
{ pkgs, lib, config, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -479,7 +479,7 @@ in
|
|||||||
|
|
||||||
assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
|
assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
|
||||||
message = "cannot enable X11 forwarding without setting xauth location";}]
|
message = "cannot enable X11 forwarding without setting xauth location";}]
|
||||||
++ flip map cfg.listenAddresses ({ addr, port, ... }: {
|
++ flip map cfg.listenAddresses ({ addr, ... }: {
|
||||||
assertion = addr != null;
|
assertion = addr != null;
|
||||||
message = "addr must be specified in each listenAddresses entry";
|
message = "addr must be specified in each listenAddresses entry";
|
||||||
});
|
});
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, stdenv, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, coreutils, lib, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ let
|
|||||||
|
|
||||||
# interface options
|
# interface options
|
||||||
|
|
||||||
interfaceOpts = { name, ... }: {
|
interfaceOpts = { ... }: {
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, stdenv, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, nodes, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
cfg = config.services.zerobin;
|
cfg = config.services.zerobin;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, config, lib, ... }:
|
{ config, lib, ... }:
|
||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
cfg = config.services.oauth2_proxy.nginx;
|
cfg = config.services.oauth2_proxy.nginx;
|
||||||
|
@ -578,7 +578,7 @@ in
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
type = types.loaOf (types.submodule ({name, config, ...}: {
|
type = types.loaOf (types.submodule ({name, ...}: {
|
||||||
options = {
|
options = {
|
||||||
|
|
||||||
name = mkOption {
|
name = mkOption {
|
||||||
@ -638,7 +638,7 @@ in
|
|||||||
authorizeClient = mkOption {
|
authorizeClient = mkOption {
|
||||||
default = null;
|
default = null;
|
||||||
description = "If configured, the hidden service is accessible for authorized clients only.";
|
description = "If configured, the hidden service is accessible for authorized clients only.";
|
||||||
type = types.nullOr (types.submodule ({config, ...}: {
|
type = types.nullOr (types.submodule ({...}: {
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, timezone, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, services, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
cfg = config.services.matomo;
|
cfg = config.services.matomo;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, options, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, serverInfo, php, ... }:
|
{ config, lib, pkgs, serverInfo, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, serverInfo, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (pkgs) mercurial;
|
inherit (pkgs) mercurial;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, serverInfo, php, ... }:
|
{ config, lib, pkgs, serverInfo, ... }:
|
||||||
# http://codex.wordpress.org/Hardening_WordPress
|
# http://codex.wordpress.org/Hardening_WordPress
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
# has additional options that affect the web server as a whole, like
|
# has additional options that affect the web server as a whole, like
|
||||||
# the user/group to run under.)
|
# the user/group to run under.)
|
||||||
|
|
||||||
{ config, lib }:
|
{ lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
{
|
{
|
||||||
|
@ -6,7 +6,7 @@ let
|
|||||||
|
|
||||||
cfg = config.services.zope2;
|
cfg = config.services.zope2;
|
||||||
|
|
||||||
zope2Opts = { name, config, ... }: {
|
zope2Opts = { name, ... }: {
|
||||||
options = {
|
options = {
|
||||||
|
|
||||||
name = mkOption {
|
name = mkOption {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
# not, a X server (Xvfb) is started for that user. The Xvfb instances
|
# not, a X server (Xvfb) is started for that user. The Xvfb instances
|
||||||
# persist across VNC sessions.
|
# persist across VNC sessions.
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
{ lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ config, lib, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, options, modulesPath, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, pkgs_i686, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
|
|
||||||
|
@ -226,7 +226,7 @@ in
|
|||||||
default = [];
|
default = [];
|
||||||
example = lib.literalExample "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { }; }) ]";
|
example = lib.literalExample "[ ({ original = pkgs.openssl; replacement = pkgs.callPackage /path/to/openssl { }; }) ]";
|
||||||
type = types.listOf (types.submodule (
|
type = types.listOf (types.submodule (
|
||||||
{ options, ... }: {
|
{ ... }: {
|
||||||
options.original = mkOption {
|
options.original = mkOption {
|
||||||
type = types.package;
|
type = types.package;
|
||||||
description = "The original package to override.";
|
description = "The original package to override.";
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{ pkgs, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
config = lib.mkIf (pkgs.kexectools.meta.available) {
|
config = lib.mkIf (pkgs.kexectools.meta.available) {
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user