Skip to content

Commit 38ef5a4

Browse files
committed
static-stack: Fix compile error of unix-compat-0.5.1 with musl. Fixes #79
1 parent 9a3411e commit 38ef5a4

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

.buildkite/pipeline.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,17 @@ steps:
4848
# Stack via stack2nix
4949

5050
- label: static-stack
51+
# TODO: Remove the override of unix-compat below once that's available in stack
5152
command: |
53+
set -eu -o pipefail
54+
5255
cd static-stack/
5356
mkdir -p static-stack-test-dir
5457
curl -L https://github.com/commercialhaskell/stack/archive/v2.1.3.tar.gz | tar -xz -C static-stack-test-dir
5558
# Use lts-12 because ghc822 is no longer in nixpkgs
5659
cp static-stack-test-dir/stack-*/stack-lts-12.yaml static-stack-test-dir/stack-*/stack.yaml
60+
61+
echo "Overriding point release of unix-compat, see https://github.com/nh2/static-haskell-nix/issues/79"
62+
perl -pi -e 's/^packages:/packages:\n- unix-compat-0.5.2\@rev:0/g' static-stack-test-dir/stack-*/snapshot-lts-12.yaml
63+
5764
$(nix-build --no-link -A fullBuildScript --argstr stackDir $PWD/static-stack-test-dir/stack-*)

static-stack/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ let
1616
stack2nix-script = import ../static-stack2nix-builder/stack2nix-script.nix {
1717
pkgs = pkgs;
1818
stack-project-dir = stackDir; # where stack.yaml is
19-
hackageSnapshot = "2019-08-17T00:00:00Z"; # pins e.g. extra-deps without hashes or revisions
19+
hackageSnapshot = "2020-02-08T00:00:00Z"; # pins e.g. extra-deps without hashes or revisions
2020
};
2121

2222
static-stack2nix-builder = import ../static-stack2nix-builder/default.nix {

0 commit comments

Comments
 (0)