1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-19 17:39:34 +00:00
Commit graph

19035 commits

Author SHA1 Message Date
Taeer Bar-Yam 0e590c91d2 etc module: make .text and .source the same priority
Before this change, one could set environment.etc.*.text and .source.
.source would always take precedence, regardless of the priorities set.
This change means that if, for instance, .text is set with mkForce but
.source is set normally, the .text content will be the one to take
effect. If they are set with the same priority they will conflict.
2021-11-14 18:47:09 -05:00
Andreas Fuchs 8a37d710fd nixos: zsh: Remove hack for zsh-nix-completions on nix 2.4
The zsh-nix-completions package now sets a priority, which helps avoid
conflicts with newer nix versions without patching the package from
the module.
2021-11-14 22:09:01 +01:00
Alyssa Ross 42adeef9ec
nixos/qemu-guest-agent: use qemu_kvm
Since e791519f0f ("nixos/qemu-vm: use qemu_kvm"), VMs generated with
nixos-rebuild build-vm use the qemu_kvm package instead of the qemu
package.  (The difference between them is that qemu_kvm is only built
with support for the host architecture, not all architectures.)

But with this change, nixos-rebuild build-vm would now depend on
_both_ QEMUs, because the guest agent module was still using the one
from the full QEMU package.  There's no need for it to use this
instead of the lighter qemu_kvm, because the guest agent shouldn't be
affected by which platforms QEMU can emulate.
2021-11-14 20:28:06 +00:00
Maciej Krüger dc19eaec1b
Merge pull request #144965 from mkg20001/ts-firewall 2021-11-14 21:23:55 +01:00
github-actions[bot] 9b5a105856
Merge master into staging-next 2021-11-14 00:01:47 +00:00
Sandro 95382df163
Merge pull request #138125 from juselius/unified-cgroup-fix 2021-11-13 21:21:28 +01:00
Artturin 17c61e9772 nixos/swap: remove fallocate and use dd as the main swap creation method
https://github.com/NixOS/nixpkgs/issues/144572
https://github.com/NixOS/nixpkgs/issues/91986

nixos/swap: remove expansion if else because the file is already
recreated if file size is not the same as the configured size

