Jonathan Ringer 5cd5b9b97f Merge remote-tracking branch 'origin/master' into staging-next ...

Conflicts:
 pkgs/development/tools/kubie/default.nix

2021-05-21 10:39:34 -07:00

..

config

Merge pull request #101071 from ju1m/apparmor

2021-04-24 11:24:26 +00:00

hardware

Merge pull request #119706 from nyanotech/master

2021-04-24 03:49:09 +02:00

i18n/input-method

input methods: add kime

2021-04-19 03:05:07 +09:00

installer

nix: 2.3.10 -> 2.3.11

2021-05-14 12:24:54 +00:00

misc

nixos/monero: use isSystemUser = true

2021-05-08 02:13:25 +02:00

profiles

Merge pull request #85073 from hyperfekt/systemd-pstore

2021-05-17 00:00:52 +02:00

programs

nixos/noisetorch: init

2021-05-20 14:15:20 -07:00

security

nixos/security/apparmor: utillinux -> util-linux

2021-05-17 17:14:08 +02:00

services

Merge remote-tracking branch 'origin/master' into staging-next

2021-05-21 10:39:34 -07:00

system

nixos/networkd: add missing [DHCPServer] options

2021-05-17 18:30:37 +02:00

tasks

nixos/tasks/filesystems: utillinux -> util-linux

2021-05-17 14:47:57 +02:00

testing

treewide: use perl.withPackages when possible

2021-03-31 21:35:37 +02:00

virtualisation

Merge pull request #110927 from Izorkin/fix-qemu-ga

2021-05-19 05:42:06 +01:00

module-list.nix

nixos/noisetorch: init

2021-05-20 14:15:20 -07:00

rename.nix

quagga: remove

2021-04-22 12:48:48 +02:00