sternenseemann
d66b8dfa96
Merge remote-tracking branch 'origin/master' into staging-next
2022-03-29 21:40:09 +02:00
Michele Guerini Rocco
18071b3d1a
Merge pull request #166189 from jmbaur/dhcpd6-reserved-addresses
...
nixos/dhcpd6: Use fixed-address6 for dhcpd6 address reservations
2022-03-29 21:34:41 +02:00
Sandro
cda1da9930
Merge pull request #164869 from SuperSamus/joycond
2022-03-29 18:53:49 +02:00
Martin Weinelt
630d5e1d0d
Merge remote-tracking branch 'origin/master' into staging-next
2022-03-29 18:17:36 +02:00
Jared Baur
41e2604483
nixos/dhcpd6: Use fixed-address6 for dhcpd6 address reservations
2022-03-29 07:58:42 -07:00
Thiago Kenji Okada
24f71c6ea5
Merge pull request #161226 from Misterio77/master
...
nixos/factorio: add bind address option
2022-03-29 14:17:01 +01:00
github-actions[bot]
5a9b6a3f1a
Merge master into staging-next
2022-03-29 12:06:05 +00:00
pennae
e7da834115
Merge pull request #164377 from rsynnest/master
...
nixos/unifi-video: add deprecation warning for openFirewall
2022-03-29 12:03:18 +00:00
Frederik Rietdijk
25c014324b
Merge master into staging-next
2022-03-29 13:25:16 +02:00
Sandro
e705e58950
Merge pull request #165788 from WolfangAukang/sslmate-agent
2022-03-29 11:31:40 +02:00
Moritz
9f715a3d31
nixos/grafana: Add foldersFromFilesStructure option for dashboard provisioning ( #132348 )
2022-03-29 10:53:39 +02:00
Linus Heckemann
3631db714c
Merge pull request #158176 from lheckemann/fix-tempaddr
...
network-interfaces: use altered interface name for setting use_tempaddr
2022-03-29 10:39:46 +02:00
Naïm Favier
d113e4e06e
nixos/networkd: add wait-online options
2022-03-29 10:14:26 +02:00
github-actions[bot]
f0248f968f
Merge staging-next into staging
2022-03-29 06:01:53 +00:00
github-actions[bot]
df0f3ba49a
Merge master into staging-next
2022-03-29 06:01:16 +00:00
ajs124
f5054121cb
Merge pull request #165935 from helsinki-systems/feat/move-special-fs-options-into-module
...
nixos/filesystems: Move options into the fs module
2022-03-29 05:03:59 +02:00
Roland Synnestvedt
33b04f2a80
nixos/unifi-video: add deprecation warning for openFirewall
2022-03-28 19:55:50 -07:00
github-actions[bot]
770c1c3d2c
Merge staging-next into staging
2022-03-29 00:02:37 +00:00
github-actions[bot]
80ddf916da
Merge master into staging-next
2022-03-29 00:02:04 +00:00
P. R. d. O
f24ae9654d
nixos/sslmate-agent: init
2022-03-28 17:41:18 -06:00
Anders Kaseorg
5abbb68d16
nixos/gnome: Re-enable VTE shell integration
...
Commit 7addb1c0ec
2022-03-28 16:27:39 -07:00
Martin Weinelt
999f3c2b9d
pdns: rename from powerdns
...
https://github.com/PowerDNS/pdns
https://repology.org/project/pdns/versions
2022-03-28 18:04:19 +02:00
Jan Tojnar
c8a5db3854
Merge branch 'staging-next' into staging
...
; Conflicts:
; pkgs/tools/archivers/rar/default.nix
2022-03-28 17:56:38 +02:00
Jan Tojnar
997bb5e42c
Merge branch 'master' into staging-next
...
; Conflicts:
; pkgs/development/python-modules/dnspython/default.nix
; pkgs/development/python-modules/googleapis-common-protos/default.nix
2022-03-28 17:55:31 +02:00
Sandro
44fe73efbe
Merge pull request #165868 from LibreCybernetics/remove-python2-dependencies-from-gnome
2022-03-28 14:38:17 +02:00
Sandro
2f1e03cb2b
Merge pull request #165691 from lucc/github-removed-unencrypted-git
2022-03-28 12:47:42 +02:00
Roland Synnestvedt
60e62c36df
nixos/unifi-video: clean up indentation and formatting
2022-03-27 13:39:19 -07:00
github-actions[bot]
36198fe197
Merge staging-next into staging
2022-03-27 18:01:40 +00:00
Fabián Heredia Montiel
a3954182ba
nixos/gnome: change telepathy service from default true to default false
2022-03-27 09:24:46 -06:00
Sandro
d7270ac953
Merge pull request #165492 from Artturin/removelocatefromfindutils
2022-03-27 16:59:48 +02:00
Martin Weinelt
d68657af92
Merge remote-tracking branch 'origin/master' into staging-next
2022-03-27 15:54:05 +02:00
Jelle Besseling
afcb2d4145
minecraft-server: correct java options ( #157978 )
2022-03-27 15:09:46 +02:00
Janne Heß
452102db8f
nixos/stage-2-init: Clean up legacy commands
...
We can perform most of the mkdir/ln/rm using systemd-tmpfiles
instead which cleans up the script.
/bin and /home are created by their activation script snippets
usbfs is deprecated and unused.
hwclock seems to be automatically executed by systemd on startup.
The mkswap to prevent hibernation cycles seems to be executed by systemd
as well since the provided regression tests succeeds.
2022-03-27 13:51:02 +02:00
Janne Heß
158a2972eb
nixos/filesystems: Move options into the fs module
...
This was probably forgotten during a refactoring. The module is where
the values of the options are actually used.
2022-03-27 13:23:44 +02:00
Sandro
b9ddfd63b7
Merge pull request #162996 from alyssais/resolvconf-disable
2022-03-27 12:25:14 +02:00
Jörg Thalheim
de698b740b
Merge pull request #156678 from Alexnortung/autorandr-module
...
nixos/autorandr: refactor
2022-03-27 07:46:09 +01:00
github-actions[bot]
ec92b288e2
Merge staging-next into staging
2022-03-27 06:01:57 +00:00
Roland Synnestvedt
95a3f6ad26
nixos/unifi-video: rename openPorts to openFirewall
2022-03-26 17:59:54 -07:00
Roland Synnestvedt
cb1c5dbb15
nixos/unifi-video: convert int to string in default command
2022-03-26 17:53:26 -07:00
Martin Weinelt
7be28200e2
Merge remote-tracking branch 'origin/master' into staging-next
2022-03-27 01:45:13 +01:00
Artturin
c3c0444949
findutils: move {locate,updatedb} to a separate $locate output
...
https://github.com/NixOS/nixpkgs/issues/53925
2022-03-26 21:55:19 +02:00
linj
1e32d28824
nixos/dendrite: always substitute environment variables in config
...
Before this patch, services.dendrite.environmentFile is used for
secrets and environment variable substitution only happens when this
option is used.
systemd-247 provides a mechanism called LoadCredential for secrets and
it is better than environment file. See the section of Environment=
in the manual of systemd.exec for more information.
This patch always substitute environment variables, which enables the
usage of systemd LoadCredential.
2022-03-26 12:54:45 -07:00
github-actions[bot]
77dc421883
Merge staging-next into staging
2022-03-26 18:01:56 +00:00
github-actions[bot]
3b6f03e497
Merge master into staging-next
2022-03-26 18:01:22 +00:00
Janne Heß
a34c788e30
Merge pull request #163230 from helsinki-systems/feat/misc-prometheus-varnis
...
nixos/prometheus/exporters/varnish: improve some defaults
2022-03-26 18:32:30 +01:00
Alexander Nortung
7844c87ab7
Merge branch 'master' into autorandr-module
2022-03-26 14:18:23 +01:00
github-actions[bot]
b2fc63a844
Merge staging-next into staging
2022-03-26 12:02:50 +00:00
github-actions[bot]
811b90f085
Merge master into staging-next
2022-03-26 12:01:14 +00:00
Jan Tojnar
95968e616c
Merge pull request #165231 from K900/the-unplumbening
...
nixos/pipewire: unbreak mixed Pulse/Pipewire setups
2022-03-26 11:42:15 +01:00
Vladimír Čunát
a42ca0678b
Merge branch 'master' into staging-next
2022-03-26 09:20:38 +01:00
