aboutsummaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
Diffstat (limited to 'build-aux')
-rwxr-xr-xbuild-aux/ci/ci-build.sh4
-rw-r--r--build-aux/guix/manifest.scm18
-rw-r--r--build-aux/guix/pinned-channels.scm21
-rwxr-xr-xbuild-aux/guix/with-container.sh4
-rwxr-xr-xbuild-aux/with-container.sh4
5 files changed, 45 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..471f7f4
--- /dev/null
+++ b/build-aux/guix/manifest.scm
@@ -0,0 +1,18 @@
+(specifications->manifest
+ (map symbol->string
+ '(bash
+ coreutils
+ findutils
+ diffutils
+ grep
+ sed
+ jq
+ git
+ make
+ shellcheck
+ direnv
+ git-crypt
+ terraform
+ emacs
+ perl
+ pandoc)))
diff --git a/build-aux/guix/pinned-channels.scm b/build-aux/guix/pinned-channels.scm
new file mode 100644
index 0000000..a315ce3
--- /dev/null
+++ b/build-aux/guix/pinned-channels.scm
@@ -0,0 +1,21 @@
+(list
+ (channel
+ (name 'euandreh)
+ (url "git://git.euandreh.xyz/euandreh-guix-channel")
+ (branch "master")
+ (introduction
+ (make-channel-introduction
+ "641f9388002cd874040938ab1c6da7ac9d0e54ca"
+ (openpgp-fingerprint
+ "5BDA E9B8 B2F6 C6BC BB0D 6CE5 81F9 0EC3 CD35 6060"))))
+ (channel
+ (name 'guix)
+ (url "https://git.savannah.gnu.org/git/guix.git")
+ (commit
+ "dc2de508a38d8e0a3f93e8d6ded225d3a7e32548")
+ (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 "$@"