Merge branch 'staging-next' into staging

2021-05-14 01:40:09 +02:00
parent 882b692c4f 39e3f7c2cc
commit ac6a4f7cf5
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 ];
 }