Alyssa Ross 0d0e7ca769 Merge remote-tracking branch 'nixpkgs/master' into staging-next ... Conflicts: pkgs/top-level/python-packages.nix		2021-04-23 21:18:11 +00:00
..
config	nixos/users-groups: check format of passwd entries	2021-04-22 13:18:38 +00:00
hardware	nixos/teck: init	2021-04-20 09:10:43 +02:00
i18n/input-method	input methods: add kime	2021-04-19 03:05:07 +09:00
installer	configuration template: improve docs on nano	2021-04-21 05:43:50 +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	nixos/programs/fish: add shellAbbrs config	2021-04-14 17:37:14 -07:00
security	Merge pull request #116369 from m1cr0man/master	2021-03-23 21:31:42 +01:00
services	Merge remote-tracking branch 'nixpkgs/master' into staging-next	2021-04-23 21:18:11 +00:00
system	Revert "nixos/systemd: provide libidn2 for systemd-resolved"	2021-04-12 18:37:18 +02:00
tasks	nixos/cpu-freq: fix typo in description	2021-04-21 22:03:18 +02:00
testing	treewide: use perl.withPackages when possible	2021-03-31 21:35:37 +02:00
virtualisation	Merge master into staging-next	2021-04-22 18:14:27 +00:00
module-list.nix	Merge master into staging-next	2021-04-22 18:14:27 +00:00
rename.nix	quagga: remove	2021-04-22 12:48:48 +02:00