From 281266977b79d6242a518e1397780cbcd374be06 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 13 Sep 2021 09:13:38 -0300 Subject: mv aux/guix/ aux/containers/ --- aux/containers/guix/manifest.scm | 26 ++++++++++++++++++++++++++ aux/containers/guix/pinned-channels.scm | 11 +++++++++++ aux/containers/guix/with-container.sh | 11 +++++++++++ aux/guix/manifest.scm | 26 -------------------------- aux/guix/pinned-channels.scm | 11 ----------- aux/guix/with-container.sh | 11 ----------- aux/with-container | 2 +- 7 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 aux/containers/guix/manifest.scm create mode 100644 aux/containers/guix/pinned-channels.scm create mode 100755 aux/containers/guix/with-container.sh delete mode 100644 aux/guix/manifest.scm delete mode 100644 aux/guix/pinned-channels.scm delete mode 100755 aux/guix/with-container.sh diff --git a/aux/containers/guix/manifest.scm b/aux/containers/guix/manifest.scm new file mode 100644 index 0000000..0c24595 --- /dev/null +++ b/aux/containers/guix/manifest.scm @@ -0,0 +1,26 @@ +(specifications->manifest + (map symbol->string + '(bash + coreutils + findutils + diffutils + grep + sed + m4 + git + gawk + make + makefile2graph + graphviz + shellcheck + pandoc + gettext + po4a-text + mdpo-patched + hunspell + hunspell-dict-en-utf8 + hunspell-dict-pt-utf8 + hunspell-dict-fr-utf8 + hunspell-dict-eo-utf8 + + glibc))) diff --git a/aux/containers/guix/pinned-channels.scm b/aux/containers/guix/pinned-channels.scm new file mode 100644 index 0000000..f5c039a --- /dev/null +++ b/aux/containers/guix/pinned-channels.scm @@ -0,0 +1,11 @@ +(cons* + (channel + (name 'xyz-euandreh) + (url "git://euandreh.xyz/package-repository.git") + (branch "main") + (introduction + (make-channel-introduction + "d749e053e6db365069cb9b2ef47a78b06f9e7361" + (openpgp-fingerprint + "5BDA E9B8 B2F6 C6BC BB0D 6CE5 81F9 0EC3 CD35 6060")))) + %default-channels) diff --git a/aux/containers/guix/with-container.sh b/aux/containers/guix/with-container.sh new file mode 100755 index 0000000..1b7c004 --- /dev/null +++ b/aux/containers/guix/with-container.sh @@ -0,0 +1,11 @@ +#!/bin/sh +set -eu + +if [ -z "${1:-}" ]; then + guix time-machine --fallback -C aux/guix/pinned-channels.scm -- \ + environment --fallback -m aux/guix/manifest.scm +else + guix time-machine --fallback -C aux/guix/pinned-channels.scm -- \ + environment --fallback -m aux/guix/manifest.scm --pure -C \ + -- sh -c "$@" +fi diff --git a/aux/guix/manifest.scm b/aux/guix/manifest.scm deleted file mode 100644 index 0c24595..0000000 --- a/aux/guix/manifest.scm +++ /dev/null @@ -1,26 +0,0 @@ -(specifications->manifest - (map symbol->string - '(bash - coreutils - findutils - diffutils - grep - sed - m4 - git - gawk - make - makefile2graph - graphviz - shellcheck - pandoc - gettext - po4a-text - mdpo-patched - hunspell - hunspell-dict-en-utf8 - hunspell-dict-pt-utf8 - hunspell-dict-fr-utf8 - hunspell-dict-eo-utf8 - - glibc))) diff --git a/aux/guix/pinned-channels.scm b/aux/guix/pinned-channels.scm deleted file mode 100644 index f5c039a..0000000 --- a/aux/guix/pinned-channels.scm +++ /dev/null @@ -1,11 +0,0 @@ -(cons* - (channel - (name 'xyz-euandreh) - (url "git://euandreh.xyz/package-repository.git") - (branch "main") - (introduction - (make-channel-introduction - "d749e053e6db365069cb9b2ef47a78b06f9e7361" - (openpgp-fingerprint - "5BDA E9B8 B2F6 C6BC BB0D 6CE5 81F9 0EC3 CD35 6060")))) - %default-channels) diff --git a/aux/guix/with-container.sh b/aux/guix/with-container.sh deleted file mode 100755 index 1b7c004..0000000 --- a/aux/guix/with-container.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -set -eu - -if [ -z "${1:-}" ]; then - guix time-machine --fallback -C aux/guix/pinned-channels.scm -- \ - environment --fallback -m aux/guix/manifest.scm -else - guix time-machine --fallback -C aux/guix/pinned-channels.scm -- \ - environment --fallback -m aux/guix/manifest.scm --pure -C \ - -- sh -c "$@" -fi diff --git a/aux/with-container b/aux/with-container index 7bb5c68..b96cf67 120000 --- a/aux/with-container +++ b/aux/with-container @@ -1 +1 @@ -guix/with-container.sh \ No newline at end of file +containers/guix/with-container.sh \ No newline at end of file -- cgit v1.2.3