github-actions[bot]
6ae26bb3c8
Merge staging-next into staging
2022-03-21 18:07:51 +00:00
Googlebot
4007aa201b
Merge remote-tracking branch 'upstream/master'
2022-03-21 11:32:36 -04:00
Will Fancher
52c98fc3e9
nixos: systemd: Split unit types into separate module
2022-03-21 10:25:27 -04:00
Kevin Cox
8ce16fcf62
Merge pull request #163451 from hercules-ci/stop-premature-warnings
...
Stop premature warnings, including `nix.settings` migration
2022-03-21 10:10:40 -04:00
github-actions[bot]
de642acb2e
Merge staging-next into staging
2022-03-21 12:10:50 +00:00
Florian Klink
9427a17ccb
Merge pull request #164016 from bobvanderlinden/pr-refactor-systemd-module
...
nixos: systemd: split module up into multiple files
2022-03-21 13:03:55 +01:00
Bob van der Linden
397b8257a0
nixos: systemd-user: fix additionalUpstreamUserUnits description
...
Co-authored-by: Martin Weinelt <mweinelt@users.noreply.github.com>
2022-03-21 12:30:37 +01:00
Janne Heß
8e60f86840
Merge pull request #164034 from helsinki-systems/clean/stc
...
nixos/switch-to-configuration: Major script cleanup
2022-03-21 12:13:23 +01:00
Vladimír Čunát
a519740b4c
Merge branch 'staging-next' into staging
2022-03-21 11:57:43 +01:00
Florian Klink
0d198e7a52
nixos/nix-daemon: workaround NixOS/nix#6285
...
The Nix-provided `nix-daemon.socket` file has a
> ConditionPathIsReadWrite=/nix/var/nix/daemon-socket/socket
line, to skip that unit if /nix/var/nix/daemon-socket/socket is
read-only (which is the case in some nixos-containers with that folder
bind-ro-mounted from the host).
In these cases, the unit was skipped.
Systemd 250 (rightfully) started to also skip in these cases:
> [ 237.187747] systemd[1]: Nix Daemon Socket was skipped because of a failed condition check (ConditionPathIsReadWrite=/nix/var/nix/daemon-socket).
However, systemd < 250 didn't skip if /nix/var/nix/daemon-socket/socket
didn't /exist at all/, and we were relying on this bug in the case for
fresh NixOS systems, to have /nix/var/nix/daemon-socket/socket created
initially.
Move the creation of that folder to systemd-tmpfiles, by shipping an
appropriate file in `${nixPackage}/lib/tmpfiles.d/nix-daemon.conf`
(NixOS/nix#6285 ).
In the meantime, set a systemd tmpfiles rule manually in NixOS.
This has been tested to still work with read-only bind-mounted
/nix/var/nix/daemon-socket/socket in containers, it'll keep them
read-only ;-)
2022-03-21 11:43:38 +01:00
Jörg Thalheim
a98ea7e6f8
nix-ld: init at 1.0.0 + nixos module
2022-03-21 11:15:32 +01:00
Sandro
3d48fda6f5
Merge pull request #164330 from Luflosi/fix-tor-client-disable
2022-03-20 19:51:30 +01:00
Benjamin Staffin
81b63b6ef6
nixos/oauth2_proxy: add missing oidc providers ( #164632 )
...
- Add adfs and keycloak-oidc providrs
- Sort the list alphabetically
2022-03-20 13:31:43 -04:00
Bob van der Linden
92af44e04d
nixos: systemd: remove unhelpful comments in additionalUpstreamSystemUnits
...
Co-authored-by: Janne Heß <janne@hess.ooo>
2022-03-20 16:14:13 +01:00
Janne Heß
85874efcb0
nixos/switch-to-configuration: Make perlcritic happy
2022-03-20 13:04:23 +01:00
Janne Heß
9c494b5773
nixos/switch-to-configuration: Snake-case all variables
...
Also add a lot of comments and reorder some assignments
2022-03-20 13:03:39 +01:00
Janne Heß
67f84b4b87
nixos/switch-to-configuration: Snake-case all subroutines and add comments
2022-03-20 13:03:19 +01:00
Janne Heß
23ea9965bb
nixos/switch-to-configuration: Enforce consistent quoting
2022-03-20 13:01:11 +01:00
Janne Heß
bdcd558812
nixos/switch-to-configuration: Get rid of all postfixes and unlesses
2022-03-20 13:01:11 +01:00
pennae
5b1fde773a
Merge pull request #163860 from delroth/synapse-rl-fix
...
matrix-synapse: fix release notes and doc for #158605 changes
2022-03-20 08:49:46 +00:00
github-actions[bot]
3df8e35539
Merge staging-next into staging
2022-03-20 00:02:45 +00:00
Martin Weinelt
f4f3622cb1
Merge remote-tracking branch 'origin/staging-next' into staging
2022-03-20 00:00:32 +01:00
Vladimír Čunát
02f6f9c363
Merge #164895 : nixos displayManager.session: drop type
2022-03-19 21:51:08 +01:00
Ninjatrappeur
05417a66e7
Merge pull request #164398 from NinjaTrappeur/nin/pleroma-wrappers
2022-03-19 21:28:40 +01:00
Vladimír Čunát
fd609f9233
nixos services.xserver.displayManager.session: drop type
...
For now at least. I expect someone will find a working type later.
It's incorrect and was causing bad issues. Example test case:
nix-instantiate nixos/release.nix -A tests.xfce.x86_64-linux --dry-run
This is a partial revert of commit b2d803c
from PR #162271 .
2022-03-19 21:11:41 +01:00
Martino Fontana
fb6dbccbfa
joycond: don't use dkms hid-nintendo on kernel 5.16 or newer
...
The module has since been mainlined into the kernel. See #163929 .
2022-03-19 16:38:09 +01:00
Bob van der Linden
6514bb4620
nixos: systemd-user: make additionalUpstreamUserUnits internal
2022-03-19 12:06:56 +01:00
Bob van der Linden
66759cea7d
nixos: systemd-user: expand on additionalUpstreamUserUnits description
2022-03-19 12:06:43 +01:00
Naïm Favier
9160044f5f
treewide/makeWrapper: replace --run cd
with --chdir
...
Lay the groundwork for switching to binary wrappers by reducing uses
of `--run` (which is not supported by `makeBinaryWrapper`).
2022-03-19 09:46:31 +01:00
Artturi
2768178711
Merge pull request #164735 from lopsided98/nixos-enter-cleanup
...
nixos/nixos-enter: fix resolv.conf error handling and cleanup
2022-03-19 03:09:03 +02:00
pennae
e9f17a9f45
nixos/ssh: undeprecate knownHosts.«name».hostNames
...
hostNames being deprecated makes configuring hosts with multiple keys a
pain. including the attr name of the entry in the host name list is a
nice convenience though, so we'll retain it and clarify the
documentation on how the actual host name list for an entry is put
together.
2022-03-19 01:36:59 +01:00
Artturin
611b8c4472
nixos/nixos-generate-config: fix specifying --root /mnt --dir adir
...
it should save to `$PWD/adir` instead of `/mnt/adir`
and --dir adir should save to `$PWD/adir` instead of `/adir`
2022-03-18 23:16:19 +02:00
andr1an
00487b5a87
nixos/nixos-generate-config: resolve abspath to root
2022-03-18 23:16:06 +02:00
Ben Wolsieffer
69cff425e6
nixos/nixos-enter: cleanup resolv.conf handling
2022-03-18 12:19:09 -04:00
Ben Wolsieffer
1ee3d9477b
nixos/nixos-enter: fix resolv.conf error handling
2022-03-18 12:19:02 -04:00
pennae
e8bfc4d4a8
Merge pull request #164367 from jpathy/patch-2
...
networking.greTunnels: support ip6gre*
2022-03-18 15:43:03 +00:00
github-actions[bot]
588298ee0a
Merge staging-next into staging
2022-03-18 12:01:57 +00:00
Artturi
7958394022
Merge pull request #164624 from mart-w/fix/nixos/paperless-ng-fix-164615-consumation-bug
...
nixos/paperless-ng: fix #164615
2022-03-18 13:30:08 +02:00
github-actions[bot]
691557fc47
Merge staging-next into staging
2022-03-18 00:03:09 +00:00
Linus Heckemann
51f78ade78
nixos/jira: set home for jira user
...
Some plugins rely on being able to write to the user's home directory.
2022-03-18 00:01:41 +01:00
Silvan Mosberger
839b9b8ddc
Merge pull request #77622 from R-VdP/nixos-upgrade-reboot-window
...
NixOS/auto-upgrade: offer the possibility to define a reboot window during which the system may be automatically rebooted
2022-03-17 23:50:53 +01:00
Bob van der Linden
753b911708
nixos: systemd-tmpfiles: use cfg shorthand
2022-03-17 23:16:38 +01:00
Bob van der Linden
38d043de9c
nixos: systemd: split off systemd-tmpfiles into separate module
2022-03-17 23:16:37 +01:00
Bob van der Linden
0e665d1815
nixos: systemd-user: allow additional upstream user units
...
Currently it is only possible to add upstream _system_ units. The option
systemd.additionalUpstreamSystemUnits can be used for this.
However, this was not yet possible for systemd.user. In a similar
fashion this was added to systemd-user.nix.
This is intended to have other modules add upstream units.
2022-03-17 23:16:37 +01:00
Bob van der Linden
b6d50528dd
nixos: systemd-user: use cfg shorthand
2022-03-17 23:16:37 +01:00
Bob van der Linden
022b4209a3
nixos: systemd: split off systemd-user into separate module
2022-03-17 23:16:37 +01:00
Bob van der Linden
cae8ef1232
nixos: systemd-coredump: use cfg shorthand
2022-03-17 23:16:30 +01:00
Bob van der Linden
ccfcb78a50
nixos: systemd: split off coredump into separate module
2022-03-17 23:15:49 +01:00
Bob van der Linden
7adc8ecac3
nixos: systemd-journald: use cfg shorthand
2022-03-17 23:13:36 +01:00
Bob van der Linden
fee1e24b3b
nixos: systemd: split off journald into separate module
2022-03-17 23:13:36 +01:00