wip

data/metadata/ghcup-0.0.6.yaml

@@ -2172,7 +2172,6 @@ ghcupDownloads:
     3.4.0.0:
       viTags:
       - Recommended
-      - Latest
       viChangeLog: https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.4.0.0.md
       viArch:
         A_64:
@@ -2221,6 +2220,50 @@ ghcupDownloads:
             unknown_versioning:
               dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.4.0.0/cabal-install-3.4.0.0-armv7-linux-bootstrapped.tar.xz
               dlHash: 16c0d1eaba24bed14f3e152970179a45d9f9bb5cc839b2c210ad06eb7d4826ed
+    3.6.0.0:
+      viTags:
+      - Latest
+      viChangeLog: https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.6.0.0.md
+      viArch:
+        A_64:
+          Linux_UnknownLinux:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.6.0.0/cabal-install-3.6.0.0-x86_64-linux.tar.xz
+              dlHash: bfcb7350966dafe95051b5fc9fcb989c5708ab9e78191e71fc04647061668a11
+          Linux_Alpine:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.6.0.0/cabal-install-3.6.0.0-x86_64-linux-alpine.tar.xz
+              dlHash: 3203d71b7ee87fc9dce74b452ae07f420afe8817b5e6f84e54798442f4ccdda8
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.6.0.0/cabal-install-3.6.0.0-x86_64-darwin.tar.xz
+              dlHash: 8e1367a4a1fc86ff0fd82ee057320a7b974595ba7999457b42035467ba06190c
+          FreeBSD:
+            '( >= 12 && < 13 )':
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.6.0.0/cabal-install-3.6.0.0-x86_64-freebsd.tar.xz
+              dlHash: 56b5b37396c16a29f164a6963f24bd88f09e1d37448542ed61a683325f0a868b
+            '( >= 13 )':
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.6.0.0/cabal-install-3.6.0.0-x86_64-freebsd13.tar.xz
+              dlHash: a283aa498702a3e286aa08e004c2a389538cbb47ec7096a25682fb7d57f6bb7f
+          Windows:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.6.0.0/cabal-install-3.6.0.0-x86_64-windows.zip
+              dlSubdir:
+              dlHash: 8222b49b6eac3d06aaa390bc688f467e8f949a38943567f46246f8320fd72ded
+        A_ARM64:
+          Linux_UnknownLinux:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.6.0.0/cabal-install-3.6.0.0-aarch64-linux-deb10.tar.xz
+              dlHash: 534f71cd4e1d9758dc73066cc5733c5838874710aeb3aa88541de6c6d042d9ec
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.6.0.0/cabal-install-3.6.0.0-aarch64-darwin-big-sur.tar.xz
+              dlHash: 7acf740946d996ede835edf68887e6b2f1e16d1b95e94054d266463f38d136d9
+        A_ARM:
+          Linux_UnknownLinux:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.6.0.0/cabal-install-3.6.0.0-armv7-linux.tar.xz
+              dlHash: 11b5ca042a8bf45971224f2127a3e9d6b803f09210042ca80a254bea06f01a2e
   GHCup:
     0.1.16.2:
       viTags:

data/metadata/ghcup-0.0.7.yaml

@@ -2234,7 +2234,6 @@ ghcupDownloads:
     3.4.0.0:
       viTags:
       - Recommended
-      - Latest
       viChangeLog: https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.4.0.0.md
       viArch:
         A_64:
@@ -2283,6 +2282,50 @@ ghcupDownloads:
             unknown_versioning:
               dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.4.0.0/cabal-install-3.4.0.0-armv7-linux-bootstrapped.tar.xz
               dlHash: 16c0d1eaba24bed14f3e152970179a45d9f9bb5cc839b2c210ad06eb7d4826ed
