Merge pull request #16 from lamdera/fix-nixos-compilation

Fix compilation on NixOS

Author: supermario

Diff for: addSanity.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -ex
 
 # $(replace_in_file pattern file)

Diff for: 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 for: 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 for: distribution/common.sh

@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export version="1.2.1"

Diff for: ext-package-cache/testCompress.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -ex
 
 # tar cf - . | zip backup -

Diff for: 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 for: package/linux/build-in-docker.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -euo pipefail
 

Diff for: removeSanity.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -ex
 
 if [ "$OS" != 'Darwin' ]; then

Diff for: 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