diff options
| author | EuAndreh <eu@euandre.org> | 2021-01-25 17:52:27 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2021-01-25 18:02:31 -0300 |
| commit | f5d86927b3c3332fbb50babf0afa5d497293937f (patch) | |
| tree | fb913690c0055614661b779a4af39f2aef187d54 /build-aux | |
| parent | Remove files related to Guix channel (diff) | |
| download | remembering-f5d86927b3c3332fbb50babf0afa5d497293937f.tar.gz remembering-f5d86927b3c3332fbb50babf0afa5d497293937f.tar.xz | |
Move other Guix files under build-aux/guix/
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/ci/ci-build.sh | 4 | ||||
| -rw-r--r-- | build-aux/guix/manifest.scm | 15 | ||||
| -rw-r--r-- | build-aux/guix/pinned-channels.scm | 11 | ||||
| -rwxr-xr-x | build-aux/guix/with-container.sh | 4 | ||||
| -rwxr-xr-x | build-aux/with-container.sh | 4 |
5 files changed, 32 insertions, 6 deletions
diff --git a/build-aux/ci/ci-build.sh b/build-aux/ci/ci-build.sh index b7a4c38..0b792df 100755 --- a/build-aux/ci/ci-build.sh +++ b/build-aux/ci/ci-build.sh @@ -35,8 +35,8 @@ EOF git config --global user.email git@euandre.org git config --global user.name 'EuAndreh CI' - if [ -f build-aux/with-container.sh ]; then - RUNNER='./build-aux/with-container.sh' + if [ -f build-aux/guix/with-container.sh ]; then + RUNNER='./build-aux/guix/with-container.sh' else RUNNER='sh -c' fi diff --git a/build-aux/guix/manifest.scm b/build-aux/guix/manifest.scm new file mode 100644 index 0000000..0c8a225 --- /dev/null +++ b/build-aux/guix/manifest.scm @@ -0,0 +1,15 @@ +(specifications->manifest + (map symbol->string + '(coreutils + findutils + diffutils + grep + sed + git + tar + gzip + gawk + make + perl + shellcheck + pandoc))) diff --git a/build-aux/guix/pinned-channels.scm b/build-aux/guix/pinned-channels.scm new file mode 100644 index 0000000..67b5a51 --- /dev/null +++ b/build-aux/guix/pinned-channels.scm @@ -0,0 +1,11 @@ +(list + (channel + (name 'guix) + (url "https://git.savannah.gnu.org/git/guix.git") + (commit + "d265809b782293eb42dd663b4611ca19dd2bf1b3") + (introduction + (make-channel-introduction + "9edb3f66fd807b096b48283debdcddccfea34bad" + (openpgp-fingerprint + "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA"))))) diff --git a/build-aux/guix/with-container.sh b/build-aux/guix/with-container.sh new file mode 100755 index 0000000..5969d38 --- /dev/null +++ b/build-aux/guix/with-container.sh @@ -0,0 +1,4 @@ +#!/bin/sh +set -eux + +guix time-machine -C build-aux/guix/pinned-channels.scm -- environment --pure -C -m build-aux/guix/manifest.scm -- sh -c "$@" diff --git a/build-aux/with-container.sh b/build-aux/with-container.sh deleted file mode 100755 index 5544d8e..0000000 --- a/build-aux/with-container.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -set -eux - -guix time-machine -C guix/pinned-channels.scm -- environment --pure -C -m guix/manifest.scm -- sh -c "$@" |