about summary refs log tree commit diff
path: root/nixos/modules
AgeCommit message (Collapse)AuthorFilesLines
2021-03-15Merge master into staging-nextgithub-actions[bot]1-0/+10
2021-03-14Merge pull request #116084 from jonringer/bump-factorioSarah Brofeldt1-0/+10
factorio: 1.1.26 -> 1.1.27
2021-03-14Merge master into staging-nextgithub-actions[bot]1-1/+1
2021-03-14Merge pull request #116303 from samuelgrf/printing-related-refactorsSandro1-1/+1
2021-03-14Merge branch 'master' into staging-nextMartin Weinelt2-3/+3
2021-03-14nixos/printing: simplify filterGutenprint functionSamuel Gräfenstein1-1/+1
2021-03-14doc: Port stdenv/multiple-output to MarkdownJan Tojnar1-1/+1
2021-03-14doc: Port stdenv/meta to MarkdownJan Tojnar1-2/+2
2021-03-13Merge branch 'master' into staging-nextJan Tojnar3-5/+58
Reverted https://github.com/NixOS/nixpkgs/pull/115228 for kodi to avoid conflict. It does not look like unzip would be used but not investigating now to speed up merge conflict resolution.
2021-03-13nixos/prometheus/exporters: fix eval if only `openFirewall = true;` is setMaximilian Bosch1-1/+1
If `openFirewall = true`, but no `firewallFilter` is set, the evaluation fails with the following error: The option `services.prometheus.exporters.node.firewallFilter` is defined both null and not null, in `/home/ma27/Projects/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix' and `/home/ma27/Projects/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix'. Originally introduced by me in #115185. The problem is that `mkOptionDefault` has - as its name suggests - the same priority as the default-value of the option `firewallFilter` and thus it conflicts if this declaration and the actual default value are set which is the case if `firewallFilter` isn't specified somewhere else.
2021-03-13nixos/mautrix-telegram: substitute secrets in config file at runtime (#112966)Milan1-4/+16
In the latest release of mautrix-telegram not all secrets can be set using environment variables (see https://github.com/tulir/mautrix-telegram/issues/584). This change allows these secret values to be set without ending up in the Nix store.
2021-03-13Merge pull request #116037 from petabyteboy/feature/jitsi-exporterWilliButz2-0/+41
prometheus-jitsi-exporter: init at 0.2.18
2021-03-13Merge master into staging-nextgithub-actions[bot]3-7/+106
2021-03-12Merge pull request #111030 from cript0nauta/miniflux-sudoAaron Andersen1-7/+17
nixos/miniflux: don't depend on sudo
2021-03-12Merge pull request #93629 from ju1m/crocAaron Andersen2-0/+89
nixos/croc: init
2021-03-12nixos/factorio: add nonBlockingSaving optionJonathan Ringer1-0/+10
2021-03-12nixos/prometheus-jitsi-exporter: initMilan Pässler2-0/+41
2021-03-11Merge master into staging-nextgithub-actions[bot]4-8/+145
2021-03-11Merge pull request #113370 from chkno/prometheus-systemd-exporter-no-flagsWilliButz2-0/+19
prometheus-systemd-exporter: Init at 0.4.0
2021-03-11Merge pull request #115185 from Ma27/knot-exporterWilliButz2-8/+66
prometheus-knot-exporter: init at 2021-01-30; minor module improvements
2021-03-11Merge pull request #111364 from lbpdt/feature/prometheus-artifactory-exporterWilliButz2-0/+60
nixos/prometheus-exporters/artifactory: init at 1.9.0
2021-03-11Merge master into staging-nextgithub-actions[bot]2-4/+15
2021-03-11Merge pull request #115372 from BBBSnowball/pr-add-config-nextcloud-imagickMaximilian Bosch1-1/+13
nixos/nextcloud: Conditionally enable ImageMagick PHP extension
2021-03-11nixos/privoxy: make certificate-directory optionalrnhmjoj1-3/+2
The tmpfiles.d rule should only be added if inspectHttps is enabled.
2021-03-11Merge master into staging-nextgithub-actions[bot]1-14/+9
2021-03-10Merge pull request #98446 from srhb/fix-kafkaSarah Brofeldt1-14/+9
apache-kafka: Fix, update and adjust JRE/JVM
2021-03-10Merge master into staging-nextgithub-actions[bot]3-0/+59
2021-03-10Merge pull request #113620 from imlonghao/borgmaticLéo Gaspard2-0/+58
borgmatic: init at 1.5.12
2021-03-10nixos.spotifyd: fixed file not found errorCabia Rangris1-0/+1
When using password_cmd, there's a 'file not found' error due to missing sh binary in path. For some reason, adding `path = [ "/bin" ]` doesn't fix the issue, but setting `SHELL` does. Related documentation: https://spotifyd.github.io/spotifyd/config/File.html#shell-used-to-run-commands-indicated-by-password_cmd-or-on_song_changed_hook----omit-in-toc---
2021-03-10nixos/apache-kafka: Use version-matched jreSarah Brofeldt1-1/+8
2021-03-10nixos/apache-kafka: Drop default jvmOptionsSarah Brofeldt1-13/+1
2021-03-10Merge master into staging-nextgithub-actions[bot]2-4/+25
2021-03-09Merge pull request #112689 from iblech/patch-whitebophir180Sandro1-1/+8
2021-03-09nixos/privoxy: document repeated settingsrnhmjoj1-3/+17
2021-03-09Merge master into staging-nextgithub-actions[bot]2-84/+214
2021-03-09nixos/privoxy: set temporary directoryrnhmjoj1-0/+2
This is needed for working external filters, otherwise privoxy will fail without a clear error message.
2021-03-09nixos/privoxy: add https and settings optionsrnhmjoj1-80/+209
This is a major rewrite of the Privoxy module: - As per RFC0042, remove privoxy.extraConfig and replace it with a privoxy.settings option, which maps a NixOS freeform submodule to the Privoxy configuration format. - Move all top-level options that mirrored a setting to the real ones in privoxy.settings. This still keeps the type-checking, default values and examples in places. - Add two convenience options: userActions and userFilters, which simplify the operation of creating a file with pkgs.writeText, converting it to a string and adding it to the actionsfile/ filterfile list. - Add a privoxy.inspectHttps option to automagically setup TLS decryption support. I don't know how long have been waiting for this feature: can't believe it has just happened. - Also add a privoxy.certsLifetime to control the periodical cleanup of the temporary certificates generate by Privoxy.
2021-03-09Merge pull request #111551 from xaverdh/xserver-modern-driversMichele Guerini Rocco1-4/+3
nixos/xserver: use modern video drivers
2021-03-09Merge master into staging-nextgithub-actions[bot]1-21/+1
2021-03-09nixos/nextcloud: Rename option to services.nextcloud.disableImagemagickBenjamin Koch1-5/+5
... as was suggested in the related issue
2021-03-08Merge pull request #90065 from wizeman/u/fix-config-mergeLinus Heckemann1-21/+1
linux: make sure all config options have the same value
2021-03-08Merge staging into staging-nextFrederik Rietdijk3-5/+5
2021-03-08Merge pull request #112125 from dotlambda/alertaRobert Schütz1-2/+2
alerta: move to all-packages.nix and use buildPythonApplication
2021-03-08nixos/croc: initJulien Moutinho2-0/+89
2021-03-08nixos/nextcloud: Conditionally enable ImageMagick PHP extensionBenjamin Koch1-1/+13
2021-03-07Merge pull request #114383 from ↵Maximilian Bosch1-1/+1
Anderssorby/acs/fix-minetest-port-option-coercion nixos/minetest-server: Fix port coercion
2021-03-07Merge pull request #112332 from urbas/amazon-init-optionsLassulus1-12/+29
virtualization/amazon-init: enable option
2021-03-07linux: make sure all config options have the same valueRicardo M. Correia1-21/+1
Currently, kernel config options whose value is "yes" always override options whose value is "no". This is not always desired. Generally speaking, if someone defines an option to have the value "no", presumably they are disabling the option for a reason, so it's not always OK to silently enable it due to another, probably unrelated reason. For example, a user may want to reduce the kernel attack surface and therefore may want to disable features that are being enabled in common-config.nix. In fact, common-config.nix was already silently enabling options that were intended to be disabled in hardened/config.nix for security reasons, such as INET_DIAG. By eliminating the custom merge function, these config options will now use the default module option merge functions which make sure that all options with the highest priority have the same value. A user that wishes to override an option defined in common-config.nix can currently use mkForce or mkOverride to do so, e.g.: BINFMT_MISC = mkForce (option no); That said, this is not going to be necessary in the future, because the plan is for kernel config options defined in nixpkgs to use a lower priority by default, like it currently happens for other module options.
2021-03-07Merge pull request #113714 from ilian/steam-firewallLassulus1-1/+31
nixos/steam: Add port forwarding options
2021-03-07Merge staging-next into staginggithub-actions[bot]11-388/+439