diff --git a/addSanity.sh b/addSanity.sh index 5a0c38063..3a359c91d 100755 --- a/addSanity.sh +++ b/addSanity.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -ex # $(replace_in_file pattern file) diff --git a/build.sh b/build.sh index b4857e76a..2bc426cb9 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail PKG_ENV_FILE="_build/shake-package-env-$(ghc --numeric-version)" diff --git a/distribution/build-linux-arm64-musl.sh b/distribution/build-linux-arm64-musl.sh index 3e37fb289..a25297e39 100755 --- a/distribution/build-linux-arm64-musl.sh +++ b/distribution/build-linux-arm64-musl.sh @@ -103,7 +103,7 @@ declare -f build_binary_docker # docker -H ssh://root@lamdera-falkenstein-arm64-1 run \ # -v /root/compiler:/root/compiler \ # -it registry.gitlab.b-data.ch/ghc/ghc4pandoc:9.2.7 \ -# /bin/bash +# /usr/bin/env bash mkdir -p $dist diff --git a/distribution/common.sh b/distribution/common.sh index f003ff72f..5ae76783c 100644 --- a/distribution/common.sh +++ b/distribution/common.sh @@ -1,3 +1,3 @@ -#!/bin/bash +#!/usr/bin/env bash export version="1.2.1" diff --git a/ext-package-cache/testCompress.sh b/ext-package-cache/testCompress.sh index 8d0ad0c57..a215dded1 100755 --- a/ext-package-cache/testCompress.sh +++ b/ext-package-cache/testCompress.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -ex # tar cf - . | zip backup - diff --git a/extra/npm/publish-all.sh b/extra/npm/publish-all.sh index 9b0e7cae7..8547e2070 100755 --- a/extra/npm/publish-all.sh +++ b/extra/npm/publish-all.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -ex # The publish will fail if the package name and version combination already exists in the specified registry. diff --git a/package/linux/build-in-docker.sh b/package/linux/build-in-docker.sh index d3e2804f1..bf6a44bb3 100755 --- a/package/linux/build-in-docker.sh +++ b/package/linux/build-in-docker.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail diff --git a/removeSanity.sh b/removeSanity.sh index b7089588c..9fb45def4 100755 --- a/removeSanity.sh +++ b/removeSanity.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -ex if [ "$OS" != 'Darwin' ]; then diff --git a/stack.yaml b/stack.yaml index 044900a2d..362e61225 100644 --- a/stack.yaml +++ b/stack.yaml @@ -47,3 +47,8 @@ packages: # https://discourse.haskell.org/t/announce-ghcup-0-1-15-rc2-windows-pre-release/2616/14 # however it seems stack automatically includes a bunch of paths, don't think this helped? # - C:\ghcup\msys64\mingw64\include + +nix: + packages: + - pkg-config + - zlib