Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 297f8c55e51c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4a11ce7f2613
Choose a head ref
  • 1 commit
  • 26 files changed
  • 1 contributor

Commits on Apr 20, 2019

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    rycee Robert Helgesson
    Copy the full SHA
    4a11ce7 View commit details
Showing with 30 additions and 29 deletions.
  1. +1 −1 nixos/modules/services/admin/oxidized.nix
  2. +1 −1 nixos/modules/services/cluster/kubernetes/addon-manager.nix
  3. +1 −1 nixos/modules/services/cluster/kubernetes/controller-manager.nix
  4. +1 −1 nixos/modules/services/cluster/kubernetes/flannel.nix
  5. +1 −1 nixos/modules/services/cluster/kubernetes/pki.nix
  6. +1 −1 nixos/modules/services/cluster/kubernetes/proxy.nix
  7. +1 −1 nixos/modules/services/cluster/kubernetes/scheduler.nix
  8. +1 −1 nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
  9. +1 −1 nixos/modules/services/hardware/bluetooth.nix
  10. +2 −2 nixos/modules/services/hardware/vdr.nix
  11. +1 −1 nixos/modules/services/mail/mailcatcher.nix
  12. +1 −1 nixos/modules/services/mail/offlineimap.nix
  13. +1 −1 nixos/modules/services/misc/beanstalkd.nix
  14. +1 −1 nixos/modules/services/misc/sssd.nix
  15. +2 −2 nixos/modules/services/networking/i2pd.nix
  16. +1 −1 nixos/modules/services/networking/miredo.nix
  17. +1 −1 nixos/modules/services/networking/monero.nix
  18. +2 −2 nixos/modules/services/networking/mosquitto.nix
  19. +2 −1 nixos/modules/services/networking/namecoind.nix
  20. +1 −1 nixos/modules/services/networking/nullidentdmod.nix
  21. +1 −1 nixos/modules/services/networking/toxvpn.nix
  22. +1 −1 nixos/modules/services/search/kibana.nix
  23. +1 −1 nixos/modules/services/search/solr.nix
  24. +1 −1 nixos/modules/services/x11/desktop-managers/gnome3.nix
  25. +1 −1 nixos/modules/services/x11/display-managers/xpra.nix
  26. +1 −1 nixos/modules/tasks/filesystems/btrfs.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/admin/oxidized.nix
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ let
in
{
options.services.oxidized = {
enable = mkEnableOption "the oxidized configuation backup service.";
enable = mkEnableOption "the oxidized configuration backup service";

user = mkOption {
type = types.str;
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ in
'';
};

enable = mkEnableOption "Whether to enable Kubernetes addon manager.";
enable = mkEnableOption "Kubernetes addon manager";

kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes addon manager";
bootstrapAddonsKubeconfig = top.lib.mkKubeConfigOptions "Kubernetes addon manager bootstrap";
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ in
type = str;
};

enable = mkEnableOption "Kubernetes controller manager.";
enable = mkEnableOption "Kubernetes controller manager";

extraOpts = mkOption {
description = "Kubernetes controller manager extra command line options.";
2 changes: 1 addition & 1 deletion nixos/modules/services/cluster/kubernetes/flannel.nix
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ in
{
###### interface
options.services.kubernetes.flannel = {
enable = mkEnableOption "enable flannel networking";
enable = mkEnableOption "flannel networking";
kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes flannel";
};

2 changes: 1 addition & 1 deletion nixos/modules/services/cluster/kubernetes/pki.nix
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ in
###### interface
options.services.kubernetes.pki = with lib.types; {

enable = mkEnableOption "Whether to enable easyCert issuer service.";
enable = mkEnableOption "easyCert issuer service";

certs = mkOption {
description = "List of certificate specs to feed to cert generator.";
2 changes: 1 addition & 1 deletion nixos/modules/services/cluster/kubernetes/proxy.nix
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ in
type = str;
};

enable = mkEnableOption "Whether to enable Kubernetes proxy.";
enable = mkEnableOption "Kubernetes proxy";

extraOpts = mkOption {
description = "Kubernetes proxy extra command line options.";
2 changes: 1 addition & 1 deletion nixos/modules/services/cluster/kubernetes/scheduler.nix
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ in
type = str;
};

enable = mkEnableOption "Whether to enable Kubernetes scheduler.";
enable = mkEnableOption "Kubernetes scheduler";

extraOpts = mkOption {
description = "Kubernetes scheduler extra command line options.";
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ in

services.gnome3.gnome-settings-daemon = {

enable = mkEnableOption "GNOME Settings Daemon.";
enable = mkEnableOption "GNOME Settings Daemon";

# There are many forks of gnome-settings-daemon
package = mkOption {
2 changes: 1 addition & 1 deletion nixos/modules/services/hardware/bluetooth.nix
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ in {
options = {

hardware.bluetooth = {
enable = mkEnableOption "support for Bluetooth.";
enable = mkEnableOption "support for Bluetooth";

powerOnBoot = mkOption {
type = types.bool;
4 changes: 2 additions & 2 deletions nixos/modules/services/hardware/vdr.nix
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ in {
options = {

services.vdr = {
enable = mkEnableOption "enable VDR. Please put config into ${libDir}.";
enable = mkEnableOption "VDR. Please put config into ${libDir}";

package = mkOption {
type = types.package;
@@ -34,7 +34,7 @@ in {
description = "Additional command line arguments to pass to VDR.";
};

enableLirc = mkEnableOption "enable LIRC";
enableLirc = mkEnableOption "LIRC";
};
};

2 changes: 1 addition & 1 deletion nixos/modules/services/mail/mailcatcher.nix
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ in
options = {

services.mailcatcher = {
enable = mkEnableOption "Enable MailCatcher.";
enable = mkEnableOption "MailCatcher";

http.ip = mkOption {
type = types.str;
2 changes: 1 addition & 1 deletion nixos/modules/services/mail/offlineimap.nix
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ let
in {

options.services.offlineimap = {
enable = mkEnableOption "Offlineimap, a software to dispose your mailbox(es) as a local Maildir(s).";
enable = mkEnableOption "OfflineIMAP, a software to dispose your mailbox(es) as a local Maildir(s)";

install = mkOption {
type = types.bool;
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/beanstalkd.nix
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ in

options = {
services.beanstalkd = {
enable = mkEnableOption "Enable the Beanstalk work queue.";
enable = mkEnableOption "the Beanstalk work queue";

listen = {
port = mkOption {
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/sssd.nix
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ let
in {
options = {
services.sssd = {
enable = mkEnableOption "the System Security Services Daemon.";
enable = mkEnableOption "the System Security Services Daemon";

config = mkOption {
type = types.lines;
4 changes: 2 additions & 2 deletions nixos/modules/services/networking/i2pd.nix
Original file line number Diff line number Diff line change
@@ -470,15 +470,15 @@ in
'';
};

trust.hidden = mkEnableOption "Router concealment.";
trust.hidden = mkEnableOption "Router concealment";

websocket = mkEndpointOpt "websockets" "127.0.0.1" 7666;

exploratory.inbound = i2cpOpts "exploratory";
exploratory.outbound = i2cpOpts "exploratory";

ntcp2.enable = mkEnableTrueOption "NTCP2.";
ntcp2.published = mkEnableOption "NTCP2 publication.";
ntcp2.published = mkEnableOption "NTCP2 publication";
ntcp2.port = mkOption {
type = types.int;
default = 0;
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/miredo.nix
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ in

services.miredo = {

enable = mkEnableOption "the Miredo IPv6 tunneling service.";
enable = mkEnableOption "the Miredo IPv6 tunneling service";

package = mkOption {
type = types.package;
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/monero.nix
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ in

services.monero = {

enable = mkEnableOption "Monero node daemon.";
enable = mkEnableOption "Monero node daemon";

mining.enable = mkOption {
type = types.bool;
4 changes: 2 additions & 2 deletions nixos/modules/services/networking/mosquitto.nix
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ in

options = {
services.mosquitto = {
enable = mkEnableOption "Enable the MQTT Mosquitto broker.";
enable = mkEnableOption "the MQTT Mosquitto broker";

host = mkOption {
default = "127.0.0.1";
@@ -65,7 +65,7 @@ in
};

ssl = {
enable = mkEnableOption "Enable SSL listener.";
enable = mkEnableOption "SSL listener";

cafile = mkOption {
type = types.nullOr types.path;
3 changes: 2 additions & 1 deletion nixos/modules/services/networking/namecoind.nix
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

{ config, lib, pkgs, ... }:

with lib;
@@ -43,7 +44,7 @@ in

services.namecoind = {

enable = mkEnableOption "namecoind, Namecoin client.";
enable = mkEnableOption "namecoind, Namecoin client";

wallet = mkOption {
type = types.path;
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/nullidentdmod.nix
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@

in {
options.services.nullidentdmod = with types; {
enable = mkEnableOption "Enable the nullidentdmod identd daemon";
enable = mkEnableOption "the nullidentdmod identd daemon";

userid = mkOption {
type = nullOr str;
2 changes: 1 addition & 1 deletion nixos/modules/services/networking/toxvpn.nix
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ with lib;
{
options = {
services.toxvpn = {
enable = mkEnableOption "enable toxvpn running on startup";
enable = mkEnableOption "toxvpn running on startup";

localip = mkOption {
type = types.string;
2 changes: 1 addition & 1 deletion nixos/modules/services/search/kibana.nix
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ let

in {
options.services.kibana = {
enable = mkEnableOption "enable kibana service";
enable = mkEnableOption "kibana service";

listenAddress = mkOption {
description = "Kibana listening host";
2 changes: 1 addition & 1 deletion nixos/modules/services/search/solr.nix
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ in
{
options = {
services.solr = {
enable = mkEnableOption "Enables the solr service.";
enable = mkEnableOption "Solr";

# default to the 8.x series not forcing major version upgrade of those on the 7.x series
package = mkOption {
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/desktop-managers/gnome3.nix
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ in {
debug = mkEnableOption "gnome-session debug messages";

flashback = {
enableMetacity = mkEnableOption "Enable the standard GNOME Flashback session with Metacity.";
enableMetacity = mkEnableOption "the standard GNOME Flashback session with Metacity";

customSessions = mkOption {
type = types.listOf (types.submodule {
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/display-managers/xpra.nix
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ in
description = "Authentication to use when connecting to xpra";
};

pulseaudio = mkEnableOption "pulseaudio audio streaming.";
pulseaudio = mkEnableOption "pulseaudio audio streaming";

extraOptions = mkOption {
description = "Extra xpra options";
2 changes: 1 addition & 1 deletion nixos/modules/tasks/filesystems/btrfs.nix
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ in
# One could also do regular btrfs balances, but that shouldn't be necessary
# during normal usage and as long as the filesystems aren't filled near capacity
services.btrfs.autoScrub = {
enable = mkEnableOption "Enable regular btrfs scrub";
enable = mkEnableOption "regular btrfs scrub";

fileSystems = mkOption {
type = types.listOf types.path;