tribes/guix-tribes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: update installer and tribes source packages

Browse Source
This commit is contained in:
Steffen
2026-04-06 07:31:34 +02:00
parent 6e34b9eb22
commit 70b853cb63
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nbde/system/kexec-installer.scm
View File

@@ -24,6 +24,7 @@
"diffutils" "diffutils"
"findutils" "findutils"
"gawk" "gawk"
"git-minimal"
"grep" "grep"
"gzip" "gzip"
"inetutils" "inetutils"

28
tribes/packages/source.scm
View File

@@ -6,14 +6,18 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages bash)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages commencement) #:use-module (gnu packages commencement)
#:use-module (gnu packages compression)
#:use-module (gnu packages gawk) #:use-module (gnu packages gawk)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages m4) #:use-module (gnu packages m4)
#:use-module (gnu packages node) #:use-module (gnu packages node)
#:use-module (gnu packages nss)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages version-control)
#:use-module ((tribes packages mix) #:prefix mix:) #:use-module ((tribes packages mix) #:prefix mix:)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-13) #:use-module (srfi srfi-13)
@@ -40,13 +44,13 @@
;; in an isolated build environment, with local file dependencies resolved from ;; in an isolated build environment, with local file dependencies resolved from
;; the vendored Mix dependency tree. ;; the vendored Mix dependency tree.
(define %tribes-npm-deps-sha256 (define %tribes-npm-deps-sha256
"1bfzs67ffhwcm0dwdkb1jqnbn3fpgj22zfhd2y907w8daj62gahv") "1my46nw162265y8xh0xxfhbm3hd1d9vj3nkd9s1nrrida66siw91")
(define %tribes-home-page (define %tribes-home-page
"https://git.teralink.net/tribes/tribes.git") "https://git.teralink.net/tribes/tribes.git")
(define %tribes-commit (define %tribes-commit
"1e026a60fdabcec8b9ec0a850a03f903d02496e7") "d90e04b5bd4a2cb59983c743cc37cd8e71d184cd")
(define %tribes-revision "1") (define %tribes-revision "1")
@@ -54,7 +58,7 @@
(git-version "0.2.0" %tribes-revision %tribes-commit)) (git-version "0.2.0" %tribes-revision %tribes-commit))
(define %tribes-source-sha256 (define %tribes-source-sha256
"1lqls1ngy3vpf0hh9jn44h1g9rx1hglj9ik3zi1ywcr4q01pmv68") "0z211ssrpnga7vj6g8j3yvmi1wlv06g8jsjck9vaxw60aml17av1")
(define %tribes-upstream-source (define %tribes-upstream-source
(origin (origin
@@ -210,7 +214,12 @@ with local file dependencies resolved from MIX-FOD-DEPS."
(mkdir-p (getenv "npm_config_cache")) (mkdir-p (getenv "npm_config_cache"))
(with-directory-excursion assets-dir (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) (mkdir-p out)
(copy-recursively (string-append assets-dir "/node_modules") (copy-recursively (string-append assets-dir "/node_modules")
@@ -417,7 +426,16 @@ mix.lock and assets/package-lock.json."
assets-node-modules assets-node-modules
"-type" "f" "-type" "f"
"-path" "*/.bin/*" "-path" "*/.bin/*"
"-exec" "chmod" "+x" "{}" "+")) "-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")) (let ((heroicons-dir "deps/heroicons"))
(when (file-exists? heroicons-dir) (when (file-exists? heroicons-dir)