Alyssa Ross d7e181ff83 Merge remote-tracking branch 'nixpkgs/staging-next' into staging ... Conflicts: pkgs/development/compilers/ocaml/4.12.nix pkgs/development/python-modules/oci/default.nix pkgs/tools/admin/bubblewrap/default.nix		2022-03-14 12:33:16 +00:00
..
activation	nixos/switch-to-configuration: fix installBootLoader escaping	2022-03-14 02:12:52 +01:00
boot	Merge remote-tracking branch 'nixpkgs/staging-next' into staging	2022-03-14 12:33:16 +00:00
etc	nixos/etc.nix: Make independent	2022-01-30 09:01:27 +01:00
build.nix	nixos: Make system.build a submodule with freeformType	2022-01-24 00:52:46 +01:00