Merge remote-tracking branch 'lassul.us/master'

7 files changed, 24 insertions, 16 deletions

diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix
index 70307a96b..a20878487 100644
--- a/krebs/1systems/hotdog/config.nix
+++ b/krebs/1systems/hotdog/config.nix
@@ -21,7 +21,6 @@
   ];
 
   krebs.build.host = config.krebs.hosts.hotdog;
-  krebs.github-hosts-sync.enable = true;
   krebs.pages.enable = true;
 
   boot.isContainer = true;
diff --git a/krebs/2configs/buildbot-stockholm.nix b/krebs/2configs/buildbot-stockholm.nix
index 9fc6a79e5..f0b6c324d 100644
--- a/krebs/2configs/buildbot-stockholm.nix
+++ b/krebs/2configs/buildbot-stockholm.nix
@@ -21,21 +21,21 @@
       disko.urls = [
         "http://cgit.gum.r/disko"
         "http://cgit.ni.r/disko"
-        "http://cgit.prism.r/disko"
+        "http://cgit.orange.r/disko"
       ];
       krops.urls = [
         "http://cgit.ni.r/krops"
-        "http://cgit.prism.r/krops"
+        "http://cgit.orange.r/krops"
         "https://github.com/krebs/krops.git"
       ];
       nix_writers.urls = [
         "http://cgit.ni.r/nix-writers"
-        "http://cgit.prism.r/nix-writers"
+        "http://cgit.orange.r/nix-writers"
       ];
       stockholm.urls = [
         "http://cgit.gum.r/stockholm"
         "http://cgit.ni.r/stockholm"
-        "http://cgit.prism.r/stockholm"
+        "http://cgit.orange.r/stockholm"
       ];
     };
   };
diff --git a/krebs/3modules/exim-smarthost.nix b/krebs/3modules/exim-smarthost.nix
index b3cf212e4..62f15027a 100644
--- a/krebs/3modules/exim-smarthost.nix
+++ b/krebs/3modules/exim-smarthost.nix
@@ -39,6 +39,11 @@ let
       default = [];
     };
 
+    extraRouters = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+    };
+
     internet-aliases = mkOption {
       type = types.listOf (types.submodule ({
         options = {
@@ -50,6 +55,7 @@ let
           };
         };
       }));
+      default = [];
     };
 
     local_domains = mkOption {
@@ -104,6 +110,7 @@ let
           };
         };
       }));
+      default = [];
     };
   };
 
@@ -254,6 +261,8 @@ let
           transport = home_maildir
           cannot_route_message = Unknown user
 
+        ${lib.optionalString (cfg.extraRouters != null) cfg.extraRouters}
+
         begin transports
 
         retiolum_smtp:
diff --git a/krebs/3modules/github/known-hosts.nix b/krebs/3modules/github/known-hosts.nix
index c0d0b588a..3725ff2b8 100644
--- a/krebs/3modules/github/known-hosts.nix
+++ b/krebs/3modules/github/known-hosts.nix
@@ -6,6 +6,6 @@
       # update known-hosts.json using ./update
       lib.importJSON ./known-hosts.json
     ;
-    publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==";
+    publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=";
   };
 }
diff --git a/krebs/5pkgs/haskell/brockman/default.nix b/krebs/5pkgs/haskell/brockman/default.nix
index 6a0c7f9df..a902b5fb1 100644
--- a/krebs/5pkgs/haskell/brockman/default.nix
+++ b/krebs/5pkgs/haskell/brockman/default.nix
@@ -7,12 +7,12 @@
 }:
 mkDerivation rec {
   pname = "brockman";
-  version = "4.0.4";
+  version = "5.1.1";
   src = fetchFromGitHub {
     owner = "kmein";
     repo = "brockman";
     rev = version;
-    sha256 = "sha256-GOEEUjehFgMMf6cNpi0AP/Rz74sTDEcpKRbLD+6YEz0=";
+    sha256 = "sha256-5/2Xjh6YqV3+kkQr8CiXay9Dd8IAnL8D4dc8afnlki4=";
   };
   isLibrary = false;
   isExecutable = true;
diff --git a/krebs/nixpkgs-unstable.json b/krebs/nixpkgs-unstable.json
index 96c23d47c..885672736 100644
--- a/krebs/nixpkgs-unstable.json
+++ b/krebs/nixpkgs-unstable.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "2caf4ef5005ecc68141ecb4aac271079f7371c44",
-  "date": "2023-01-30T22:55:03+01:00",
-  "path": "/nix/store/mkif1y61ndjfi6fl2hzm7gmgqn40rchn-nixpkgs",
-  "sha256": "1f8d0v4q687r4z3qpg54asglgi3v07ac75hzxzxl0qxjyh0asdz3",
+  "rev": "19cf008bb18e47b6e3b4e16e32a9a4bdd4b45f7e",
+  "date": "2023-03-21T23:16:58+01:00",
+  "path": "/nix/store/rg3f6v4f7mba0kqnhiarj7yg6066cc5v-nixpkgs",
+  "sha256": "0myq7fnykna5qazbk6hdgahy148yd7f5l8nrxhzllj67y86a5sxw",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json
index 20b1237dc..118415785 100644
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "0218941ea68b4c625533bead7bbb94ccce52dceb",
-  "date": "2023-01-31T16:39:44+08:00",
-  "path": "/nix/store/82grl4czg5pgacsa93nqssf5m7qrmmna-nixpkgs",
-  "sha256": "0vwszpqs1x9sgnabvj3413mvcrj7k2ix4wv4hfvw6nmp6k4z6ic1",
+  "rev": "e2c97799da5f5cd87adfa5017fba971771e123ef",
+  "date": "2023-03-20T14:29:52+01:00",
+  "path": "/nix/store/vxca9w313d1bzw9dx4yaw8c0vrqjxa0p-nixpkgs",
+  "sha256": "0qff1r8k0m19z1ppzb8gk5xrnlvabjdl3pqwpc3y5bm15qxzk25s",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,