Vladimír Čunát d2eb7a7887 Merge branch 'staging' into staging-next ... A few conflicts but relatively clear ones (I think).		2021-04-14 10:08:25 +02:00
..
config	Merge branch 'master' into staging-next	2021-04-06 16:01:14 +02:00
hardware	Merge pull request #117551 from TredwellGit/nixos/rtl-sdr	2021-04-12 20:23:04 +02:00
i18n/input-method	fcitx5: update doc	2021-01-24 02:10:23 +01:00
installer	treewide: use perl.withPackages when possible	2021-03-31 21:35:37 +02:00
misc	nixos/misc/ids: reclaim uid for disnix	2021-03-28 21:40:44 +02:00
profiles	nixos/hidepid: drop the module as the hidepid mount option is broken	2021-02-21 13:51:37 +01:00
programs	Merge branch 'master' into staging-next	2021-04-06 16:01:14 +02:00
security	Merge pull request #116369 from m1cr0man/master	2021-03-23 21:31:42 +01:00
services	Merge branch 'staging' into staging-next	2021-04-14 10:08:25 +02:00
system	Merge master into staging-next	2021-04-08 18:14:17 +00:00
tasks	treewide: fix eval without aliases after 9378fdf87e0626e8c63a90a378c38444ff54808b	2021-04-08 13:33:09 +02:00
testing	treewide: use perl.withPackages when possible	2021-03-31 21:35:37 +02:00
virtualisation	Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging	2021-04-12 18:49:01 +00:00
module-list.nix	Merge pull request #115590 from grahamc/iscsi	2021-04-13 13:19:34 -04:00
rename.nix	nixos/hidepid: drop the module as the hidepid mount option is broken	2021-02-21 13:51:37 +01:00