colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot] 2023-12-01 00:14:21 +00:00 committed by GitHub
commit 503526029c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
723 changed files with 6951 additions and 9719 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/customisation.nix
View File

@ -200,7 +200,9 @@ rec {
# Only show the error for the first missing argument
error = errorForArg missingArgs.${head (attrNames missingArgs)};
in if missingArgs == {} then makeOverridable f allArgs else abort error;
in if missingArgs == {}
then makeOverridable f allArgs
else throw "lib.customisation.callPackageWith: ${error}";
/* Like callPackage, but for a function that returns an attribute

47
maintainers/maintainer-list.nix
View File

@ -3277,15 +3277,6 @@
githubId = 1103294;
name = "Christopher Rosset";
};
christianharke = {
email = "christian@harke.ch";
github = "rake5k";
githubId = 13007345;
name = "Christian Harke";
keys = [{
fingerprint = "4EBB 30F1 E89A 541A A7F2 52BE 830A 9728 6309 66F4";
}];
};
christophcharles = {
github = "christophcharles";
githubId = 23055925;
@ -10019,6 +10010,12 @@
githubId = 55911173;
name = "Gwendolyn Quasebarth";
};
lamarios = {
matrix = "@lamarios:matrix.org";
github = "lamarios";
githubId = 1192563;
name = "Paul Fauchon";
};
lambda-11235 = {
email = "taranlynn0@gmail.com";
github = "lambda-11235";
@ -12165,7 +12162,7 @@
name = "Martin Milata";
};
mmlb = {
email = "manny@peekaboo.mmlb.icu";
email = "i@m.mmlb.dev";
github = "mmlb";
githubId = 708570;
name = "Manuel Mendez";
@ -15013,6 +15010,15 @@
githubId = 314564;
name = "Ryan Lahfa";
};
rake5k = {
email = "christian@harke.ch";
github = "rake5k";
githubId = 13007345;
name = "Christian Harke";
keys = [{
fingerprint = "4EBB 30F1 E89A 541A A7F2 52BE 830A 9728 6309 66F4";
}];
};
rakesh4g = {
email = "rakeshgupta4u@gmail.com";
github = "Rakesh4G";
@ -15995,6 +16001,15 @@
githubId = 132835;
name = "Samuel Dionne-Riel";
};
samuel-martineau = {
name = "Samuel Martineau";
email = "samuel@smartineau.me";
github = "Samuel-Martineau";
githubId = 44237969;
keys = [{
fingerprint = "79A1 CC17 67C7 32B6 A8A2 BF4F 71E0 8761 642D ACD2";
}];
};
samuelrivas = {
email = "samuelrivas@gmail.com";
github = "samuelrivas";
@ -16411,6 +16426,12 @@
githubId = 543055;
name = "Shadaj Laddad";
};
shaddydc = {
email = "nixpkgs@shaddy.dev";
github = "ShaddyDC";
githubId = 18403034;
name = "Shaddy";
};
shadowrz = {
email = "shadowrz+nixpkgs@disroot.org";
matrix = "@ShadowRZ:matrixim.cc";
@ -19182,6 +19203,12 @@
githubId = 367185;
name = "Jan Votava";
};
vpetersson = {
email = "vpetersson@screenly.io";
github = "vpetersson";
githubId = 357664;
name = "Viktor Petersson";
};
vq = {
email = "vq@erq.se";
github = "vq";

8
maintainers/team-list.nix
View File

@ -127,14 +127,6 @@ with lib.maintainers; {
enableFeatureFreezePing = true;
};
chia = {
members = [
lourkeur
];
scope = "Maintain the Chia blockchain and its dependencies";
shortName = "Chia Blockchain";
};
coq = {
members = [
cohencyril

5
nixos/doc/manual/release-notes/rl-2311.section.md
View File

@ -509,11 +509,6 @@ Make sure to also check the many updates in the [Nixpkgs library](#sec-release-2
- Package `cloud-sql-proxy` was renamed to `google-cloud-sql-proxy` as it
cannot be used with other cloud providers.
- The Yama LSM is now enabled by default in the kernel, which prevents ptracing
non-child processes. This means you will not be able to attach gdb to an
existing process, but will need to start that process from gdb (so it is a
child). Or you can set `boot.kernel.sysctl."kernel.yama.ptrace_scope"` to 0.
- Package `pash` was removed due to being archived upstream. Use `powershell`
as an alternative.

5
nixos/doc/manual/release-notes/rl-2405.section.md
View File

@ -30,3 +30,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- Programs written in [Nim](https://nim-lang.org/) are built with libraries selected by lockfiles.
The `nimPackages` and `nim2Packages` sets have been removed.
See https://nixos.org/manual/nixpkgs/unstable#nim for more information.
- The Yama LSM is now enabled by default in the kernel, which prevents ptracing
non-child processes. This means you will not be able to attach gdb to an
existing process, but will need to start that process from gdb (so it is a
child). Or you can set `boot.kernel.sysctl."kernel.yama.ptrace_scope"` to 0.

9
nixos/modules/hardware/ckb-next.nix
View File

@ -24,14 +24,7 @@ in
'';
};
package = mkOption {
type = types.package;
default = pkgs.ckb-next;
defaultText = literalExpression "pkgs.ckb-next";
description = lib.mdDoc ''
The package implementing the Corsair keyboard/mouse driver.
'';
};
package = mkPackageOption pkgs "ckb-next" { };
};
config = mkIf cfg.enable {

9
nixos/modules/hardware/digitalbitbox.nix
View File

@ -16,11 +16,10 @@ in
'';
};
package = mkOption {
type = types.package;
default = pkgs.digitalbitbox;
defaultText = literalExpression "pkgs.digitalbitbox";
description = lib.mdDoc "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults.";
package = mkPackageOption pkgs "digitalbitbox" {
extraDescription = ''
This can be used to install a package with udev rules that differ from the defaults.
'';
};
};

9
nixos/modules/hardware/opentabletdriver.nix
View File

@ -26,14 +26,7 @@ in
'';
};
package = mkOption {
type = types.package;
default = pkgs.opentabletdriver;
defaultText = literalExpression "pkgs.opentabletdriver";
description = lib.mdDoc ''
OpenTabletDriver derivation to use.
'';
};
package = mkPackageOption pkgs "opentabletdriver" { };
daemon = {
enable = mkOption {

10
nixos/modules/misc/locate.nix
View File

@ -26,14 +26,8 @@ in
'';
};
package = mkOption {
type = package;
default = pkgs.findutils.locate;
defaultText = literalExpression "pkgs.findutils.locate";
example = literalExpression "pkgs.mlocate";
description = lib.mdDoc ''
The locate implementation to use
'';
package = mkPackageOption pkgs [ "findutils" "locate" ] {
example = "mlocate";
};
interval = mkOption {

2
nixos/modules/module-list.nix
View File

@ -167,6 +167,7 @@
./programs/direnv.nix
./programs/dmrconfig.nix
./programs/droidcam.nix
./programs/dublin-traceroute.nix
./programs/ecryptfs.nix
./programs/environment.nix
./programs/evince.nix
@ -515,6 +516,7 @@
./services/hardware/argonone.nix
./services/hardware/asusd.nix
./services/hardware/auto-cpufreq.nix
./services/hardware/auto-epp.nix
./services/hardware/bluetooth.nix
./services/hardware/bolt.nix
./services/hardware/brltty.nix

9
nixos/modules/programs/atop.nix
View File

@ -16,14 +16,7 @@ in
enable = mkEnableOption (lib.mdDoc "Atop");
package = mkOption {
type = types.package;
default = pkgs.atop;
defaultText = literalExpression "pkgs.atop";
description = lib.mdDoc ''
Which package to use for Atop.
'';
};
package = mkPackageOption pkgs "atop" { };
netatop = {
enable = mkOption {

10
nixos/modules/programs/captive-browser.nix
View File

@ -5,7 +5,8 @@ let
inherit (lib)
concatStringsSep escapeShellArgs optionalString
literalExpression mkEnableOption mkIf mkOption mkOptionDefault types;
literalExpression mkEnableOption mkPackageOption mkIf mkOption
mkOptionDefault types;
requiresSetcapWrapper = config.boot.kernelPackages.kernelOlder "5.7" && cfg.bindInterface;
@ -50,12 +51,7 @@ in
programs.captive-browser = {
enable = mkEnableOption (lib.mdDoc "captive browser");
package = mkOption {
type = types.package;
default = pkgs.captive-browser;
defaultText = literalExpression "pkgs.captive-browser";
description = lib.mdDoc "Which package to use for captive-browser";
};
package = mkPackageOption pkgs "captive-browser" { };
interface = mkOption {
type = types.str;

9
nixos/modules/programs/digitalbitbox/default.nix
View File

@ -16,11 +16,10 @@ in
'';
};
package = mkOption {
type = types.package;
default = pkgs.digitalbitbox;
defaultText = literalExpression "pkgs.digitalbitbox";
description = lib.mdDoc "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults.";
package = mkPackageOption pkgs "digitalbitbox" {
extraDescription = ''
This can be used to install a package with udev rules that differ from the defaults.
'';
};
};

7
nixos/modules/programs/dmrconfig.nix
View File

@ -21,12 +21,7 @@ in {
relatedPackages = [ "dmrconfig" ];
};
package = mkOption {
default = pkgs.dmrconfig;
type = types.package;
defaultText = literalExpression "pkgs.dmrconfig";
description = lib.mdDoc "dmrconfig derivation to use";
};
package = mkPackageOption pkgs "dmrconfig" { };
};
};

31
nixos/modules/programs/dublin-traceroute.nix Normal file
View File

@ -0,0 +1,31 @@
{ config, lib, pkgs, ... }:
with lib;
let
cfg = config.programs.dublin-traceroute;
in {
meta.maintainers = pkgs.dublin-traceroute.meta.maintainers;
options = {
programs.dublin-traceroute = {
enable = mkEnableOption (mdDoc ''
dublin-traceroute, add it to the global environment and configure a setcap wrapper for it.
'');
package = mkPackageOption pkgs "dublin-traceroute" { };
};
};
config = mkIf cfg.enable {
environment.systemPackages = [ cfg.package ];
security.wrappers.dublin-traceroute = {
owner = "root";
group = "root";
capabilities = "cap_net_raw+p";
source = getExe cfg.package;
};
};
}

7
nixos/modules/programs/evince.nix
View File

@ -24,12 +24,7 @@ in {
enable = mkEnableOption
(lib.mdDoc "Evince, the GNOME document viewer");
package = mkOption {
type = types.package;
default = pkgs.evince;
defaultText = literalExpression "pkgs.evince";
description = lib.mdDoc "Evince derivation to use.";
};
package = mkPackageOption pkgs "evince" { };
};

9
nixos/modules/programs/feedbackd.nix
View File

@ -12,14 +12,7 @@ in {
Your user needs to be in the `feedbackd` group to trigger effects
'');
package = mkOption {
description = lib.mdDoc ''
Which feedbackd package to use.
'';
type = types.package;
default = pkgs.feedbackd;
defaultText = literalExpression "pkgs.feedbackd";
};
package = mkPackageOption pkgs "feedbackd" { };
};
};
config = mkIf cfg.enable {

7
nixos/modules/programs/file-roller.nix
View File

@ -23,12 +23,7 @@ in {
enable = mkEnableOption (lib.mdDoc "File Roller, an archive manager for GNOME");
package = mkOption {
type = types.package;
default = pkgs.gnome.file-roller;
defaultText = literalExpression "pkgs.gnome.file-roller";
description = lib.mdDoc "File Roller derivation to use.";
};
package = mkPackageOption pkgs [ "gnome" "file-roller" ] { };
};

7
nixos/modules/programs/flexoptix-app.nix
View File

@ -9,12 +9,7 @@ in {
programs.flexoptix-app = {
enable = mkEnableOption (lib.mdDoc "FLEXOPTIX app + udev rules");
package = mkOption {
description = lib.mdDoc "FLEXOPTIX app package to use";
type = types.package;
default = pkgs.flexoptix-app;
defaultText = literalExpression "pkgs.flexoptix-app";
};
package = mkPackageOption pkgs "flexoptix-app" { };
};
};

9
nixos/modules/programs/gamescope.nix
View File

@ -23,14 +23,7 @@ in
options.programs.gamescope = {
enable = mkEnableOption (mdDoc "gamescope");
package = mkOption {
type = types.package;
default = pkgs.gamescope;
defaultText = literalExpression "pkgs.gamescope";
description = mdDoc ''
The GameScope package to use.
'';
};
package = mkPackageOption pkgs "gamescope" { };
capSysNice = mkOption {
type = types.bool;

15
nixos/modules/programs/git.nix
View File

@ -11,12 +11,8 @@ in
programs.git = {
enable = mkEnableOption (lib.mdDoc "git");
package = mkOption {
type = types.package;
default = pkgs.git;
defaultText = literalExpression "pkgs.git";
example = literalExpression "pkgs.gitFull";
description = lib.mdDoc "The git package to use";
package = mkPackageOption pkgs "git" {
example = "gitFull";
};
config = mkOption {
@ -65,12 +61,7 @@ in
lfs = {
enable = mkEnableOption (lib.mdDoc "git-lfs");
package = mkOption {
type = types.package;
default = pkgs.git-lfs;
defaultText = literalExpression "pkgs.git-lfs";
description = lib.mdDoc "The git-lfs package to use";
};
package = mkPackageOption pkgs "git-lfs" { };
};
};
};

9
nixos/modules/programs/gnupg.nix
View File

@ -29,14 +29,7 @@ in
{
options.programs.gnupg = {
package = mkOption {
type = types.package;
default = pkgs.gnupg;
defaultText = literalExpression "pkgs.gnupg";
description = lib.mdDoc ''
The gpg package that should be used.
'';
};
package = mkPackageOption pkgs "gnupg" { };
agent.enable = mkOption {
type = types.bool;

9
nixos/modules/programs/htop.nix
View File

@ -18,14 +18,7 @@ in
{
options.programs.htop = {
package = mkOption {
type = types.package;
default = pkgs.htop;
defaultText = lib.literalExpression "pkgs.htop";
description = lib.mdDoc ''
The htop package that should be used.
'';
};
package = mkPackageOption pkgs "htop" { };
enable = mkEnableOption (lib.mdDoc "htop process monitor");

14
nixos/modules/programs/i3lock.nix
View File

@ -13,16 +13,12 @@ in {
options = {
programs.i3lock = {
enable = mkEnableOption (mdDoc "i3lock");
package = mkOption {
type = types.package;
default = pkgs.i3lock;
defaultText = literalExpression "pkgs.i3lock";
example = literalExpression ''
pkgs.i3lock-color
'';
description = mdDoc ''
Specify which package to use for the i3lock program,
package = mkPackageOption pkgs "i3lock" {
example = "i3lock-color";
extraDescription = ''
::: {.note}
The i3lock package must include a i3lock file or link in its out directory in order for the u2fSupport option to work correctly.
:::
'';
};
u2fSupport = mkOption {

9
nixos/modules/programs/java.nix
View File

@ -30,13 +30,8 @@ in
'';
};
package = mkOption {
default = pkgs.jdk;
defaultText = literalExpression "pkgs.jdk";
description = lib.mdDoc ''
Java package to install. Typical values are pkgs.jdk or pkgs.jre.
'';
type = types.package;
package = mkPackageOption pkgs "jdk" {
example = "jre";
};
binfmt = mkEnableOption (lib.mdDoc "binfmt to execute java jar's and classes");

10
nixos/modules/programs/k40-whisperer.nix
View File

@ -20,15 +20,7 @@ in
default = "k40";
};
package = mkOption {
type = types.package;
default = pkgs.k40-whisperer;
defaultText = literalExpression "pkgs.k40-whisperer";
example = literalExpression "pkgs.k40-whisperer";
description = lib.mdDoc ''
K40 Whisperer package to use.
'';
};
package = mkPackageOption pkgs "k40-whisperer" { };
};
config = mkIf cfg.enable {

10
nixos/modules/programs/kdeconnect.nix
View File

@ -11,14 +11,8 @@ with lib;
`gnomeExtensions.gsconnect` as an alternative
implementation if you use Gnome
'');
package = mkOption {
default = pkgs.plasma5Packages.kdeconnect-kde;
defaultText = literalExpression "pkgs.plasma5Packages.kdeconnect-kde";
type = types.package;
example = literalExpression "pkgs.gnomeExtensions.gsconnect";
description = lib.mdDoc ''
The package providing the implementation for kdeconnect.
'';
package = mkPackageOption pkgs [ "plasma5Packages" "kdeconnect-kde" ] {
example = "gnomeExtensions.gsconnect";
};
};
config =

9
nixos/modules/programs/mtr.nix
View File

@ -17,14 +17,7 @@ in {
'';
};
package = mkOption {
type = types.package;
default = pkgs.mtr;
defaultText = literalExpression "pkgs.mtr";
description = lib.mdDoc ''
The package to use.
'';
};
package = mkPackageOption pkgs "mtr" { };
};
};

7
nixos/modules/programs/neovim.nix
View File

@ -86,12 +86,7 @@ in
'';
};
package = mkOption {
type = types.package;
default = pkgs.neovim-unwrapped;
defaultText = literalExpression "pkgs.neovim-unwrapped";
description = lib.mdDoc "The package to use for the neovim binary.";
};
package = mkPackageOption pkgs "neovim-unwrapped" { };
finalPackage = mkOption {
type = types.package;

7
nixos/modules/programs/nix-index.nix
View File

@ -5,12 +5,7 @@ in {
options.programs.nix-index = with lib; {
enable = mkEnableOption (lib.mdDoc "nix-index, a file database for nixpkgs");
package = mkOption {
type = types.package;
default = pkgs.nix-index;
defaultText = literalExpression "pkgs.nix-index";
description = lib.mdDoc "Package providing the `nix-index` tool.";
};
package = mkPackageOption pkgs "nix-index" { };
enableBashIntegration = mkEnableOption (lib.mdDoc "Bash integration") // {
default = true;

7
nixos/modules/programs/nncp.nix
View File

@ -23,12 +23,7 @@ in {
'';
};
package = mkOption {
type = types.package;
default = pkgs.nncp;
defaultText = literalExpression "pkgs.nncp";
description = lib.mdDoc "The NNCP package to use system-wide.";
};
package = mkPackageOption pkgs "nncp" { };
secrets = mkOption {
type = with types; listOf str;

9
nixos/modules/programs/noisetorch.nix
View File

@ -8,14 +8,7 @@ in
options.programs.noisetorch = {
enable = mkEnableOption (lib.mdDoc "noisetorch + setcap wrapper");
package = mkOption {
type = types.package;
default = pkgs.noisetorch;
defaultText = literalExpression "pkgs.noisetorch";
description = lib.mdDoc ''
The noisetorch package to use.
'';
};
package = mkPackageOption pkgs "noisetorch" { };
};
config = mkIf cfg.enable {

8
nixos/modules/programs/npm.nix
View File

@ -13,12 +13,8 @@ in
programs.npm = {
enable = mkEnableOption (lib.mdDoc "{command}`npm` global config");
package = mkOption {
type = types.package;
description = lib.mdDoc "The npm package version / flavor to use";
default = pkgs.nodePackages.npm;
defaultText = literalExpression "pkgs.nodePackages.npm";
example = literalExpression "pkgs.nodePackages_13_x.npm";
package = mkPackageOption pkgs [ "nodePackages" "npm" ] {
example = "nodePackages_13_x.npm";
};
npmrc = mkOption {

4
nixos/modules/programs/proxychains.nix
View File

@ -51,8 +51,8 @@ in {
enable = mkEnableOption (lib.mdDoc "installing proxychains configuration");
package = mkPackageOptionMD pkgs "proxychains" {
example = "pkgs.proxychains-ng";
package = mkPackageOption pkgs "proxychains" {
example = "proxychains-ng";
};
chain = {

10
nixos/modules/programs/singularity.nix
View File

@ -12,14 +12,8 @@ in
Whether to install Singularity/Apptainer with system-level overriding such as SUID support.
'';
};
package = mkOption {
type = types.package;
default = pkgs.singularity;
defaultText = literalExpression "pkgs.singularity";
example = literalExpression "pkgs.apptainer";
description = mdDoc ''
Singularity/Apptainer package to override and install.
'';
package = mkPackageOption pkgs "singularity" {
example = "apptainer";
};
packageOverriden = mkOption {
type = types.nullOr types.package;

9
nixos/modules/programs/ssh.nix
View File

@ -132,14 +132,7 @@ in
'';
};
package = mkOption {
type = types.package;
default = pkgs.openssh;
defaultText = literalExpression "pkgs.openssh";
description = lib.mdDoc ''
The package used for the openssh client and daemon.
'';
};
package = mkPackageOption pkgs "openssh" { };
knownHosts = mkOption {
default = {};

13
nixos/modules/programs/tsm-client.nix
View File

@ -5,7 +5,7 @@ let
inherit (builtins) length map;
inherit (lib.attrsets) attrNames filterAttrs hasAttr mapAttrs mapAttrsToList optionalAttrs;
inherit (lib.modules) mkDefault mkIf;
inherit (lib.options) literalExpression mkEnableOption mkOption;
inherit (lib.options) literalExpression mkEnableOption mkOption mkPackageOption;
inherit (lib.strings) concatLines optionalString toLower;
inherit (lib.types) addCheck attrsOf lines nonEmptyStr nullOr package path port str strMatching submodule;
@ -215,14 +215,9 @@ let
TSM-depending packages used on the system.
'';
};
package = mkOption {
type = package;
default = pkgs.tsm-client;
defaultText = literalExpression "pkgs.tsm-client";
example = literalExpression "pkgs.tsm-client-withGui";
description = lib.mdDoc ''
The TSM client derivation to be
added to the system environment.
package = mkPackageOption pkgs "tsm-client" {
example = "tsm-client-withGui";
extraDescription = ''
It will be used with `.override`
to add paths to the client system-options file.
'';

10
nixos/modules/programs/vim.nix
View File

@ -15,14 +15,8 @@ in {
'';
};
package = mkOption {
type = types.package;
default = pkgs.vim;
defaultText = literalExpression "pkgs.vim";
example = literalExpression "pkgs.vim-full";
description = lib.mdDoc ''
vim package to use.
'';
package = mkPackageOption pkgs "vim" {
example = "vim-full";
};
};

9
nixos/modules/programs/wayland/river.nix
View File

@ -10,12 +10,9 @@ in {
options.programs.river = {
enable = mkEnableOption (lib.mdDoc "river, a dynamic tiling Wayland compositor");
package = mkOption {
type = with types; nullOr package;
default = pkgs.river;
defaultText = literalExpression "pkgs.river";
description = lib.mdDoc ''
River package to use.
package = mkPackageOption pkgs "river" {
nullable = true;
extraDescription = ''
Set to `null` to not add any River package to your path.
This should be done if you want to use the Home Manager River module to install River.
'';

7
nixos/modules/programs/weylus.nix
View File

@ -26,12 +26,7 @@ in
'';
};
package = mkOption {
type = package;
default = pkgs.weylus;
defaultText = lib.literalExpression "pkgs.weylus";
description = lib.mdDoc "Weylus package to install.";
};
package = mkPackageOption pkgs "weylus" { };
};
config = mkIf cfg.enable {
networking.firewall = mkIf cfg.openFirewall {

9
nixos/modules/programs/wireshark.nix
View File

@ -16,13 +16,8 @@ in {
setcap wrapper for 'dumpcap' for users in the 'wireshark' group.
'';
};
package = mkOption {
type = types.package;
default = pkgs.wireshark-cli;
defaultText = literalExpression "pkgs.wireshark-cli";
description = lib.mdDoc ''
Which Wireshark package to install in the global environment.
'';
package = mkPackageOption pkgs "wireshark-cli" {
example = "wireshark";
};
};
};

10
nixos/modules/programs/xonsh.nix
View File

@ -24,14 +24,8 @@ in
type = types.bool;
};
package = mkOption {
type = types.package;
default = pkgs.xonsh;
defaultText = literalExpression "pkgs.xonsh";
example = literalExpression "pkgs.xonsh.override { extraPackages = ps: [ ps.requests ]; }";
description = lib.mdDoc ''
xonsh package to use.
'';
package = mkPackageOption pkgs "xonsh" {
example = "xonsh.override { extraPackages = ps: [ ps.requests ]; }";
};
config = mkOption {

10
nixos/modules/programs/zsh/oh-my-zsh.nix
View File

@ -46,15 +46,7 @@ in
'';
};
package = mkOption {
default = pkgs.oh-my-zsh;
defaultText = literalExpression "pkgs.oh-my-zsh";
description = lib.mdDoc ''
Package to install for `oh-my-zsh` usage.
'';
type = types.package;
};
package = mkPackageOption pkgs "oh-my-zsh" { };
plugins = mkOption {
default = [];

10
nixos/modules/programs/zsh/zsh-autoenv.nix
View File

@ -8,15 +8,7 @@ in {
options = {
programs.zsh.zsh-autoenv = {
enable = mkEnableOption (lib.mdDoc "zsh-autoenv");
package = mkOption {
default = pkgs.zsh-autoenv;
defaultText = literalExpression "pkgs.zsh-autoenv";
description = lib.mdDoc ''
Package to install for `zsh-autoenv` usage.
'';
type = types.package;
};
package = mkPackageOption pkgs "zsh-autoenv" { };
};
};

9
nixos/modules/security/please.nix
View File

@ -13,14 +13,7 @@ in
file as another user
'');
package = mkOption {
type = types.package;
default = pkgs.please;
defaultText = literalExpression "pkgs.please";
description = mdDoc ''
Which package to use for {command}`please`.
'';
};
package = mkPackageOption pkgs "please" { };
wheelNeedsPassword = mkOption {
type = types.bool;

7
nixos/modules/services/admin/meshcentral.nix
View File

@ -6,12 +6,7 @@ let
in with lib; {
options.services.meshcentral = with types; {
enable = mkEnableOption (lib.mdDoc "MeshCentral computer management server");
package = mkOption {
description = lib.mdDoc "MeshCentral package to use. Replacing this may be necessary to add dependencies for extra functionality.";
type = types.package;
default = pkgs.meshcentral;
defaultText = literalExpression "pkgs.meshcentral";
};
package = mkPackageOption pkgs "meshcentral" { };
settings = mkOption {
description = lib.mdDoc ''
Settings for MeshCentral. Refer to upstream documentation for details:

9
nixos/modules/services/amqp/rabbitmq.nix
View File

@ -26,14 +26,7 @@ in
'';
};
package = mkOption {
default = pkgs.rabbitmq-server;
type = types.package;
defaultText = literalExpression "pkgs.rabbitmq-server";
description = lib.mdDoc ''
Which rabbitmq package to use.
'';
};
package = mkPackageOption pkgs "rabbitmq-server" { };
listenAddress = mkOption {
default = "127.0.0.1";

7
nixos/modules/services/audio/botamusique.nix
View File

@ -14,12 +14,7 @@ in
options.services.botamusique = {
enable = mkEnableOption (lib.mdDoc "botamusique, a bot to play audio streams on mumble");
package = mkOption {
type = types.package;
default = pkgs.botamusique;
defaultText = literalExpression "pkgs.botamusique";
description = lib.mdDoc "The botamusique package to use.";
};
package = mkPackageOption pkgs "botamusique" { };
settings = mkOption {
type = with types; submodule {

11
nixos/modules/services/audio/jack.nix
View File

@ -20,16 +20,11 @@ in {
JACK Audio Connection Kit. You need to add yourself to the "jackaudio" group
'');
package = mkOption {
package = mkPackageOption pkgs "jack2" {
example = "jack1";
} // {
# until jack1 promiscuous mode is fixed
internal = true;
type = types.package;
default = pkgs.jack2;
defaultText = literalExpression "pkgs.jack2";
example = literalExpression "pkgs.jack1";
description = lib.mdDoc ''
The JACK package to use.
'';
};
extraOptions = mkOption {

7
nixos/modules/services/audio/jmusicbot.nix
View File

@ -9,12 +9,7 @@ in
services.jmusicbot = {
enable = mkEnableOption (lib.mdDoc "jmusicbot, a Discord music bot that's easy to set up and run yourself");
package = mkOption {
type = types.package;
default = pkgs.jmusicbot;
defaultText = literalExpression "pkgs.jmusicbot";
description = lib.mdDoc "JMusicBot package to use";
};
package = mkPackageOption pkgs "jmusicbot" { };
stateDir = mkOption {
type = types.path;

7
nixos/modules/services/audio/slimserver.nix
View File

@ -19,12 +19,7 @@ in {
'';
};
package = mkOption {
type = types.package;
default = pkgs.slimserver;
defaultText = literalExpression "pkgs.slimserver";
description = lib.mdDoc "Slimserver package to use.";
};
package = mkPackageOption pkgs "slimserver" { };
dataDir = mkOption {
type = types.path;

8
nixos/modules/services/backup/postgresql-wal-receiver.nix
View File

@ -5,12 +5,8 @@ with lib;
let
receiverSubmodule = {
options = {
postgresqlPackage = mkOption {
type = types.package;
example = literalExpression "pkgs.postgresql_15";
description = lib.mdDoc ''
PostgreSQL package to use.
'';
postgresqlPackage = mkPackageOption pkgs "postgresql" {
example = "postgresql_15";
};
directory = mkOption {

7
nixos/modules/services/backup/restic-rest-server.nix
View File

@ -57,12 +57,7 @@ in
'';
};
package = mkOption {
default = pkgs.restic-rest-server;
defaultText = literalExpression "pkgs.restic-rest-server";
type = types.package;
description = lib.mdDoc "Restic REST server package to use.";
};
package = mkPackageOption pkgs "restic-rest-server" { };
};
config = mkIf cfg.enable {

9
nixos/modules/services/backup/restic.nix
View File

@ -245,14 +245,7 @@ in
'';
};
package = mkOption {
type = types.package;
default = pkgs.restic;
defaultText = literalExpression "pkgs.restic";
description = lib.mdDoc ''
Restic package to use.
'';
};
package = mkPackageOption pkgs "restic" { };
createWrapper = lib.mkOption {
type = lib.types.bool;

7
nixos/modules/services/backup/zrepl.nix
View File

@ -13,12 +13,7 @@ in
services.zrepl = {
enable = mkEnableOption (lib.mdDoc "zrepl");
package = mkOption {
type = types.package;
default = pkgs.zrepl;
defaultText = literalExpression "pkgs.zrepl";
description = lib.mdDoc "Which package to use for zrepl";
};
package = mkPackageOption pkgs "zrepl" { };
settings = mkOption {
default = { };

7
nixos/modules/services/blockchain/ethereum/geth.nix
View File

@ -135,12 +135,7 @@ let
default = [];
};
package = mkOption {
default = pkgs.go-ethereum.geth;
defaultText = literalExpression "pkgs.go-ethereum.geth";
type = types.package;
description = lib.mdDoc "Package to use as Go Ethereum node.";
};
package = mkPackageOption pkgs [ "go-ethereum" "geth" ] { };
};
};
in

7
nixos/modules/services/cluster/corosync/default.nix
View File

@ -9,12 +9,7 @@ in
options.services.corosync = {
enable = mkEnableOption (lib.mdDoc "corosync");
package = mkOption {
type = types.package;
default = pkgs.corosync;
defaultText = literalExpression "pkgs.corosync";
description = lib.mdDoc "Package that should be used for corosync.";
};
package = mkPackageOption pkgs "corosync" { };
clusterName = mkOption {
type = types.str;

7
nixos/modules/services/cluster/hadoop/default.nix
View File

@ -199,12 +199,7 @@ with lib;
gatewayRole.enable = mkEnableOption (lib.mdDoc "gateway role for deploying hadoop configs");
package = mkOption {
type = types.package;
default = pkgs.hadoop;
defaultText = literalExpression "pkgs.hadoop";
description = lib.mdDoc "";
};
package = mkPackageOption pkgs "hadoop" { };
};

7
nixos/modules/services/cluster/hadoop/hbase.nix
View File

@ -134,12 +134,7 @@ in
hbase = {
package = mkOption {
type = types.package;
default = pkgs.hbase;
defaultText = literalExpression "pkgs.hbase";
description = mdDoc "HBase package";
};
package = mkPackageOption pkgs "hbase" { };
rootdir = mkOption {
description = mdDoc ''

7
nixos/modules/services/cluster/k3s/default.nix
View File

@ -15,12 +15,7 @@ in
options.services.k3s = {
enable = mkEnableOption (lib.mdDoc "k3s");
package = mkOption {
type = types.package;
default = pkgs.k3s;
defaultText = literalExpression "pkgs.k3s";
description = lib.mdDoc "Package that should be used for k3s";
};
package = mkPackageOption pkgs "k3s" { };
role = mkOption {
description = lib.mdDoc ''

7
nixos/modules/services/cluster/kubernetes/default.nix
View File

@ -122,12 +122,7 @@ in {
type = types.listOf (types.enum ["master" "node"]);
};
package = mkOption {
description = lib.mdDoc "Kubernetes package to use.";
type = types.package;
default = pkgs.kubernetes;
defaultText = literalExpression "pkgs.kubernetes";
};
package = mkPackageOption pkgs "kubernetes" { };
kubeconfig = mkKubeConfigOptions "Default kubeconfig";

7
nixos/modules/services/cluster/pacemaker/default.nix
View File

@ -9,12 +9,7 @@ in
options.services.pacemaker = {
enable = mkEnableOption (lib.mdDoc "pacemaker");
package = mkOption {
type = types.package;
default = pkgs.pacemaker;
defaultText = literalExpression "pkgs.pacemaker";
description = lib.mdDoc "Package that should be used for pacemaker.";
};
package = mkPackageOption pkgs "pacemaker" { };
};
# implementation

24
nixos/modules/services/cluster/spark/default.nix
View File

@ -77,20 +77,18 @@ with lib;
description = lib.mdDoc "Spark log directory.";
default = "/var/log/spark";
};
package = mkOption {
type = types.package;
description = lib.mdDoc "Spark package.";
default = pkgs.spark;
defaultText = literalExpression "pkgs.spark";
example = literalExpression ''pkgs.spark.overrideAttrs (super: rec {
pname = "spark";
version = "2.4.4";
package = mkPackageOption pkgs "spark" {
example = ''
spark.overrideAttrs (super: rec {
pname = "spark";
version = "2.4.4";
src = pkgs.fetchzip {
url = "mirror://apache/spark/"''${pname}-''${version}/''${pname}-''${version}-bin-without-hadoop.tgz";
sha256 = "1a9w5k0207fysgpxx6db3a00fs5hdc2ncx99x4ccy2s0v5ndc66g";
};
})'';
src = pkgs.fetchzip {
url = "mirror://apache/spark/"''${pname}-''${version}/''${pname}-''${version}-bin-without-hadoop.tgz";
sha256 = "1a9w5k0207fysgpxx6db3a00fs5hdc2ncx99x4ccy2s0v5ndc66g";
};
})
'';
};
};
};

10
nixos/modules/services/computing/boinc/client.nix
View File

@ -27,14 +27,8 @@ in
'';
};
package = mkOption {
type = types.package;
default = pkgs.boinc;
defaultText = literalExpression "pkgs.boinc";
example = literalExpression "pkgs.boinc-headless";
description = lib.mdDoc ''
Which BOINC package to use.
'';
package = mkPackageOption pkgs "boinc" {
example = "boinc-headless";
};
dataDir = mkOption {

9
nixos/modules/services/computing/foldingathome/client.nix
View File

@ -20,14 +20,7 @@ in
options.services.foldingathome = {
enable = mkEnableOption (lib.mdDoc "Folding@home client");
package = mkOption {
type = types.package;
default = pkgs.fahclient;
defaultText = literalExpression "pkgs.fahclient";
description = lib.mdDoc ''
Which Folding@home client to use.
'';
};
package = mkPackageOption pkgs "fahclient" { };
user = mkOption {
type = types.nullOr types.str;

10
nixos/modules/services/computing/slurm/slurm.nix
View File

@ -131,14 +131,10 @@ in
'';
};
package = mkOption {
type = types.package;
package = mkPackageOption pkgs "slurm" {
example = "slurm-full";
} // {
default = pkgs.slurm.override { enableX11 = ! cfg.enableSrunX11; };
defaultText = literalExpression "pkgs.slurm";
example = literalExpression "pkgs.slurm-full";
description = lib.mdDoc ''
The package to use for slurm binaries.
'';
};
controlMachine = mkOption {

8
nixos/modules/services/continuous-integration/buildbot/master.nix
View File

@ -229,12 +229,8 @@ in {
description = lib.mdDoc "Specifies port number on which the buildbot HTTP interface listens.";
};
package = mkOption {
type = types.package;
default = pkgs.buildbot-full;
defaultText = literalExpression "pkgs.buildbot-full";
description = lib.mdDoc "Package to use for buildbot.";
example = literalExpression "pkgs.buildbot";
package = mkPackageOption pkgs "buildbot-full" {
example = "buildbot";
};
packages = mkOption {

8
nixos/modules/services/continuous-integration/buildbot/worker.nix
View File

@ -128,12 +128,8 @@ in {
'';
};
package = mkOption {
type = types.package;
default = pkgs.buildbot-worker;
defaultText = literalExpression "pkgs.python3Packages.buildbot-worker";
description = lib.mdDoc "Package to use for buildbot worker.";
example = literalExpression "pkgs.python2Packages.buildbot-worker";
package = mkPackageOption pkgs "python3Packages.buildbot-worker" {
example = "python2Packages.buildbot-worker";
};
packages = mkOption {

9
nixos/modules/services/continuous-integration/github-runner/options.nix
View File

@ -161,14 +161,7 @@ with lib;
default = {};
};
package = mkOption {
type = types.package;
description = lib.mdDoc ''
Which github-runner derivation to use.
'';
default = pkgs.github-runner;
defaultText = literalExpression "pkgs.github-runner";
};
package = mkPackageOption pkgs "github-runner" { };
ephemeral = mkOption {
type = types.bool;

8
nixos/modules/services/continuous-integration/gitlab-runner.nix
View File

@ -195,12 +195,8 @@ in {
Time to wait until a graceful shutdown is turned into a forceful one.
'';
};
package = mkOption {
type = types.package;
default = pkgs.gitlab-runner;
defaultText = literalExpression "pkgs.gitlab-runner";
example = literalExpression "pkgs.gitlab-runner_1_11";
description = lib.mdDoc "Gitlab Runner package to use.";
package = mkPackageOption pkgs "gitlab-runner" {
example = "gitlab-runner_1_11";
};
extraPackages = mkOption {
type = types.listOf types.package;

11
nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix
View File

@ -16,7 +16,7 @@ let
mkRemovedOptionModule
mkRenamedOptionModule
types
mkPackageOption
;
cfg = config.services.hercules-ci-agent;
@ -45,14 +45,7 @@ in
Support is available at [help@hercules-ci.com](mailto:help@hercules-ci.com).
'';
};
package = mkOption {
description = lib.mdDoc ''
Package containing the bin/hercules-ci-agent executable.
'';
type = types.package;
default = pkgs.hercules-ci-agent;
defaultText = literalExpression "pkgs.hercules-ci-agent";
};
package = mkPackageOption pkgs "hercules-ci-agent" { };
settings = mkOption {
description = lib.mdDoc ''
These settings are written to the `agent.toml` file.

7
nixos/modules/services/continuous-integration/hydra/default.nix
View File

@ -97,12 +97,7 @@ in
'';
};
package = mkOption {
type = types.package;
default = pkgs.hydra_unstable;
defaultText = literalExpression "pkgs.hydra_unstable";
description = lib.mdDoc "The Hydra package.";
};
package = mkPackageOption pkgs "hydra_unstable" { };
hydraURL = mkOption {
type = types.str;

7
nixos/modules/services/continuous-integration/jenkins/default.nix
View File

@ -79,12 +79,7 @@ in {
'';
};
package = mkOption {
default = pkgs.jenkins;
defaultText = literalExpression "pkgs.jenkins";
type = types.package;
description = lib.mdDoc "Jenkins package to use.";
};
package = mkPackageOption pkgs "jenkins" { };
packages = mkOption {
default = [ pkgs.stdenv pkgs.git pkgs.jdk17 config.programs.ssh.package pkgs.nix ];

9
nixos/modules/services/continuous-integration/jenkins/slave.nix
View File

@ -47,14 +47,7 @@ in {
'';
};
javaPackage = mkOption {
default = pkgs.jdk;
defaultText = literalExpression "pkgs.jdk";
description = lib.mdDoc ''
Java package to install.
'';
type = types.package;
};
javaPackage = mkPackageOption pkgs "jdk" { };
};
};

7
nixos/modules/services/databases/aerospike.nix
View File

@ -41,12 +41,7 @@ in
services.aerospike = {
enable = mkEnableOption (lib.mdDoc "Aerospike server");
package = mkOption {
default = pkgs.aerospike;
defaultText = literalExpression "pkgs.aerospike";
type = types.package;
description = lib.mdDoc "Which Aerospike derivation to use";
};
package = mkPackageOption pkgs "aerospike" { };
workDir = mkOption {
type = types.str;

11
nixos/modules/services/databases/cassandra.nix
View File

@ -11,6 +11,7 @@ let
recursiveUpdate
mdDoc
mkEnableOption
mkPackageOption
mkIf
mkOption
types
@ -155,14 +156,8 @@ in
'';
};
package = mkOption {
type = types.package;
default = pkgs.cassandra;
defaultText = literalExpression "pkgs.cassandra";
example = literalExpression "pkgs.cassandra_3_11";
description = mdDoc ''
The Apache Cassandra package to use.
'';
package = mkPackageOption pkgs "cassandra" {
example = "cassandra_3_11";
};
jvmOpts = mkOption {

9
nixos/modules/services/databases/clickhouse.nix
View File

@ -13,14 +13,7 @@ with lib;
enable = mkEnableOption (lib.mdDoc "ClickHouse database server");
package = mkOption {
type = types.package;
default = pkgs.clickhouse;
defaultText = lib.literalExpression "pkgs.clickhouse";
description = lib.mdDoc ''
ClickHouse package to use.
'';
};
package = mkPackageOption pkgs "clickhouse" { };
};

9
nixos/modules/services/databases/cockroachdb.nix
View File

@ -145,13 +145,8 @@ in
'';
};
package = mkOption {
type = types.package;
default = pkgs.cockroachdb;
defaultText = literalExpression "pkgs.cockroachdb";
description = lib.mdDoc ''
The CockroachDB derivation to use for running the service.
package = mkPackageOption pkgs "cockroachdb" {
extraDescription = ''
This would primarily be useful to enable Enterprise Edition features
in your own custom CockroachDB build (Nixpkgs CockroachDB binaries
only contain open source features and open source code).

9
nixos/modules/services/databases/couchdb.nix
View File

@ -36,14 +36,7 @@ in {
enable = mkEnableOption (lib.mdDoc "CouchDB Server");
package = mkOption {
type = types.package;
default = pkgs.couchdb3;
defaultText = literalExpression "pkgs.couchdb3";
description = lib.mdDoc ''
CouchDB package to use.
'';
};
package = mkPackageOption pkgs "couchdb3" { };
adminUser = mkOption {
type = types.str;

10
nixos/modules/services/databases/firebird.nix
View File

@ -42,13 +42,9 @@ in
enable = mkEnableOption (lib.mdDoc "the Firebird super server");
package = mkOption {
default = pkgs.firebird;
defaultText = literalExpression "pkgs.firebird";
type = types.package;
example = literalExpression "pkgs.firebird_3";
description = lib.mdDoc ''
Which Firebird package to be installed: `pkgs.firebird_3`
package = mkPackageOption pkgs "firebird" {
example = "firebird_3";
extraDescription = ''
For SuperServer use override: `pkgs.firebird_3.override { superServer = true; };`
'';
};

10
nixos/modules/services/databases/hbase-standalone.nix
View File

@ -46,15 +46,7 @@ in {
Do not use this configuration for production nor for evaluating HBase performance.
'');
package = mkOption {
type = types.package;
default = pkgs.hbase;
defaultText = literalExpression "pkgs.hbase";
description = lib.mdDoc ''
HBase package to use.
'';
};
package = mkPackageOption pkgs "hbase" { };
user = mkOption {
type = types.str;

7
nixos/modules/services/databases/influxdb.nix
View File

@ -116,12 +116,7 @@ in
type = types.bool;
};
package = mkOption {
default = pkgs.influxdb;
defaultText = literalExpression "pkgs.influxdb";
description = lib.mdDoc "Which influxdb derivation to use";
type = types.package;
};
package = mkPackageOption pkgs "influxdb" { };
user = mkOption {
default = "influxdb";

8
nixos/modules/services/databases/influxdb2.nix
View File

@ -19,6 +19,7 @@ let
mapAttrsToList
mdDoc
mkEnableOption
mkPackageOption
mkIf
mkOption
nameValuePair
@ -278,12 +279,7 @@ in
services.influxdb2 = {
enable = mkEnableOption (mdDoc "the influxdb2 server");
package = mkOption {
default = pkgs.influxdb2-server;
defaultText = literalExpression "pkgs.influxdb2";
description = mdDoc "influxdb2 derivation to use.";
type = types.package;
};
package = mkPackageOption pkgs "influxdb2" { };
settings = mkOption {
default = { };

7
nixos/modules/services/databases/monetdb.nix
View File

@ -14,12 +14,7 @@ in {
enable = mkEnableOption (lib.mdDoc "the MonetDB database server");
package = mkOption {
type = types.package;
default = pkgs.monetdb;
defaultText = literalExpression "pkgs.monetdb";
description = lib.mdDoc "MonetDB package to use.";
};
package = mkPackageOption pkgs "monetdb" { };
user = mkOption {
type = types.str;

9
nixos/modules/services/databases/mongodb.nix
View File

@ -31,14 +31,7 @@ in
enable = mkEnableOption (lib.mdDoc "the MongoDB server");
package = mkOption {
default = pkgs.mongodb;
defaultText = literalExpression "pkgs.mongodb";
type = types.package;
description = lib.mdDoc ''
Which MongoDB derivation to use.
'';
};
package = mkPackageOption pkgs "mongodb" { };
user = mkOption {
type = types.str;

9
nixos/modules/services/databases/neo4j.nix
View File

@ -174,14 +174,7 @@ in {
'';
};
package = mkOption {
type = types.package;
default = pkgs.neo4j;
defaultText = literalExpression "pkgs.neo4j";
description = lib.mdDoc ''
Neo4j package to use.
'';
};
package = mkPackageOption pkgs "neo4j" { };
readOnly = mkOption {
type = types.bool;

9
nixos/modules/services/databases/openldap.nix
View File

@ -91,13 +91,8 @@ in {
description = lib.mdDoc "Whether to enable the ldap server.";
};
package = mkOption {
type = types.package;
default = pkgs.openldap;
defaultText = literalExpression "pkgs.openldap";
description = lib.mdDoc ''
OpenLDAP package to use.
package = mkPackageOption pkgs "openldap" {
extraDescription = ''
This can be used to, for example, set an OpenLDAP package
with custom overrides to enable modules or other
functionality.

9
nixos/modules/services/databases/opentsdb.nix
View File

@ -17,14 +17,7 @@ in {
enable = mkEnableOption (lib.mdDoc "OpenTSDB");
package = mkOption {
type = types.package;
default = pkgs.opentsdb;
defaultText = literalExpression "pkgs.opentsdb";
description = lib.mdDoc ''
OpenTSDB package to use.
'';
};
package = mkPackageOption pkgs "opentsdb" { };
user = mkOption {
type = types.str;

9
nixos/modules/services/databases/pgbouncer.nix
View File

@ -82,14 +82,7 @@ in {
enable = mkEnableOption (lib.mdDoc "PostgreSQL connection pooler");
package = mkOption {
type = types.package;
default = pkgs.pgbouncer;
defaultText = literalExpression "pkgs.pgbouncer";
description = lib.mdDoc ''
The pgbouncer package to use.
'';
};
package = mkPackageOption pkgs "pgbouncer" { };
openFirewall = mkOption {
type = types.bool;

9
nixos/modules/services/databases/pgmanage.nix
View File

@ -46,14 +46,7 @@ in {
options.services.pgmanage = {
enable = mkEnableOption (lib.mdDoc "PostgreSQL Administration for the web");
package = mkOption {
type = types.package;
default = pkgs.pgmanage;
defaultText = literalExpression "pkgs.pgmanage";
description = lib.mdDoc ''
The pgmanage package to use.
'';
};
package = mkPackageOption pkgs "pgmanage" { };
connections = mkOption {
type = types.attrsOf types.str;

8
nixos/modules/services/databases/postgresql.nix
View File

@ -53,12 +53,8 @@ in
enableJIT = mkEnableOption (lib.mdDoc "JIT support");
package = mkOption {
type = types.package;
example = literalExpression "pkgs.postgresql_15";
description = lib.mdDoc ''
PostgreSQL package to use.
'';
package = mkPackageOption pkgs "postgresql" {
example = "postgresql_15";
};
port = mkOption {

7
nixos/modules/services/databases/redis.nix
View File

@ -54,12 +54,7 @@ in {
options = {
services.redis = {
package = mkOption {
type = types.package;
default = pkgs.redis;
defaultText = literalExpression "pkgs.redis";
description = lib.mdDoc "Which Redis derivation to use.";
};
package = mkPackageOption pkgs "redis" { };
vmOverCommit = mkEnableOption (lib.mdDoc ''
setting of vm.overcommit_memory to 1

9
nixos/modules/services/databases/surrealdb.nix
View File

@ -10,14 +10,7 @@ in {
services.surrealdb = {
enable = mkEnableOption (lib.mdDoc "SurrealDB, a scalable, distributed, collaborative, document-graph database, for the realtime web");
package = mkOption {
default = pkgs.surrealdb;
defaultText = literalExpression "pkgs.surrealdb";
type = types.package;
description = lib.mdDoc ''
Which surrealdb derivation to use.
'';
};
package = mkPackageOption pkgs "surrealdb" { };
dbPath = mkOption {
type = types.str;

9
nixos/modules/services/databases/victoriametrics.nix
View File

@ -3,14 +3,7 @@ let cfg = config.services.victoriametrics; in
{
options.services.victoriametrics = with lib; {
enable = mkEnableOption (lib.mdDoc "victoriametrics");
package = mkOption {
type = types.package;
default = pkgs.victoriametrics;
defaultText = literalExpression "pkgs.victoriametrics";
description = lib.mdDoc ''
The VictoriaMetrics distribution to use.
'';
};
package = mkPackageOption pkgs "victoriametrics" { };
listenAddress = mkOption {
default = ":8428";
type = types.str;

11
nixos/modules/services/desktops/deepin/app-services.nix
View File

@ -25,8 +25,17 @@ with lib;
config = mkIf config.services.deepin.app-services.enable {
environment.systemPackages = [ pkgs.deepin.dde-app-services ];
users.groups.dde-dconfig-daemon = { };
users.users.dde-dconfig-daemon = {
description = "Dconfig daemon user";
home = "/var/lib/dde-dconfig-daemon";
createHome = true;
group = "dde-dconfig-daemon";
isSystemUser = true;
};
environment.systemPackages = [ pkgs.deepin.dde-app-services ];
systemd.packages = [ pkgs.deepin.dde-app-services ];
services.dbus.packages = [ pkgs.deepin.dde-app-services ];
environment.pathsToLink = [ "/share/dsg" ];

7
nixos/modules/services/desktops/gvfs.nix
View File

@ -32,12 +32,7 @@ in
enable = mkEnableOption (lib.mdDoc "GVfs, a userspace virtual filesystem");
# gvfs can be built with multiple configurations
package = mkOption {
type = types.package;
default = pkgs.gnome.gvfs;
defaultText = literalExpression "pkgs.gnome.gvfs";
description = lib.mdDoc "Which GVfs package to use.";
};
package = mkPackageOption pkgs [ "gnome" "gvfs" ] { };
};

9
nixos/modules/services/desktops/pipewire/pipewire.nix
View File

@ -25,14 +25,7 @@ in {
services.pipewire = {
enable = mkEnableOption (lib.mdDoc "pipewire service");
package = mkOption {
type = types.package;
default = pkgs.pipewire;
defaultText = literalExpression "pkgs.pipewire";
description = lib.mdDoc ''
The pipewire derivation to use.
'';
};
package = mkPackageOption pkgs "pipewire" { };
socketActivation = mkOption {
default = true;

9
nixos/modules/services/development/distccd.nix
View File

@ -66,14 +66,7 @@ in
'';
};
package = mkOption {
type = types.package;
default = pkgs.distcc;
defaultText = literalExpression "pkgs.distcc";
description = lib.mdDoc ''
The distcc package to use.
'';
};
package = mkPackageOption pkgs "distcc" { };
port = mkOption {
type = types.port;

15
nixos/modules/services/development/jupyter/default.nix
View File

@ -34,17 +34,10 @@ in {
'';
};
package = mkOption {
type = types.package;
# NOTE: We don't use top-level jupyter because we don't
# want to pass in JUPYTER_PATH but use .environment instead,
# saving a rebuild.
default = pkgs.python3.pkgs.notebook;
defaultText = literalExpression "pkgs.python3.pkgs.notebook";
description = lib.mdDoc ''
Jupyter package to use.
'';
};
# NOTE: We don't use top-level jupyter because we don't
# want to pass in JUPYTER_PATH but use .environment instead,
# saving a rebuild.
package = mkPackageOption pkgs [ "python3" "pkgs" "notebook" ] { };
command = mkOption {
type = types.str;

10
nixos/modules/services/development/rstudio-server/default.nix
View File

@ -39,14 +39,8 @@ in
'';
};
package = mkOption {
type = types.package;
default = pkgs.rstudio-server;
defaultText = literalExpression "pkgs.rstudio-server";
example = literalExpression "pkgs.rstudioServerWrapper.override { packages = [ pkgs.rPackages.ggplot2 ]; }";
description = lib.mdDoc ''
Rstudio server package to use. Can be set to rstudioServerWrapper to provide packages.
'';
package = mkPackageOption pkgs "rstudio-server" {
example = "rstudioServerWrapper.override { packages = [ pkgs.rPackages.ggplot2 ]; }";
};
rserverExtraConfig = mkOption {

Some files were not shown because too many files have changed in this diff Show More