+    3.6.0.0:
+      viTags:
+      - Latest
+      viChangeLog: https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.6.0.0.md
+      viArch:
+        A_64:
+          Linux_UnknownLinux:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.6.0.0/cabal-install-3.6.0.0-x86_64-linux.tar.xz
+              dlHash: bfcb7350966dafe95051b5fc9fcb989c5708ab9e78191e71fc04647061668a11
+          Linux_Alpine:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.6.0.0/cabal-install-3.6.0.0-x86_64-linux-alpine.tar.xz
+              dlHash: 3203d71b7ee87fc9dce74b452ae07f420afe8817b5e6f84e54798442f4ccdda8
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.6.0.0/cabal-install-3.6.0.0-x86_64-darwin.tar.xz
+              dlHash: 8e1367a4a1fc86ff0fd82ee057320a7b974595ba7999457b42035467ba06190c
+          FreeBSD:
+            '( >= 12 && < 13 )':
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.6.0.0/cabal-install-3.6.0.0-x86_64-freebsd.tar.xz
+              dlHash: 56b5b37396c16a29f164a6963f24bd88f09e1d37448542ed61a683325f0a868b
+            '( >= 13 )':
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.6.0.0/cabal-install-3.6.0.0-x86_64-freebsd13.tar.xz
+              dlHash: a283aa498702a3e286aa08e004c2a389538cbb47ec7096a25682fb7d57f6bb7f
+          Windows:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.6.0.0/cabal-install-3.6.0.0-x86_64-windows.zip
+              dlSubdir:
+              dlHash: 8222b49b6eac3d06aaa390bc688f467e8f949a38943567f46246f8320fd72ded
+        A_ARM64:
+          Linux_UnknownLinux:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.6.0.0/cabal-install-3.6.0.0-aarch64-linux-deb10.tar.xz
+              dlHash: 534f71cd4e1d9758dc73066cc5733c5838874710aeb3aa88541de6c6d042d9ec
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.6.0.0/cabal-install-3.6.0.0-aarch64-darwin-big-sur.tar.xz
+              dlHash: 7acf740946d996ede835edf68887e6b2f1e16d1b95e94054d266463f38d136d9
+        A_ARM:
+          Linux_UnknownLinux:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.6.0.0/cabal-install-3.6.0.0-armv7-linux.tar.xz
+              dlHash: 11b5ca042a8bf45971224f2127a3e9d6b803f09210042ca80a254bea06f01a2e
   GHCup:
     0.1.16.2:
       viTags:

docker/alpine/3.14.2/8.10.7/Dockerfile

@@ -0,0 +1,32 @@
+FROM alpine:3.14.2
+
+# install deps needed by GHC
+RUN apk add --no-cache \
+	curl \
+	gcc \
+	g++ \
+	binutils \
+	binutils-gold \
+	gmp \
+	ncurses \
+	libffi \
+	make \
+	xz \
+	tar \
+	perl
+
+ARG GHCUP_VERSION
+
+# install ghcup
+RUN if [ -n "$GHCUP_VERSION" ] ; \
+	then curl -sSfL https://downloads.haskell.org/~ghcup/$GHCUP_VERSION/x86_64-linux-ghcup-$GHCUP_VERSION > /usr/bin/ghcup ; \
+	else curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-linux-ghcup > /usr/bin/ghcup ; \
+	fi && \
+    chmod +x /usr/bin/ghcup
+
+ENV GHCUP_INSTALL_BASE_PREFIX=/usr/local
+ENV PATH=/usr/local/.ghcup/bin:$PATH
+
+RUN ghcup install ghc --set 8.10.7 && \
+    ghcup install cabal latest && \
+    ghcup install stack latest

docker/alpine/3.14.2/minimal/Dockerfile

@@ -0,0 +1,30 @@
+FROM alpine:3.14.2
+
+# install deps needed by GHC
+RUN apk add --no-cache \
+	curl \
+	gcc \
+	g++ \
+	binutils \
+	binutils-gold \
+	gmp \
+	ncurses \
+	libffi \
+	make \
+	xz \
+	tar \
+	perl
+
+ARG GHCUP_VERSION
+
+# install ghcup
+RUN if [ -n "$GHCUP_VERSION" ] ; \
+	then curl -sSfL https://downloads.haskell.org/~ghcup/$GHCUP_VERSION/x86_64-linux-ghcup-$GHCUP_VERSION > /usr/bin/ghcup ; \
+	else curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-linux-ghcup > /usr/bin/ghcup ; \
+	fi && \
+    chmod +x /usr/bin/ghcup
+
+ENV GHCUP_INSTALL_BASE_PREFIX=/usr/local
+ENV PATH=/usr/local/.ghcup/bin:$PATH
+
+RUN ghcup prefetch metadata

