diff options
| author | EuAndreh <eu@euandre.org> | 2021-02-09 15:24:07 -0300 |
|---|---|---|
| committer | EuAndreh <eu@euandre.org> | 2021-02-09 15:24:07 -0300 |
| commit | cfa02f442875918f20ed31209f17ab453c79f297 (patch) | |
| tree | 1effe6552870ff2971e61c92a6847a7d4d1fb8de | |
| parent | fake-symlinks: Add stub aux/assert-perltidy.sh (diff) | |
| download | dotfiles-cfa02f442875918f20ed31209f17ab453c79f297.tar.gz dotfiles-cfa02f442875918f20ed31209f17ab453c79f297.tar.xz | |
Update files under aux/
| -rwxr-xr-x | aux/assert-nixfmt.sh | 16 | ||||
| -rwxr-xr-x | aux/ci/ci-build.sh | 4 | ||||
| -rw-r--r-- | aux/guix/manifest.scm | 3 | ||||
| -rw-r--r-- | aux/guix/pinned-channels.scm | 2 | ||||
| -rwxr-xr-x | aux/guix/with-container.sh | 12 |
5 files changed, 16 insertions, 21 deletions
diff --git a/aux/assert-nixfmt.sh b/aux/assert-nixfmt.sh deleted file mode 100755 index 72d4a8af..00000000 --- a/aux/assert-nixfmt.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -set -eux - -if ! type nixfmt; then - echo 'Missing nixfmt, skipping test' >&2 - exit 0 -fi - -# shellcheck disable=2016 -find . -type f -name '*.nix' -print0 | xargs -0 -I{} sh -c ' - nixfmt < "$1" | diff - "$1" || { - echo "The file \"$1\" is unformatted. To fix it, run:" - echo " nixfmt $1" - exit 1 - } -' _ {} \; diff --git a/aux/ci/ci-build.sh b/aux/ci/ci-build.sh index 25c0441d..81ee1fd3 100755 --- a/aux/ci/ci-build.sh +++ b/aux/ci/ci-build.sh @@ -41,8 +41,8 @@ EOF RUNNER='sh -c' fi - if [ -f ./bootstrap ]; then - COMMAND='./bootstrap && ./configure && make clean all check distcheck public' + if [ -f ./configure ]; then + COMMAND='./configure && make clean check public' else COMMAND='make CC=cc clean check public' fi diff --git a/aux/guix/manifest.scm b/aux/guix/manifest.scm index 938927a6..e8c1cd1a 100644 --- a/aux/guix/manifest.scm +++ b/aux/guix/manifest.scm @@ -14,4 +14,5 @@ perl shellcheck pandoc - clang))) + clang + nixfmt))) diff --git a/aux/guix/pinned-channels.scm b/aux/guix/pinned-channels.scm index 67b5a51c..f8269ff1 100644 --- a/aux/guix/pinned-channels.scm +++ b/aux/guix/pinned-channels.scm @@ -3,7 +3,7 @@ (name 'guix) (url "https://git.savannah.gnu.org/git/guix.git") (commit - "d265809b782293eb42dd663b4611ca19dd2bf1b3") + "f2130228ed86fed81806a662ed59aa74ed2398ed") (introduction (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad" diff --git a/aux/guix/with-container.sh b/aux/guix/with-container.sh index db7b121c..6561b2ce 100755 --- a/aux/guix/with-container.sh +++ b/aux/guix/with-container.sh @@ -1,4 +1,14 @@ #!/bin/sh set -eux -guix time-machine -C aux/guix/pinned-channels.scm -- environment --pure -C -m aux/guix/manifest.scm -- sh -c "$@" +if [ -z "${1:-}" ]; then + guix time-machine -C aux/guix/pinned-channels.scm -- \ + environment -m aux/guix/manifest.scm +elif [ "$1" = '-p' ]; then + guix time-machine -C aux/guix/pinned-channels.scm -- \ + environment --pure -C -m aux/guix/manifest.scm +else + guix time-machine -C aux/guix/pinned-channels.scm -- \ + environment --pure -C -m aux/guix/manifest.scm -- \ + sh -c "$@" +fi |