Alyssa Ross 4e1852096f Merge remote-tracking branch 'nixpkgs/staging-next' into staging ... Conflicts: pkgs/development/tools/parsing/flex/2.6.1.nix		2021-11-14 14:17:46 +00:00
..
config	nixos/swap: add randomEncryption.allowDiscards option	2021-11-08 18:17:00 +03:00
hardware	Merge pull request #139354 from colemickens/nvidia	2021-11-04 23:09:38 -07:00
i18n/input-method
installer	nix-fallback-paths.nix: Update to 2.4	2021-11-09 10:47:10 -08:00
misc	kippo: cleanup the corresponding broken module.	2021-10-08 14:10:49 +08:00
profiles
programs	nixos/neovim: fix withRuby, add with{Python3,NodeJs}	2021-11-07 19:40:07 +01:00
security	Merge master into staging-next	2021-11-09 00:01:30 +00:00
services	Merge pull request #138125 from juselius/unified-cgroup-fix	2021-11-13 21:21:28 +01:00
system	Merge staging-next into staging	2021-11-10 00:02:09 +00:00
tasks	nixos/zfs: replace parentheses with braces	2021-11-03 04:59:46 -04:00
testing
virtualisation	Merge pull request #145394 from Artturin/removedeprecated1	2021-11-13 03:19:16 +02:00
module-list.nix	Merge branch 'master' into mjolnir-init	2021-11-12 20:56:14 -05:00
rename.nix	Merge pull request #140820 from VergeDX/kippo-remove	2021-10-11 17:19:11 +08:00