Alyssa Ross 3df6bb2c85 Merge remote-tracking branch 'origin/master' into staging-next ...

Conflicts:
	pkgs/applications/blockchains/polkadot/default.nix

2024-06-09 22:47:12 +01:00

..

0001-Start-device-units-for-uninitialised-encrypted-devic.patch

…

0002-Don-t-try-to-unmount-nix-or-nix-store.patch

…

0003-Fix-NixOS-containers.patch

…

0004-Add-some-NixOS-specific-unit-directories.patch

…

0005-Get-rid-of-a-useless-message-in-user-sessions.patch

…

0006-hostnamed-localed-timedated-disable-methods-that-cha.patch

…

0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch

…

0008-localectl-use-etc-X11-xkb-for-list-x11.patch

…

0009-add-rootprefix-to-lookup-dir-paths.patch

…

0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch

…

0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch

…

0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch

…

0013-inherit-systemd-environment-when-calling-generators.patch

…

0014-core-don-t-taint-on-unmerged-usr.patch

…

0015-tpm2_context_init-fix-driver-name-checking.patch

…

0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch

…

0017-meson.build-do-not-create-systemdstatedir.patch

…

0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch

…

default.nix

Merge remote-tracking branch 'origin/master' into staging-next

2024-06-09 22:47:12 +01:00