Alyssa Ross 1a60dd2adc Merge remote-tracking branch 'nixpkgs/staging-next' into staging ... Conflicts: pkgs/development/python-modules/cupy/default.nix pkgs/development/python-modules/staticjinja/default.nix		2022-01-24 15:39:34 +00:00
..
config	Merge #143715: nixos/malloc: fix scudo on aarch64-linux	2022-01-18 17:39:33 +01:00
hardware	Merge pull request #154550 from veehaitch/sgx-compat-udev	2022-01-13 14:55:08 +00:00
i18n/input-method	nixos/documentation: split options doc build	2022-01-02 19:46:13 +01:00
installer	Merge pull request #153409 from tpwrules/fix-nonx86-iso-reproducibility	2022-01-23 21:15:26 -05:00
misc	nixos/locate Add support for plocate (#156185)	2022-01-24 00:36:51 +01:00
profiles	all-hardware: Add virtio_mmio module	2022-01-06 17:23:10 -08:00
programs	Merge pull request #151902 from primeos/sway	2022-01-23 21:46:19 +01:00
security	Merge master into staging-next	2022-01-12 12:01:06 +00:00
services	Merge remote-tracking branch 'nixpkgs/staging-next' into staging	2022-01-24 15:39:34 +00:00
system	Merge master into staging-next	2022-01-23 18:01:11 +00:00
tasks	nixos/networkd: fix networking.networkd.static test	2022-01-21 19:35:17 +01:00
testing	nixos/lib/qemu-flags: rename to qemu-common	2021-09-18 16:58:16 +02:00
virtualisation	nixos/container-config: Only use true as fallback	2022-01-20 23:10:13 +01:00
module-list.nix	nixos/invoiceplane: init module and package at 1.5.11 (#146909)	2022-01-20 22:45:35 +09:00
rename.nix	mailpile, nixos/mailpile: drop	2022-01-16 02:36:20 +01:00