Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

3 files changed, 3 insertions, 4 deletions

diff --git a/modules/server/bitfolk/default.nix b/modules/server/bitfolk/default.nix
index 461d232e7add..d5b54109fa05 100644
--- a/modules/server/bitfolk/default.nix
+++ b/modules/server/bitfolk/default.nix
@@ -8,7 +8,6 @@
   # Bitfolk provides its own GRUB, so we need to give it a grub.cfg
   # but don't need to actually install GRUB anywhere.
   boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
   boot.loader.grub.device = "nodev";
 
   networking.dhcpcd.enable = false;
diff --git a/modules/server/cgit/default.nix b/modules/server/cgit/default.nix
index 2883a9f55c83..a895fe94e80f 100644
--- a/modules/server/cgit/default.nix
+++ b/modules/server/cgit/default.nix
@@ -5,7 +5,7 @@ let
   inherit (lib) flip foldr groupBy head literalExpression mapAttrs
     mapAttrs' mapAttrsToList mkOption nameValuePair optionalAttrs types;
 
-  cfg = config.services.cgit;
+  cfg = config.services.cgit-qyliss;
 
   instancesByVhost = groupBy ({ value, ... }: value.vhost)
     (mapAttrsToList nameValuePair cfg.instances);
@@ -35,7 +35,7 @@ let
 in
 
 {
-  options.services.cgit = {
+  options.services.cgit-qyliss = {
     instances = mkOption {
       type = types.attrsOf (types.submodule {
         options = {
diff --git a/modules/server/spectrum/cgit/default.nix b/modules/server/spectrum/cgit/default.nix
index 46542564a143..c44700768270 100644
--- a/modules/server/spectrum/cgit/default.nix
+++ b/modules/server/spectrum/cgit/default.nix
@@ -29,7 +29,7 @@ in
 {
   imports = [ ../../cgit ];
 
-  services.cgit.instances.spectrum = {
+  services.cgit-qyliss.instances.spectrum = {
     package = pkgs.cgit-pink;
     vhost = "spectrum-os.org";
     path = "/git";