Dmitry Kalinkin 219590673c

Merge branch 'staging-next' into staging ...

Conflicts:
	pkgs/development/python-modules/panel/default.nix
	pkgs/os-specific/linux/kernel/generic.nix
	pkgs/servers/home-assistant/default.nix

2021-04-08 22:42:26 -04:00

..

config

Merge branch 'master' into staging-next

2021-04-06 16:01:14 +02:00

hardware

Merge #117519: nixos/amdgpu: remove

2021-04-07 20:25:55 +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-next' into staging

2021-04-08 22:42:26 -04: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 branch 'staging-next' into staging

2021-04-08 22:42:26 -04:00

module-list.nix

Merge pull request #91318 from stephank/pkg-doh-proxy-rust

2021-04-08 22:32:12 +02:00

rename.nix

nixos/hidepid: drop the module as the hidepid mount option is broken

2021-02-21 13:51:37 +01:00