nixos/swap: remove old fixme
2021-11-13 17:49:42 +02:00
sternenseemann 1a1e32f023 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts were caused by 2043dbb6fa
interacting with b2767b69dd.
2021-11-13 12:35:55 +01:00
Graham Christensen 87ef832e49 nixos: mjolnir: literalExample -> literalExpression 2021-11-12 21:06:17 -05:00
Graham Christensen fd1f8e1498
Merge branch 'master' into mjolnir-init 2021-11-12 20:56:14 -05:00
Sandro 312a3af375
Merge pull request #145257 from astro/openwebrx 2021-11-13 02:43:01 +01:00
Artturi 76439257f4
Merge pull request #145394 from Artturin/removedeprecated1 2021-11-13 03:19:16 +02:00
github-actions[bot] c0c7fbda14
Merge master into staging-next 2021-11-13 00:01:45 +00:00
Artturi 4e61e1242c
Merge pull request #144933 from Artturin/ananicyinit
ananicy: init at unstable-2021-11-05
2021-11-12 21:08:14 +02:00
github-actions[bot] 699560194d
Merge master into staging-next 2021-11-12 18:01:08 +00:00
Sandro 6aa376ea9b
Merge pull request #138336 from shdpl/release-21.05 2021-11-12 18:43:15 +01:00
Sandro fee23ab3f1
Merge pull request #84154 from eadwu/clight/location-assertion 2021-11-12 18:09:40 +01:00
Mariusz `shd` Gliwiński 8e3d255347
[nixos/lightdm] allow for background option to be either path or color 2021-11-12 17:31:13 +01:00
Travis Athougies 82037871bb
nixos/postfix: Use better types for submissionOptions and submissionsOptions (#138205) 2021-11-12 17:28:39 +01:00
github-actions[bot] f2d7271432
Merge master into staging-next 2021-11-11 18:01:13 +00:00
Maximilian Bosch dbe1a4804d
Merge pull request #145192 from happysalada/plausible_add_release_cookie
plausible: add remote connection with iex
2021-11-11 18:24:10 +01:00
Sandro d3f2137f5c
Merge pull request #144250 from aanderse/nixos/zabbixWeb 2021-11-11 15:21:09 +01:00
Artturin 8743e81cd3 nixos/ananicy: init 2021-11-11 02:05:42 +02:00
github-actions[bot] b199af176d
Merge master into staging-next 2021-11-11 00:01:45 +00:00
Astro f1020d20fa nixos/openwebrx: init 2021-11-10 23:42:18 +01:00
Artturin 0686311257 nixos/lxc-container: remove deprecated literalExample 2021-11-10 23:55:13 +02:00
Sandro 93a0ff08d8
Merge pull request #141551 from astro/collectd-plugin-config 2021-11-10 20:11:24 +01:00
github-actions[bot] 259e08cd22
Merge master into staging-next 2021-11-10 18:01:21 +00:00
Robert Hensing 6c690b07f7
Merge pull request #144788 from hercules-ci/double-default-qemu-diskSize
virtualisation/qemu-vm: Double the default diskSize
2021-11-10 17:47:29 +01:00
github-actions[bot] 84d856a651
Merge master into staging-next 2021-11-10 12:01:22 +00:00
xaverdh 03a257e5a3
treewide: quote urls according to rfc 0045 (#145260)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-11-10 11:37:56 +01:00
github-actions[bot] 6e4d2d1f10
Merge master into staging-next 2021-11-10 00:01:31 +00:00
Sandro e5ac2e1a52
Merge pull request #122452 from ju1m/tor 2021-11-09 21:50:57 +01:00
Christian Kögler 33ffba995d
NixOS: Document impurity issues with boot.binfmt.emulatedSystems (#142778)
* NixOS: Document impurity issues with boot.binfmt.emulatedSystems

* Update nixos/modules/system/boot/binfmt.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

* Update nixos/modules/system/boot/binfmt.nix

Co-authored-by: Moritz Hedtke <13287984+mohe2015@users.noreply.github.com>

* Update nixos/modules/system/boot/binfmt.nix

Co-authored-by: Moritz Hedtke <13287984+mohe2015@users.noreply.github.com>

* Update nixos/modules/system/boot/binfmt.nix

Co-authored-by: markuskowa <markus.kowalewski@gmail.com>

* Apply suggestions from code review

Co-authored-by: markuskowa <markus.kowalewski@gmail.com>

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Moritz Hedtke <13287984+mohe2015@users.noreply.github.com>
Co-authored-by: markuskowa <markus.kowalewski@gmail.com>
2021-11-09 21:49:45 +01:00
Sandro Jäckel c819ee9b67
nixos/tinc: disable chroot by default 2021-11-09 21:30:18 +01:00
Eelco Dolstra 58a9cca8cd
nix-fallback-paths.nix: Update to 2.4 2021-11-09 10:47:10 -08:00
github-actions[bot] 7414a16ee5
Merge master into staging-next 2021-11-09 18:01:23 +00:00
Pascal Bach 9abd378c7e nixos/antennas: initial service 2021-11-09 17:00:06 +01:00
Maciej Krüger 11f1d8620a
nixos/matomo: delete tmp folder to fix borked upgrades 2021-11-09 15:14:31 +01:00
Maciej Krüger 769f20e20a
nixos/matomo: allow changing hostname easily 2021-11-09 15:10:01 +01:00
happysalada aff0f5792b plausible: add remote connection with iex 2021-11-09 08:15:53 -05:00
github-actions[bot] 707b006bf7
Merge master into staging-next 2021-11-09 00:01:30 +00:00
Maximilian Bosch 25e6a0ad62
Merge pull request #143345 from happysalada/update_plausible
plausible: 1.3.0 -> 1.4.0
2021-11-08 23:48:53 +01:00
sternenseemann d14ae62671 nixos/terminfo: inherit TERMINFO* env vars also for doas
This should mirror the behavior we implement for sudo: The TERMINFO and
TERMINFO_DIRS variables are inherited from the normal user's
environment, so terminfo files installed in the user's profile can be
found by ncurses applications running as root.
2021-11-08 14:05:24 -08:00
github-actions[bot] f14d7cb2f6
Merge master into staging-next 2021-11-08 18:01:24 +00:00
Sandro 1d30bfc9f1
Merge pull request #145050 from bb2020/swap 2021-11-08 17:28:39 +01:00
Astro 19fc2904f3 nixos/collectd: give plugins option a mergeable type 2021-11-08 17:09:56 +01:00
bb2020 8a3a429da6 nixos/swap: add randomEncryption.allowDiscards option 2021-11-08 18:17:00 +03:00
Bas van Dijk 8cd0da0015
Merge pull request #144984 from basvandijk/prometheus-rm-option-environmentFile
nixos/prometheus: remove services.prometheus.environmentFile
2021-11-08 15:37:29 +01:00
John Ericson 4f81865aa1 Merge remote-tracking branch 'upstream/master' into staging-next 2021-11-07 20:51:04 +00:00
Bas van Dijk 7f7780daa5 nixos/prometheus: throw a helpful error when services.prometheus.environmentFile is defined 2021-11-07 19:04:24 +00:00
Thiago Kenji Okada b142bd35d5 nixos/neovim: fix withRuby, add with{Python3,NodeJs}
`withRuby` was declared but not referenced before, this commit fixes
this issue.

It also adds support for `withPython3` and `withNodeJs`.
2021-11-07 19:40:07 +01:00
github-actions[bot] 14f1b9f2ac
Merge master into staging-next 2021-11-07 18:01:14 +00:00
illustris 8d197bffd8
nixos/proxmox-image: init (#144013)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-11-07 16:02:54 +01:00
Bas van Dijk 0e4abb0df7 nixos/prometheus: remove services.prometheus.environmentFile
The option `services.prometheus.environmentFile` has been removed since it was causing [issues](https://github.com/NixOS/nixpkgs/issues/126083) and Prometheus now has native support for secret files.
2021-11-07 14:45:40 +00:00
Bas van Dijk dd1edacb7b
Merge pull request #142654 from yrd/prometheus-config-modules
nixos/prometheus: add new configuration options
2021-11-07 15:37:12 +01:00
github-actions[bot] e0cac44f90
Merge master into staging-next 2021-11-07 12:01:18 +00:00
Izorkin d1a8806e39 nixos/mastodon: allow '@resources' filter to mastodon-web service 2021-11-07 11:59:36 +01:00
Magicloud 40c83d1e0a
virtualbox: Add option to build vboxwebsrv tool
`vboxwebsrv`, a.k.a, Virtualbox Web Service, provides a way to manage VMs via SOAP interface. This is very useful on headless servers.
2021-11-07 08:34:47 +01:00
Maciej Krüger dd4a34019a
nixos/teamspeak: add openFirewall, openFirewallServerQuery
Also set default address to v6 as v6-any always enables v4-any, not always other way
2021-11-07 08:18:18 +01:00
Maciej Krüger 83c93c8e1c
Merge pull request #141076 from CajuM/waydroid-module 2021-11-07 08:14:45 +01:00
github-actions[bot] 9166210176
Merge master into staging-next 2021-11-07 00:01:38 +00:00
Victor Freire 46180e407e nixos/xmrig: init 2021-11-06 15:04:14 -03:00
github-actions[bot] eeb7e66e97
Merge master into staging-next 2021-11-06 18:01:01 +00:00
Aaron Andersen ecb6c3515f
Merge pull request #133006 from nberlee/pam-mk-homedir-umask
nixos/pam: pam_mkhomedir umask to 0077
2021-11-06 12:17:42 -04:00
Aaron Andersen a97d32da9c
Merge pull request #144895 from arcnmx/ddclient-privs
nixos/ddclient: password permission fixes
2021-11-06 12:17:01 -04:00
arcnmx cdd385510a nixos/ddclient: customizable package option 2021-11-06 08:50:39 -07:00
arcnmx 7deb5247a5 nixos/ddclient: fix privs when loading password 2021-11-06 08:50:39 -07:00
Izorkin a71576b07b nixos/mastodon/streaming: add '@memlock' SystemCallFilter 2021-11-06 16:45:20 +01:00
Izorkin 91e510ae22 nixos/mastodon: add '@ipc' SystemCallFilter 2021-11-06 16:45:20 +01:00
Izorkin 700ea62f54 nixos/mastodon: remove duplicates SystemCallFilters 2021-11-06 16:45:20 +01:00
Izorkin 943f15d4b7 nixos/mastodon: add new sandboxing options 2021-11-06 16:45:20 +01:00
Nico Berlee 90bac670c0 nixos/pam: pam_mkhomedir umask to 0077
pam_mkhomedir should create homedirs with the same umask as the rest
of the system. Currently it creates homedirs with go+rx which makes
it readable for other non-privileged users.
2021-11-06 17:45:00 +02:00
Thomas Tuegel a506f9c797
Merge pull request #143673 from oxalica/fix/sddm-default-session
plasma5: set default session to plasma X11 and fix sddm
2021-11-06 09:55:47 -05:00
happysalada 9c71958cfa plausible: use loadcredentials
plausible: service fixes, remove console attempt

plausible: fix yarn.nix call
2021-11-06 09:15:19 -04:00
github-actions[bot] 89ec09c858
Merge master into staging-next 2021-11-06 12:01:12 +00:00
Martin Weinelt 65be52ba2a
Merge pull request #144201 from misuzu/iptables-switch-fix 2021-11-06 12:28:51 +01:00
Jörg Thalheim 185aeb4ab8
Merge pull request #142765 from pennae/mosquitto-fixes
nixos/mosquitto: restore checkPasswords=false from old module, add module doc chapter
2021-11-06 10:08:43 +00:00
Mihai-Drosi Câju 7e76b12d57
nixos/waydroid: init 2021-11-06 08:57:57 +01:00
Robert Hensing 4ec119009b virtualisation/qemu-vm: Double the default diskSize
The default has been unchanged for a decade. Space is cheaper and
software catches up with that. Let's not make our testing harder
than necessary by default.
2021-11-05 21:06:08 +01:00
github-actions[bot] 2663e5b623
Merge master into staging-next 2021-11-05 12:01:17 +00:00
ajs124 ce21576c61
Merge pull request #142408 from mschwaig/fix-vmware-guest-headless
nixos/vmware-guest: fix headless option
2021-11-05 12:33:37 +01:00
Pascal Bach 0f60c45e9c nixos/unifi: refactor mountpoints
Use service internal bind mounts instead of global ones.

This also moves the logs to /var/log/unifi on the host
and the run directory to /run/unifi.

Closes #61424
2021-11-05 12:20:40 +01:00
Yannik Rödel 7d34d32b3d nixos/prometheus: add remaining service discovery options 2021-11-05 12:18:13 +01:00
Bernardo Meurer 1403ce522d
Merge pull request #144239 from illustris/hadoop
nixos/hadoop: Add HA services and HTTPFS
2021-11-04 23:30:47 -07:00
Cole Mickens fd6e9350d0
Merge pull request #139354 from colemickens/nvidia
nvidia: fix egl-wayland loading
2021-11-04 23:09:38 -07:00
github-actions[bot] ac4cb43546
Merge staging-next into staging 2021-11-05 00:02:01 +00:00
github-actions[bot] 20bee66ec8
Merge staging-next into staging 2021-11-04 18:01:44 +00:00
Bernardo Meurer a13bfe7fbc
roon-server: 1.8-831 -> 1.8-846 2021-11-04 09:40:19 -07:00
Yannik Rödel b3d4f6d841 nixos/prometheus: add service discovery options 2021-11-04 15:07:18 +00:00
Yannik Rödel 904d29e1c4 nixos/prometheus: add new configuration options 2021-11-04 15:02:00 +00:00
Maciej Krüger f37f1b2d01
Merge pull request #130388 from oxalica/fix/etc-nixos-tag-in-activation 2021-11-04 15:26:17 +01:00
Bas van Dijk 0140e239f3
Merge pull request #143147 from basvandijk/prometheus-reload
nixos/prometheus: optionally support reloading on config changes
2021-11-04 13:54:18 +01:00
github-actions[bot] cca97be2f0
Merge staging-next into staging 2021-11-04 12:01:39 +00:00
Robert Hensing 3bccce68d1
Merge pull request #144440 from SuperSandro2000/lib-fromJSON
treewide: switch ``builtins.fromJSON(builtins.readFile ./file.json)``…
2021-11-04 12:17:40 +01:00
Bas van Dijk f12e976ade module/prometheus: optionally support reloading on config changes
The new option `services.prometheus.enableReload` has been introduced
which, when enabled, causes the prometheus systemd service to reload
when its config file changes.

More specifically the following property holds: switching to a
configuration (`switch-to-configuration`) that changes the prometheus
configuration only finishes successully when prometheus has finished
loading the new configuration.

`enableReload` is `false` by default in which case the old semantics
of restarting the prometheus systemd service are in effect.
2021-11-04 11:15:21 +00:00
github-actions[bot] 524db8975e
Merge staging-next into staging 2021-11-04 06:02:01 +00:00
illustris 57225575df nixos/hadoop: fix errors in HTTPFS 2021-11-04 11:26:32 +05:30
illustris 8331b56701 nixos/hadoop: correct openFirewall options 2021-11-04 11:18:11 +05:30
illustris c8df915e0e nixos/hadoop: add links for config files 2021-11-04 11:07:32 +05:30