docker/alpine/latest/8.10.7/Dockerfile

@@ -0,0 +1,32 @@
+FROM alpine:latest
+
+# install deps needed by GHC
+RUN apk add --no-cache \
+	curl \
+	gcc \
+	g++ \
+	binutils \
+	binutils-gold \
+	gmp \
+	ncurses \
+	libffi \
+	make \
+	xz \
+	tar \
+	perl
+
+ARG GHCUP_VERSION
+
+# install ghcup
+RUN if [ -n "$GHCUP_VERSION" ] ; \
+	then curl -sSfL https://downloads.haskell.org/~ghcup/$GHCUP_VERSION/x86_64-linux-ghcup-$GHCUP_VERSION > /usr/bin/ghcup ; \
+	else curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-linux-ghcup > /usr/bin/ghcup ; \
+	fi && \
+    chmod +x /usr/bin/ghcup
+
+ENV GHCUP_INSTALL_BASE_PREFIX=/usr/local
+ENV PATH=/usr/local/.ghcup/bin:$PATH
+
+RUN ghcup install ghc --set 8.10.7 && \
+    ghcup install cabal latest && \
+    ghcup install stack latest

docker/alpine/latest/minimal/Dockerfile

@@ -0,0 +1,30 @@
+FROM alpine:latest
+
+# install deps needed by GHC
+RUN apk add --no-cache \
+	curl \
+	gcc \
+	g++ \
+	binutils \
+	binutils-gold \
+	gmp \
+	ncurses \
+	libffi \
+	make \
+	xz \
+	tar \
+	perl
+
+ARG GHCUP_VERSION
+
+# install ghcup
+RUN if [ -n "$GHCUP_VERSION" ] ; \
+	then curl -sSfL https://downloads.haskell.org/~ghcup/$GHCUP_VERSION/x86_64-linux-ghcup-$GHCUP_VERSION > /usr/bin/ghcup ; \
+	else curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-linux-ghcup > /usr/bin/ghcup ; \
+	fi && \
+    chmod +x /usr/bin/ghcup
+
+ENV GHCUP_INSTALL_BASE_PREFIX=/usr/local
+ENV PATH=/usr/local/.ghcup/bin:$PATH
+
+RUN ghcup prefetch metadata

docker/ubuntu/20.04/8.10.7/Dockerfile

