From 25031d3d69de0c07ca537a1c8c4b042554d30a2e Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Wed, 3 Dec 2025 22:20:25 +0000
Subject: [PATCH] fix update-nur-combined action for non-github/non-gitlab
 repos (#1035)

these were failing with `error: hash mismatch in fixed-output derivation`
messages, because `fetchgit` wasn't actually being passed any sha256.

see for example this run:
<https://github.com/nix-community/nur-combined/actions/runs/19902521411/job/57050064087#step:7:753>

fixes update for at least the following NUR repos:
- Pupyrinth (https://git.gliroid.com/Pupyrinth/nur-packages)
- alanpearce (https://git.alanpearce.eu/nix-packages)
- colinsane (https://git.uninsane.org/colin/nix-files)
- shelvacu (https://git.uninsane.org/shelvacu/nix-stuff)
- wolfangaukang (https://codeberg.org/wolfangaukang/nix-agordoj.git)
---
 lib/repoSource.nix | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/lib/repoSource.nix b/lib/repoSource.nix
index da3520554..d2ffb30ef 100644
--- a/lib/repoSource.nix
+++ b/lib/repoSource.nix
@@ -45,16 +45,18 @@ else if (lib.hasPrefix "https://gitlab.com" attr.url || type == "gitlab") && !su
     inherit (revision) sha256;
   }
 else
-  fetchgit {
-    inherit (attr) url;
-    inherit (revision) rev;
-  }
-  // (
-    if fetchgit == builtins.fetchGit or null then
-      { inherit submodules; }
-    else
-      {
-        inherit (revision) sha256;
-        fetchSubmodules = submodules;
-      }
+  fetchgit (
+    {
+      inherit (attr) url;
+      inherit (revision) rev;
+    }
+    // (
+      if fetchgit == builtins.fetchGit or null then
+        { inherit submodules; }
+      else
+        {
+          inherit (revision) sha256;
+          fetchSubmodules = submodules;
+        }
+    )
   )