Alyssa Ross 8ba23e138d Merge remote-tracking branch 'nixpkgs/staging-next' into staging ... Conflicts: pkgs/development/libraries/zlib/default.nix pkgs/development/lua-modules/overrides.nix		2022-04-02 16:45:48 +00:00
..
config	Merge pull request #162996 from alyssais/resolvconf-disable	2022-03-27 12:25:14 +02:00
hardware	Merge remote-tracking branch 'upstream/master'	2022-03-21 11:32:36 -04:00
i18n/input-method
installer	installer/cd-dvd/iso-image: add syslinuxTheme config option	2022-03-25 21:37:20 +01:00
misc	findutils: move {locate,updatedb} to a separate $locate output	2022-03-26 21:55:19 +02:00
profiles
programs	nixos/_1password: cleanup	2022-03-30 08:23:27 -07:00
security	Merge pull request #156858: nixos/polkit: don't enable by default	2022-03-05 14:48:35 +01:00
services	Merge remote-tracking branch 'nixpkgs/staging-next' into staging	2022-04-02 16:45:48 +00:00
system	Merge master into staging-next	2022-04-02 00:02:09 +00:00
tasks	nixos/nix-gc, nixos/auto-upgrade: Minor documentation fixes.	2022-03-31 00:24:25 -04:00
testing
virtualisation	nixos/podman: Add zfs to wrapper if enabled	2022-04-02 06:38:16 +10:00
module-list.nix	nixos/sslmate-agent: add to module-list	2022-04-01 07:23:45 -06:00
rename.nix	Remove F-PROT package and service module (EoL) (#160372)	2022-03-02 21:51:47 +02:00