Skip to content

Commit

Permalink
Merge pull request #16 from lamdera/fix-nixos-compilation
Browse files Browse the repository at this point in the history
Fix compilation on NixOS
  • Loading branch information
supermario authored Mar 24, 2024
2 parents 478abc9 + c74f696 commit cb9089d
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 8 deletions.
2 changes: 1 addition & 1 deletion addSanity.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
set -ex

# $(replace_in_file pattern file)
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
set -euo pipefail

PKG_ENV_FILE="_build/shake-package-env-$(ghc --numeric-version)"
Expand Down
2 changes: 1 addition & 1 deletion distribution/build-linux-arm64-musl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion distribution/common.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash
#!/usr/bin/env bash

export version="1.2.1"
2 changes: 1 addition & 1 deletion ext-package-cache/testCompress.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
set -ex

# tar cf - . | zip backup -
Expand Down
2 changes: 1 addition & 1 deletion extra/npm/publish-all.sh
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion package/linux/build-in-docker.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

set -euo pipefail

Expand Down
2 changes: 1 addition & 1 deletion removeSanity.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
set -ex

if [ "$OS" != 'Darwin' ]; then
Expand Down
5 changes: 5 additions & 0 deletions stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit cb9089d

Please sign in to comment.