github-actions[bot]
970aea96fa
Merge staging-next into staging
2021-03-13 06:17:38 +00:00
github-actions[bot]
4181409166
Merge master into staging-next
2021-03-13 06:17:31 +00:00
Aaron Andersen
5a24206e17
Merge pull request #111030 from cript0nauta/miniflux-sudo
...
nixos/miniflux: don't depend on sudo
2021-03-12 20:42:09 -05:00
Aaron Andersen
47c5175f0c
Merge pull request #93629 from ju1m/croc
...
nixos/croc: init
2021-03-12 20:34:33 -05:00
Jan Tojnar
9a64ee2b45
Merge branch 'staging-next' into staging
2021-03-13 01:58:15 +01:00
github-actions[bot]
d6257d451b
Merge master into staging-next
2021-03-11 18:23:54 +00:00
WilliButz
f5c01cf9d4
Merge pull request #113370 from chkno/prometheus-systemd-exporter-no-flags
...
prometheus-systemd-exporter: Init at 0.4.0
2021-03-11 19:18:29 +01:00
WilliButz
3ceef8186c
Merge pull request #115185 from Ma27/knot-exporter
...
prometheus-knot-exporter: init at 2021-01-30; minor module improvements
2021-03-11 18:58:59 +01:00
WilliButz
902a479225
Merge pull request #111364 from lbpdt/feature/prometheus-artifactory-exporter
...
nixos/prometheus-exporters/artifactory: init at 1.9.0
2021-03-11 18:44:03 +01:00
github-actions[bot]
b4d5951d9e
Merge master into staging-next
2021-03-11 12:21:28 +00:00
Maximilian Bosch
7ecc3b0684
Merge pull request #115372 from BBBSnowball/pr-add-config-nextcloud-imagick
...
nixos/nextcloud: Conditionally enable ImageMagick PHP extension
2021-03-11 12:45:17 +01:00
rnhmjoj
7962df46fe
nixos/privoxy: make certificate-directory optional
...
The tmpfiles.d rule should only be added if inspectHttps is enabled.
2021-03-11 08:17:50 +01:00
github-actions[bot]
0a8ec23e51
Merge master into staging-next
2021-03-11 00:39:21 +00:00
Sarah Brofeldt
33d6e71133
Merge pull request #98446 from srhb/fix-kafka
...
apache-kafka: Fix, update and adjust JRE/JVM
2021-03-10 20:25:13 +01:00
github-actions[bot]
a3b4d14288
Merge staging-next into staging
2021-03-10 18:23:23 +00:00
github-actions[bot]
6a3a358b0d
Merge master into staging-next
2021-03-10 18:23:15 +00:00
Léo Gaspard
4ee87cfead
Merge pull request #113620 from imlonghao/borgmatic
...
borgmatic: init at 1.5.12
2021-03-10 18:13:04 +01:00
Cabia Rangris
352405c0f6
nixos.spotifyd: fixed file not found error
...
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-10 13:26:10 +01:00
Sarah Brofeldt
fd02940262
nixos/apache-kafka: Use version-matched jre
2021-03-10 08:10:30 +01:00
Sarah Brofeldt
08ef827056
nixos/apache-kafka: Drop default jvmOptions
2021-03-10 08:09:34 +01:00
github-actions[bot]
ae64aaa5c0
Merge staging-next into staging
2021-03-10 00:39:15 +00:00
github-actions[bot]
149a81c88d
Merge master into staging-next
2021-03-10 00:39:07 +00:00
Florian Klink
7db55b3aa5
Merge pull request #115584 from grahamc/systemd-modprobe-service
...
systemd: add the modprobe service
2021-03-09 22:12:25 +01:00
Sandro
7a4d404e0f
Merge pull request #112689 from iblech/patch-whitebophir180
2021-03-09 22:12:24 +01:00
Graham Christensen
0b52c40240
nixos/systemd: bring in modprobe@.service
...
It is broken: it looks for /sbin/modprobe, but it works anyway??
2021-03-09 12:38:54 -05:00
rnhmjoj
df6d7f3142
nixos/privoxy: document repeated settings
2021-03-09 17:59:12 +01:00
github-actions[bot]
5d13702776
Merge master into staging-next
2021-03-09 12:25:54 +00:00
rnhmjoj
8e21a1c51b
nixos/privoxy: set temporary directory
...
This is needed for working external filters, otherwise privoxy will fail
without a clear error message.
2021-03-09 11:02:59 +01:00
rnhmjoj
3673ded392
nixos/privoxy: add https and settings options
...
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-09 11:02:59 +01:00
Michele Guerini Rocco
af6037b338
Merge pull request #111551 from xaverdh/xserver-modern-drivers
...
nixos/xserver: use modern video drivers
2021-03-09 08:14:24 +01:00
github-actions[bot]
3db2dee35f
Merge master into staging-next
2021-03-09 00:39:09 +00:00
Benjamin Koch
6e6f5f0923
nixos/nextcloud: Rename option to services.nextcloud.disableImagemagick
...
... as was suggested in the related issue
2021-03-09 00:38:39 +01:00
Linus Heckemann
c762b1eaab
Merge pull request #90065 from wizeman/u/fix-config-merge
...
linux: make sure all config options have the same value
2021-03-08 21:34:59 +01:00
Frederik Rietdijk
277d488026
Merge staging into staging-next
2021-03-08 19:20:18 +01:00
Robert Schütz
6692b32105
Merge pull request #112125 from dotlambda/alerta
...
alerta: move to all-packages.nix and use buildPythonApplication
2021-03-08 10:09:30 +01:00
Julien Moutinho
be6463cd9d
nixos/croc: init
2021-03-08 01:34:32 +01:00
Benjamin Koch
e30311bc68
nixos/nextcloud: Conditionally enable ImageMagick PHP extension
2021-03-08 01:06:48 +01:00
Maximilian Bosch
bd54f78047
Merge pull request #114383 from Anderssorby/acs/fix-minetest-port-option-coercion
...
nixos/minetest-server: Fix port coercion
2021-03-07 21:37:49 +01:00
Lassulus
ba6d848c40
Merge pull request #112332 from urbas/amazon-init-options
...
virtualization/amazon-init: enable option
2021-03-07 18:39:05 +01:00
Ricardo M. Correia
6feb61233b
linux: make sure all config options have the same value
...
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-07 18:27:14 +01:00
Lassulus
f38b9b258f
Merge pull request #113714 from ilian/steam-firewall
...
nixos/steam: Add port forwarding options
2021-03-07 14:22:16 +01:00
github-actions[bot]
dcea8212b5
Merge staging-next into staging
2021-03-07 12:20:40 +00:00
Jörg Thalheim
413b44590f
Merge pull request #114482 from jansol/pipewire
2021-03-07 09:34:42 +00:00
github-actions[bot]
65cddb74d7
Merge staging-next into staging
2021-03-07 06:17:25 +00:00
Johan Thomsen
7b5c38e973
nixos/kubernetes: docker -> containerd
...
also, nixos/containerd: module init
2021-03-07 12:51:14 +10:00
Yurii Matsiuk
7da62867be
nixos/kubernetes: adapt module and test cases to fit kubernetes v1.20.X as well as coredns v1.7.X
2021-03-07 12:50:39 +10:00
github-actions[bot]
f9d4095295
Merge staging-next into staging
2021-03-07 00:41:13 +00:00
Vincent Haupert
b012891437
nixos/fish: adapt completions patch to fish 3.2.0
2021-03-06 16:26:22 -08:00
Jan Tojnar
1465e8e397
Merge branch 'staging-next' into staging
2021-03-06 19:56:45 +01:00
John Ericson
f5a7d8bb41
Merge pull request #115228 from siraben/unzip-buildInputs
...
treewide: unzip buildInputs to nativeBuildInputs (2)
2021-03-06 13:30:43 -05:00