@@ -0,0 +1,25 @@
+FROM ubuntu:20.04
+
+# install deps needed by GHC
+RUN export DEBIAN_FRONTEND=noninteractive && \
+	apt-get update -y && \
+	apt-get install -y --no-install-recommends libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl && \
+	apt-get clean && \
+	rm -rf /var/cache/apt/archives && \
+	rm -rf /var/lib/apt/lists/*
+
+ARG GHCUP_VERSION
+
+# install ghcup
+RUN if [ -n "$GHCUP_VERSION" ] ; \
+	then curl -sSfL https://downloads.haskell.org/~ghcup/$GHCUP_VERSION/x86_64-linux-ghcup-$GHCUP_VERSION > /usr/bin/ghcup ; \
+	else curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-linux-ghcup > /usr/bin/ghcup ; \
+	fi && \
+    chmod +x /usr/bin/ghcup
+
+ENV GHCUP_INSTALL_BASE_PREFIX=/usr/local
+ENV PATH=/usr/local/.ghcup/bin:$PATH
+
+RUN ghcup install ghc --set 8.10.7 && \
+    ghcup install cabal latest && \
+    ghcup install stack latest

docker/ubuntu/20.04/minimal/Dockerfile

@@ -0,0 +1,23 @@
+FROM ubuntu:20.04
+
+# install deps needed by GHC
+RUN export DEBIAN_FRONTEND=noninteractive && \
+	apt-get update -y && \
+	apt-get install -y --no-install-recommends libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl && \
+	apt-get clean && \
+	rm -rf /var/cache/apt/archives && \
+	rm -rf /var/lib/apt/lists/*
+
+ARG GHCUP_VERSION
+
+# install ghcup
+RUN if [ -n "$GHCUP_VERSION" ] ; \
+	then curl -sSfL https://downloads.haskell.org/~ghcup/$GHCUP_VERSION/x86_64-linux-ghcup-$GHCUP_VERSION > /usr/bin/ghcup ; \
+	else curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-linux-ghcup > /usr/bin/ghcup ; \
+	fi && \
+    chmod +x /usr/bin/ghcup
+
+ENV GHCUP_INSTALL_BASE_PREFIX=/usr/local
+ENV PATH=/usr/local/.ghcup/bin:$PATH
+
+RUN ghcup prefetch metadata

docker/ubuntu/latest/8.10.7/Dockerfile

@@ -0,0 +1,25 @@
+FROM ubuntu:latest
+
+# install deps needed by GHC
+RUN export DEBIAN_FRONTEND=noninteractive && \
+	apt-get update -y && \
+	apt-get install -y --no-install-recommends libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl && \
+	apt-get clean && \
+	rm -rf /var/cache/apt/archives && \
+	rm -rf /var/lib/apt/lists/*
+
+ARG GHCUP_VERSION
+
+# install ghcup
+RUN if [ -n "$GHCUP_VERSION" ] ; \
+	then curl -sSfL https://downloads.haskell.org/~ghcup/$GHCUP_VERSION/x86_64-linux-ghcup-$GHCUP_VERSION > /usr/bin/ghcup ; \
+	else curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-linux-ghcup > /usr/bin/ghcup ; \
+	fi && \
+    chmod +x /usr/bin/ghcup
+
+ENV GHCUP_INSTALL_BASE_PREFIX=/usr/local
+ENV PATH=/usr/local/.ghcup/bin:$PATH
+
+RUN ghcup install ghc --set 8.10.7 && \
+    ghcup install cabal latest && \
+    ghcup install stack latest

docker/ubuntu/latest/minimal/Dockerfile

@@ -0,0 +1,23 @@
+FROM ubuntu:latest
+
+# install deps needed by GHC
+RUN export DEBIAN_FRONTEND=noninteractive && \
+	apt-get update -y && \
+	apt-get install -y --no-install-recommends libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl && \
+	apt-get clean && \
+	rm -rf /var/cache/apt/archives && \
+	rm -rf /var/lib/apt/lists/*
+
+ARG GHCUP_VERSION
+
+# install ghcup
+RUN if [ -n "$GHCUP_VERSION" ] ; \
+	then curl -sSfL https://downloads.haskell.org/~ghcup/$GHCUP_VERSION/x86_64-linux-ghcup-$GHCUP_VERSION > /usr/bin/ghcup ; \
+	else curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-linux-ghcup > /usr/bin/ghcup ; \
+	fi && \
+    chmod +x /usr/bin/ghcup
+
+ENV GHCUP_INSTALL_BASE_PREFIX=/usr/local
+ENV PATH=/usr/local/.ghcup/bin:$PATH
+
+RUN ghcup prefetch metadata

scripts/bootstrap/bootstrap-haskell

@@ -176,7 +176,15 @@ download_ghcup() {
 					_url=${base_url}/${ghver}/armv7-linux-ghcup-${ghver}
 					;;
 				aarch64|arm64|armv8l)
-					_url=${base_url}/${ghver}/aarch64-linux-ghcup-${ghver}
+					# we could be in a 32bit docker container, in which
+					# case uname doesn't give us what we want
+					if [ "$(getconf LONG_BIT)" = "32" ] ; then
+						_url=${base_url}/${ghver}/armv7-linux-ghcup-${ghver}
+					elif [ "$(getconf LONG_BIT)" = "64" ] ; then
+						_url=${base_url}/${ghver}/aarch64-linux-ghcup-${ghver}
+					else
+						die "Unknown long bit size: $(getconf LONG_BIT)"
+					fi
 					;;
 				*) die "Unknown architecture: ${arch}"
 					;;
@@ -293,16 +301,7 @@ ask_bashrc() {
 
 			read -r bashrc_answer </dev/tty
 		else
-			# On windows .bashrc isn't an important user config, so we adjust it
-			# always. On other platforms, let's be a bit more conservative.
-			case "${plat}" in
-					MSYS*|MINGW*)
-						return 1
-						;;
-					*)
-						return 0
-						;;
-			esac
+			return 0
 		fi
 		case $bashrc_answer in
 			[Pp]* | "")