6 files changed, 8 insertions, 8 deletions
diff --git a/modules/common/networking.nix b/modules/common/networking.nix
index 9829672..38ae467 100644
--- a/modules/common/networking.nix
+++ b/modules/common/networking.nix
@@ -32,8 +32,8 @@
         PrivateNetwork = true;
         ExecStart = "${pkgs.writers.writeDash "netns-up" ''
           ${pkgs.iproute2}/bin/ip netns add $1
-          ${pkgs.utillinux}/bin/umount /var/run/netns/$1
-          ${pkgs.utillinux}/bin/mount --bind /proc/self/ns/net /var/run/netns/$1
+          ${pkgs.util-linux}/bin/umount /var/run/netns/$1
+          ${pkgs.util-linux}/bin/mount --bind /proc/self/ns/net /var/run/netns/$1
         ''} %I";
         ExecStop = "${pkgs.iproute2}/bin/ip netns del %I";
         PrivateMounts = false;
diff --git a/modules/garage/default.nix b/modules/garage/default.nix
index 56a38c2..4395299 100644
--- a/modules/garage/default.nix
+++ b/modules/garage/default.nix
@@ -10,7 +10,7 @@ with self.lib.nginx;
 {
   services.garage = {
     enable = true;
-    package = pkgs.garage_2_0_0;
+    package = pkgs.garage_2;
     settings = {
       replication_factor = 3;
       consistency_mode = "consistent";
diff --git a/modules/hetzner/default.nix b/modules/hetzner/default.nix
index af44deb..ffef1ca 100644
--- a/modules/hetzner/default.nix
+++ b/modules/hetzner/default.nix
@@ -8,4 +8,5 @@
   boot.loader.grub.device = "/dev/sda";
 
   fileSystems."/" = { device = "/dev/sda1"; fsType = "ext4"; };
+  fileSystems."/boot" = { device = "/dev/sda15"; fsType = "vfat"; };
 }
diff --git a/modules/mailserver/default.nix b/modules/mailserver/default.nix
index 30e4506..3d0360e 100644
--- a/modules/mailserver/default.nix
+++ b/modules/mailserver/default.nix
@@ -2,13 +2,12 @@
   config,
   lib,
   pkgs,
-  nixpkgs-unstable,
   ...
 }:
 
 {
-  disabledModules = [ "services/mail/stalwart-mail.nix" ];
-  imports = [ "${nixpkgs-unstable}/nixos/modules/services/mail/stalwart-mail.nix" ];
+  # disabledModules = [ "services/mail/stalwart-mail.nix" ];
+  # imports = [ "${nixpkgs-unstable}/nixos/modules/services/mail/stalwart-mail.nix" ];
 
   services.stalwart-mail = {
     enable = true;
diff --git a/modules/matrix/pkgs/node-env.nix b/modules/matrix/pkgs/node-env.nix
index bc1e366..38f3e35 100644
--- a/modules/matrix/pkgs/node-env.nix
+++ b/modules/matrix/pkgs/node-env.nix
@@ -4,7 +4,7 @@
 
 let
   # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
-  utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
+  utillinux = pkgs.util-linux;
 
   python = if nodejs ? python then nodejs.python else python2;
 
diff --git a/modules/powerdns/default.nix b/modules/powerdns/default.nix
index ae2f31e..b2f6993 100644
--- a/modules/powerdns/default.nix
+++ b/modules/powerdns/default.nix
@@ -60,7 +60,7 @@ in
   };
 
   config = {
-    environment.systemPackages = [ pkgs.powerdns ];
+    environment.systemPackages = [ pkgs.pdns ];
     services.powerdns = {
       enable = true;
       extraConfig =