From 5976ad2916c39bdc53a64c48af8d535df5477f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Tue, 26 Sep 2017 12:37:53 +0200 Subject: [PATCH] scripts: Include GHC <=7.6 in docker script again c-i1.24 doesn't build with 7.2, 7.0 :( --- scripts/docker.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/docker.sh b/scripts/docker.sh index dc31f50..bba2500 100755 --- a/scripts/docker.sh +++ b/scripts/docker.sh @@ -21,12 +21,14 @@ while read -r ghc_rel ghc ghc_arch ghc_ext cabal cabal_rev image; do cabal_meta_file=cabal-install-"${cabal}"-"${cabal_rev}".cabal ADDITIONAL_COMMANDS="" + ADDITIONAL_BOOTSTRAP_SETUP="true" if [ x"$image" = x"debian:squeeze" ]; then - ADDITIONAL_PACKAGES=" libncursesw5" + ADDITIONAL_PACKAGES=" libncursesw5 realpath" ADDITIONAL_COMMANDS="${ADDITIONAL_COMMANDS}COPY sources.list /etc/apt/ COPY 10-no-check-valid-until /etc/apt/apt.conf.d/ " + ADDITIONAL_BOOTSTRAP_SETUP="sed -i -e 's|^HACKAGE_URL=.*|HACKAGE_URL=http://hackage.haskell.org/package|' -e 's/^JOBS=.*/JOBS=/' bootstrap.sh" cat > "$tmpdir"/sources.list <