From f16351afb2eec3020030c653ec1fb9066bc7ddd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 8 Feb 2020 05:03:05 +0100 Subject: [PATCH] static-stack: Fix compile error of unix-compat-0.5.1 with musl. Fixes #79 --- .buildkite/pipeline.yml | 7 +++++++ static-stack/default.nix | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 8334fc3..60e51cf 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -48,10 +48,17 @@ steps: # Stack via stack2nix - label: static-stack + # TODO: Remove the override of unix-compat below once that's available in stack command: | + set -eu -o pipefail + cd static-stack/ mkdir -p static-stack-test-dir curl -L https://github.com/commercialhaskell/stack/archive/v2.1.3.tar.gz | tar -xz -C static-stack-test-dir # Use lts-12 because ghc822 is no longer in nixpkgs cp static-stack-test-dir/stack-*/stack-lts-12.yaml static-stack-test-dir/stack-*/stack.yaml + + echo "Overriding point release of unix-compat, see https://github.com/nh2/static-haskell-nix/issues/79" + perl -pi -e 's/^packages:/packages:\n- unix-compat-0.5.2\@rev:0/g' static-stack-test-dir/stack-*/snapshot-lts-12.yaml + $(nix-build --no-link -A fullBuildScript --argstr stackDir $PWD/static-stack-test-dir/stack-*) diff --git a/static-stack/default.nix b/static-stack/default.nix index 25cbd5b..082d11b 100644 --- a/static-stack/default.nix +++ b/static-stack/default.nix @@ -16,7 +16,7 @@ let stack2nix-script = import ../static-stack2nix-builder/stack2nix-script.nix { pkgs = pkgs; stack-project-dir = stackDir; # where stack.yaml is - hackageSnapshot = "2019-08-17T00:00:00Z"; # pins e.g. extra-deps without hashes or revisions + hackageSnapshot = "2020-02-08T00:00:00Z"; # pins e.g. extra-deps without hashes or revisions }; static-stack2nix-builder = import ../static-stack2nix-builder/default.nix {