From ebdb7c8aefc7443615f63ac8281fdea698cb3971 Mon Sep 17 00:00:00 2001
From: Raito Bezarius <masterancpp@gmail.com>
Date: Thu, 14 Nov 2024 18:58:07 +0100
Subject: [PATCH] fix: introduce the newest branch of ofborg

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
---
 flake.lock | 17 +++++++----------
 flake.nix  | 12 ++++++------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9053311..a9c3083 100644
--- a/flake.lock
+++ b/flake.lock
@@ -747,21 +747,18 @@
       }
     },
     "ofborg": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
+      "flake": false,
       "locked": {
-        "lastModified": 1730127422,
-        "narHash": "sha256-mw03zyOQk0YFTWVuMuOMyEgbgOQgLqMIEHiiiGTYwvk=",
-        "ref": "refs/heads/main",
-        "rev": "829b4d2c458c1eaab932c1dcd62aa5873c68e208",
-        "revCount": 1450,
+        "lastModified": 1731607448,
+        "narHash": "sha256-Ia/Qn8kCe60pTOsRDbCPdUpkqkp3IyD+BZw11PQCWVk=",
+        "ref": "refs/heads/vcs-generalization",
+        "rev": "705adbb8e4c215724b9a33ca3cdecf6db10107cc",
+        "revCount": 1465,
         "type": "git",
         "url": "https://git.lix.systems/the-distro/ofborg.git"
       },
       "original": {
+        "ref": "refs/heads/vcs-generalization",
         "type": "git",
         "url": "https://git.lix.systems/the-distro/ofborg.git"
       }
diff --git a/flake.nix b/flake.nix
index 7c5ab12..bad2325 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,8 +19,8 @@
     nix-gerrit.url = "git+https://git.lix.systems/the-distro/nix-gerrit.git?ref=refs/heads/bump-minor-3_10";
     nix-gerrit.inputs.nixpkgs.follows = "nixpkgs";
 
-    ofborg.url = "git+https://git.lix.systems/the-distro/ofborg.git";
-    ofborg.inputs.nixpkgs.follows = "nixpkgs";
+    ofborg.url = "git+https://git.lix.systems/the-distro/ofborg.git?ref=refs/heads/vcs-generalization";
+    ofborg.flake = false;
 
     gerrit-dashboard.url = "git+https://git.lix.systems/the-distro/gerrit-monitoring.git";
     gerrit-dashboard.flake = false;
@@ -45,7 +45,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, terranix, colmena, ... } @ inputs:
+  outputs = { self, nixpkgs, terranix, colmena, ofborg, ... } @ inputs:
   let
     supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
     forEachSystem = f: builtins.listToAttrs (map (system: {
@@ -61,9 +61,9 @@
           inputs.lix.overlays.default
           inputs.nix-gerrit.overlays.default
           inputs.channel-scripts.overlays.default
-          (super: self: {
-            inherit (inputs.ofborg.packages.${system}) ofborg;
-          })
+          (import inputs.ofborg {
+            pkgs = import nixpkgs { localSystem = system; };
+          }).overlay
           (import "${inputs.stateless-uptime-kuma}/overlay.nix")
         ];
       };