Merge master into staging-next

2021-05-13 18:32:50 +00:00
parent 7465594428 48c25a9eaf
commit 39e3f7c2cc
46 changed files with 274 additions and 121 deletions
@@ -4,5 +4,5 @@ in
 pkgs.mkShell {
  name = "nixos-manual";

-  buildInputs = with pkgs; [ xmlformat jing xmloscopy ruby ];
+  packages = with pkgs; [ xmlformat jing xmloscopy ruby ];
 }