From dd6750b72a9dc7586436282b4ddea37fd3304ad4 Mon Sep 17 00:00:00 2001
From: Steffen Beyer <steffen@beyer.io>
Date: Mon, 6 Apr 2026 07:31:34 +0200
Subject: [PATCH] fix: update installer and tribes source packages

---
 nbde/system/kexec-installer.scm |  1 +
 tribes/packages/source.scm      | 26 ++++++++++++++++++++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/nbde/system/kexec-installer.scm b/nbde/system/kexec-installer.scm
index 9b87934..03b8df6 100644
--- a/nbde/system/kexec-installer.scm
+++ b/nbde/system/kexec-installer.scm
@@ -24,6 +24,7 @@
          "diffutils"
          "findutils"
          "gawk"
+         "git-minimal"
          "grep"
          "gzip"
          "inetutils"
diff --git a/tribes/packages/source.scm b/tribes/packages/source.scm
index 35d078a..022a025 100644
--- a/tribes/packages/source.scm
+++ b/tribes/packages/source.scm
@@ -6,14 +6,18 @@
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages bash)
   #:use-module (gnu packages base)
   #:use-module (gnu packages commencement)
+  #:use-module (gnu packages compression)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages node)
+  #:use-module (gnu packages nss)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages version-control)
   #:use-module ((tribes packages mix) #:prefix mix:)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-13)
@@ -40,13 +44,13 @@
 ;; in an isolated build environment, with local file dependencies resolved from
 ;; the vendored Mix dependency tree.
 (define %tribes-npm-deps-sha256
-  "1bfzs67ffhwcm0dwdkb1jqnbn3fpgj22zfhd2y907w8daj62gahv")
+  "1my46nw162265y8xh0xxfhbm3hd1d9vj3nkd9s1nrrida66siw91")
 
 (define %tribes-home-page
   "https://git.teralink.net/tribes/tribes.git")
 
 (define %tribes-commit
-  "1e026a60fdabcec8b9ec0a850a03f903d02496e7")
+  "d90e04b5bd4a2cb59983c743cc37cd8e71d184cd")
 
 (define %tribes-revision "1")
 
@@ -54,7 +58,7 @@
   (git-version "0.2.0" %tribes-revision %tribes-commit))
 
 (define %tribes-source-sha256
-  "1lqls1ngy3vpf0hh9jn44h1g9rx1hglj9ik3zi1ywcr4q01pmv68")
+  "0z211ssrpnga7vj6g8j3yvmi1wlv06g8jsjck9vaxw60aml17av1")
 
 (define %tribes-upstream-source
   (origin
@@ -210,7 +214,12 @@ with local file dependencies resolved from MIX-FOD-DEPS."
          (mkdir-p (getenv "npm_config_cache"))
 
          (with-directory-excursion assets-dir
-           (invoke "npm" "ci" "--ignore-scripts" "--no-audit" "--no-fund"))
+           (invoke "npm"
+                   "ci"
+                   "--include=dev"
+                   "--ignore-scripts"
+                   "--no-audit"
+                   "--no-fund"))
 
          (mkdir-p out)
          (copy-recursively (string-append assets-dir "/node_modules")
@@ -419,6 +428,15 @@ mix.lock and assets/package-lock.json."
                    "-path" "*/.bin/*"
                    "-exec" "chmod" "+x" "{}" "+"))
 
+         ;; npm-installed CLI launchers assume /usr/bin/env exists, which is not
+         ;; true in the Guix build sandbox.
+         (for-each
+          (lambda (script)
+            (substitute* script
+              (("^#!/usr/bin/env node$")
+               (string-append "#!" #$(file-append node "/bin/node")))))
+          (find-files (string-append assets-node-modules "/.bin")))
+
          (let ((heroicons-dir "deps/heroicons"))
            (when (file-exists? heroicons-dir)
              (delete-file-recursively heroicons-dir))