From b5d412a5bad25f861f18d5c37984fd49ac33e204 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Sat, 5 Oct 2024 21:22:43 +0200
Subject: [PATCH] feat: adopt new version of Buildbot with incoming ref data

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
 flake.lock                    | 12 ++++++------
 flake.nix                     |  2 +-
 services/buildbot/default.nix |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index edc5110..ca0ceb3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -87,16 +87,16 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1722939563,
-        "narHash": "sha256-lMe8aXgF550iQLRaoU+yn8yYQ4x2qiyqANgsFyjfWwA=",
-        "ref": "refs/heads/non-flakes",
-        "rev": "4a162a8aa5dad6cecdb33bd8534e67e0bdaeb13f",
-        "revCount": 295,
+        "lastModified": 1728162115,
+        "narHash": "sha256-O95Nv81XlYZjltq009951gwYHGo+Kjt9EBhh/6cYGDw=",
+        "ref": "refs/heads/forkos",
+        "rev": "ed8f940717724af853efcafcd82cf4d10f32ede5",
+        "revCount": 298,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/buildbot-nix.git"
       },
       "original": {
-        "ref": "refs/heads/non-flakes",
+        "ref": "refs/heads/forkos",
         "type": "git",
         "url": "https://git.lix.systems/lix-project/buildbot-nix.git"
       }
diff --git a/flake.nix b/flake.nix
index a3e8bd3..80b33c9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,7 +22,7 @@
     gerrit-dashboard.url = "git+https://git.lix.systems/the-distro/gerrit-monitoring.git";
     gerrit-dashboard.flake = false;
 
-    buildbot-nix.url = "git+https://git.lix.systems/lix-project/buildbot-nix.git?ref=refs/heads/non-flakes";
+    buildbot-nix.url = "git+https://git.lix.systems/lix-project/buildbot-nix.git?ref=refs/heads/forkos";
     buildbot-nix.inputs.nixpkgs.follows = "nixpkgs";
 
     channel-scripts.url = "git+https://git.lix.systems/the-distro/channel-scripts.git";
diff --git a/services/buildbot/default.nix b/services/buildbot/default.nix
index 4cd482e..2adb1ab 100644
--- a/services/buildbot/default.nix
+++ b/services/buildbot/default.nix
@@ -84,6 +84,7 @@ in
         resourceEndpoint = "https://identity.lix.systems";
         authUri = "https://identity.lix.systems/realms/lix-project/protocol/openid-connect/auth";
         tokenUri = "https://identity.lix.systems/realms/lix-project/protocol/openid-connect/token";
+        userinfoUri = "https://identity.lix.systems/realms/lix-project/protocol/openid-connect/userinfo";
       };
 
       # TODO(raito): this is not really necessary, we never have remote buildbot workers.