Skip to content

Commit 32156aa

Browse files
committed
Make nonguix repo generic to any base distro.
1 parent 524f09c commit 32156aa

File tree

3 files changed

+12
-15
lines changed

3 files changed

+12
-15
lines changed

channels/channels.scm

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,4 @@
2828
"f0d4daa13f0b57f5c03af73d449b2c6dd3160d08" ; Tue May 26 22:30:51 2020 +0200
2929
(openpgp-fingerprint
3030
"BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC")))) ; git verify-commit <commit-hash>
31-
32-
(channel
33-
(name 'nonguix)
34-
(url "https://gitlab.com/nonguix/nonguix.git")
35-
(branch "master")
36-
(commit "e0951349603581895e0ba61f0e7410368ea1902a") ; Sun Sep 11 20:03:39 2022 -0400
37-
(introduction
38-
(make-channel-introduction
39-
"89f0dca2eb8472359deab18f10f7ba0aed3b31bb" ; Sun Sep 28 20:10:32 2025 -0400
40-
(openpgp-fingerprint
41-
"A420 7B56 C255 109F 2CB3 157E 4990 97AE 5EA8 15D9")))) ; git verify-commit <commit-hash>
4231
)

scripts/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,20 @@ if [ "$1" == "debug" ]; then
4444
fi
4545

4646
# Build
47-
guix build metacall metacall-python-port --fallback -L /metacall/source
47+
guix build metacall metacall-python-port --fallback -L /metacall/nonguix -L /metacall/source
4848

4949
# Install
5050
echo 'metacall' >> /metacall/source/metacall.scm
5151
guix package --fallback --no-grafts -f /metacall/source/metacall.scm | tee build.log
5252

5353
# Lint
54-
guix lint -L /metacall/source metacall || true
54+
guix lint -L /metacall/nonguix -L /metacall/source metacall || true
5555

5656
# Pack
5757
guix pack --no-grafts \
5858
-S /gnu/bin=bin -S /gnu/etc=etc -S /gnu/lib=lib -S /gnu/include=include -S /gnu/share=share \
5959
-RR metacall metacall-python-port nss-certs \
60-
-L /metacall/source | tee build.log
60+
-L /metacall/nonguix -L /metacall/source | tee build.log
6161

6262
# Copy
6363
mv `grep 'tarball-pack.tar.gz$' build.log` /metacall/pack/tarball.tar.gz

scripts/deps.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,17 @@ set -euxo pipefail
2323

2424
export GUILE_WARN_DEPRECATED='detailed'
2525

26+
# Clone nonguix (fix nonguix version)
27+
guix shell git -- sh -c ' \
28+
rm -rf /metacall/nonguix \
29+
&& git clone https://gitlab.com/nonguix/nonguix /metacall/nonguix \
30+
&& cd /metacall/nonguix \
31+
&& git checkout e0951349603581895e0ba61f0e7410368ea1902a \
32+
'
33+
2634
# Build
2735
guix build --fallback \
2836
nss-certs \
2937
`# dotnet codeanalysis-csharp codeanalysis-common codeanalysis-analyzers` \
3038
espree typescript \
31-
-L /metacall/source
39+
-L /metacall/nonguix -L /metacall/source

0 commit comments

Comments
 (0)