From 9a50fb11d1b9f5ba82ad7ad56f10940d8630552e Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Mon, 25 Apr 2022 11:31:28 -0400 Subject: [PATCH] Fix the nightly cryptol-remote-api Docker builds This converts the `cryptol-remote-api` Dockerfiles to use GHC 8.10.7 instead of GHC 8.10.3, now that we have switched over to using 8.10.7 in the CI. This also updates `cryptol-remote-api`'s `ghc.portability` patch to use the 8.10.7 branch of GHC. Fixes #1347. --- .gitpod.Dockerfile | 4 ++-- cryptol-remote-api/Dockerfile | 4 ++-- cryptol-remote-api/ghc-portability.patch | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 6553eec4..58a4294e 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -19,10 +19,10 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \ RUN curl https://i.jpillora.com/chisel! | bash # Install GHC -ARG GHCVER="8.10.3" +ARG GHCVER="8.10.7" ENV GHCUP_INSTALL_BASE_PREFIX=/opt \ PATH=/opt/.ghcup/bin:$PATH -RUN curl -o /usr/local/bin/ghcup "https://downloads.haskell.org/~ghcup/0.1.14/x86_64-linux-ghcup-0.1.14" && \ +RUN curl -o /usr/local/bin/ghcup "https://downloads.haskell.org/~ghcup/0.1.17.7/x86_64-linux-ghcup-0.1.17.7" && \ chmod +x /usr/local/bin/ghcup RUN ghcup install cabal --set ENV PATH=/root/.cabal/bin:$PATH diff --git a/cryptol-remote-api/Dockerfile b/cryptol-remote-api/Dockerfile index 3fd27ce7..dfe73bf0 100644 --- a/cryptol-remote-api/Dockerfile +++ b/cryptol-remote-api/Dockerfile @@ -1,4 +1,4 @@ -ARG GHCVER="8.10.3" +ARG GHCVER="8.10.7" ARG GHCVER_BOOTSTRAP="8.10.2" FROM debian:buster-20210511 AS toolchain ARG PORTABILITY=false @@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y libncurses-dev libz-dev unzip \ $(if ${PORTABILITY}; then echo git autoconf python3; fi) ENV GHCUP_INSTALL_BASE_PREFIX=/opt \ PATH=/opt/.ghcup/bin:$PATH -RUN curl -o /usr/local/bin/ghcup "https://downloads.haskell.org/~ghcup/0.1.14/x86_64-linux-ghcup-0.1.14" && \ +RUN curl -o /usr/local/bin/ghcup "https://downloads.haskell.org/~ghcup/0.1.17.7/x86_64-linux-ghcup-0.1.17.7" && \ chmod +x /usr/local/bin/ghcup RUN ghcup install cabal --set ENV PATH=/root/.cabal/bin:$PATH diff --git a/cryptol-remote-api/ghc-portability.patch b/cryptol-remote-api/ghc-portability.patch index 166d01bd..285bf7e7 100644 --- a/cryptol-remote-api/ghc-portability.patch +++ b/cryptol-remote-api/ghc-portability.patch @@ -1,8 +1,8 @@ diff --git a/configure.ac b/configure.ac -index d1462db837..55053cefe1 100644 +index 6eac557b93..fd87983730 100644 --- a/configure.ac +++ b/configure.ac -@@ -918,7 +918,7 @@ dnl off_t, because it will affect the result of that test. +@@ -922,7 +922,7 @@ dnl off_t, because it will affect the result of that test. AC_SYS_LARGEFILE dnl ** check for specific header (.h) files that we are interested in @@ -11,8 +11,8 @@ index d1462db837..55053cefe1 100644 dnl sys/cpuset.h needs sys/param.h to be included first on FreeBSD 9.1; #7708 AC_CHECK_HEADERS([sys/cpuset.h], [], [], -@@ -1174,10 +1174,6 @@ AC_TRY_LINK( - AC_MSG_RESULT(no) +@@ -1230,10 +1230,6 @@ AC_LINK_IFELSE([ + AC_MSG_RESULT(no) ) -dnl ** check for eventfd which is needed by the I/O manager @@ -23,11 +23,11 @@ index d1462db837..55053cefe1 100644 AC_MSG_CHECKING(for __thread support) AC_COMPILE_IFELSE( diff --git a/libraries/base/configure.ac b/libraries/base/configure.ac -index d34224acc7..a67bdef684 100644 +index 716e46cc05..694bf6aa81 100644 --- a/libraries/base/configure.ac +++ b/libraries/base/configure.ac -@@ -30,7 +30,7 @@ dnl ** check for full ANSI header (.h) files - AC_HEADER_STDC +@@ -23,7 +23,7 @@ AC_MSG_RESULT($WINDOWS) + AC_CHECK_TYPES([long long]) # check for specific header (.h) files that we are interested in -AC_CHECK_HEADERS([ctype.h errno.h fcntl.h inttypes.h limits.h signal.h sys/file.h sys/resource.h sys/select.h sys/stat.h sys/syscall.h sys/time.h sys/timeb.h sys/timers.h sys/times.h sys/types.h sys/utsname.h sys/wait.h termios.h time.h unistd.h utime.h windows.h winsock.h langinfo.h poll.h sys/epoll.h sys/event.h sys/eventfd.h sys/socket.h]) @@ -35,7 +35,7 @@ index d34224acc7..a67bdef684 100644 # Enable large file support. Do this before testing the types ino_t, off_t, and # rlim_t, because it will affect the result of that test. -@@ -47,7 +47,7 @@ AC_CHECK_FUNCS([clock_gettime]) +@@ -40,7 +40,7 @@ AC_CHECK_FUNCS([clock_gettime]) AC_CHECK_FUNCS([getclock getrusage times]) AC_CHECK_FUNCS([_chsize ftruncate])