wip

README.md

@@ -10,7 +10,6 @@ Similar in scope to [rustup](https://github.com/rust-lang-nursery/rustup.rs), [p
 [![Join the chat at Matrix.org](https://img.shields.io/matrix/haskell-tooling:matrix.org?label=chat%20on%20matrix.org)](https://app.element.io/#/room/#haskell-tooling:matrix.org)
 [![Join the chat at Discord](https://img.shields.io/discord/280033776820813825?label=chat%20on%20discord)](https://discord.gg/pKYf3zDQU7)
 [![Join the chat at https://gitter.im/haskell/ghcup](https://badges.gitter.im/haskell/ghcup.svg)](https://gitter.im/haskell/ghcup?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-<a href="https://opencollective.com/ghcup#category-CONTRIBUTE"><img src="https://opencollective.com/webpack/donate/button@2x.png?color=blue" alt="Donate" width="150"></a>
 
    * [Installation](#installation)
      * [Simple bootstrap](#simple-bootstrap)

data/metadata/ghcup-0.0.6.yaml

@@ -72,6 +72,7 @@ toolRequirements:
         '( >= 7 && < 8 )':
           distroPKGs:
           - gcc
+          - gcc-c++
           - gmp
           - gmp-devel
           - make
@@ -82,6 +83,7 @@ toolRequirements:
         unknown_versioning:
           distroPKGs:
           - gcc
+          - gcc-c++
           - gmp
           - gmp-devel
           - make
@@ -94,6 +96,7 @@ toolRequirements:
         unknown_versioning:
           distroPKGs:
           - gcc
+          - gcc-c++
           - gmp
           - gmp-devel
           - make
@@ -108,15 +111,14 @@ toolRequirements:
           - binutils-gold
           - curl
           - gcc
+          - g++
           - gmp-dev
-          - libc-dev
+          - ncurses-dev
           - libffi-dev
           - make
-          - musl-dev
-          - ncurses-dev
-          - perl
-          - tar
           - xz
+          - tar
+          - perl
           notes: ''
       Linux_UnknownLinux:
         unknown_versioning:
@@ -2355,7 +2357,9 @@ ghcupDownloads:
           Linux_Alpine:
             unknown_versioning: *hls-120-64
     1.3.0:
-      viTags: []
+      viTags:
+        - Recommended
+        - Latest
       viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md#130
       viPostInstall: *hls-post-install
       viArch:
@@ -2374,28 +2378,6 @@ ghcupDownloads:
               dlHash: 46aac7be888e29a9907cf56698c1ce1475c148b5e6cc099513e9ef74a0520dcf
           Linux_Alpine:
             unknown_versioning: *hls-130-64
-    1.4.0:
-      viTags:
-        - Recommended
-        - Latest
-      viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md#140
-      viPostInstall: *hls-post-install
-      viArch:
-        A_64:
-          Linux_UnknownLinux:
-            unknown_versioning: &hls-140-64
-              dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.4.0/haskell-language-server-Linux-1.4.0.tar.gz
-              dlHash: f93c114441911ccce55649702adc9553cb4c9f953c37878321d2806a3525fee8
-          Darwin:
-            unknown_versioning:
-              dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.4.0/haskell-language-server-macOS-1.4.0.tar.gz
-              dlHash: a7f0ac6be93ffb08cc239e5f5fead99b061061825f99566c1be33ee60cab62a4
-          Windows:
-            unknown_versioning:
-              dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.4.0/haskell-language-server-Windows-1.4.0.tar.gz
-              dlHash: 0ec77cee750037b7a0ede817b46a913a702821f4098c6a858bcb686cb30f7efd
-          Linux_Alpine:
-            unknown_versioning: *hls-140-64
   Stack:
     2.5.1:
       viTags:

data/metadata/ghcup-0.0.7.yaml

@@ -72,6 +72,7 @@ toolRequirements:
         '( >= 7 && < 8 )':
           distroPKGs:
           - gcc
+          - gcc-c++
           - gmp
           - gmp-devel
           - make
@@ -82,6 +83,7 @@ toolRequirements:
         unknown_versioning:
           distroPKGs:
           - gcc
+          - gcc-c++
           - gmp
           - gmp-devel
           - make
@@ -94,6 +96,7 @@ toolRequirements:
         unknown_versioning:
           distroPKGs:
           - gcc
+          - gcc-c++
           - gmp
           - gmp-devel
           - make
@@ -106,6 +109,7 @@ toolRequirements:
         unknown_versioning:
           distroPKGs:
           - gcc
+          - g++
           - gmp
           - gmp-devel
           - make
@@ -121,15 +125,14 @@ toolRequirements:
           - binutils-gold
           - curl
           - gcc
+          - g++
           - gmp-dev
-          - libc-dev
+          - ncurses-dev
           - libffi-dev
           - make
-          - musl-dev
-          - ncurses-dev
-          - perl
-          - tar
           - xz
+          - tar
+          - perl
           notes: ''
       Linux_UnknownLinux:
         unknown_versioning:
@@ -2416,7 +2419,9 @@ ghcupDownloads:
           Linux_Alpine:
             unknown_versioning: *hls-120-64
     1.3.0:
-      viTags: []
+      viTags:
+        - Recommended
+        - Latest
       viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md#130
       viPostInstall: *hls-post-install
       viArch:
@@ -2435,28 +2440,6 @@ ghcupDownloads:
               dlHash: 46aac7be888e29a9907cf56698c1ce1475c148b5e6cc099513e9ef74a0520dcf
           Linux_Alpine:
             unknown_versioning: *hls-130-64
-    1.4.0:
-      viTags:
-        - Recommended
-        - Latest
-      viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md#140
-      viPostInstall: *hls-post-install
-      viArch:
-        A_64:
-          Linux_UnknownLinux:
-            unknown_versioning: &hls-140-64
-              dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.4.0/haskell-language-server-Linux-1.4.0.tar.gz
-              dlHash: f93c114441911ccce55649702adc9553cb4c9f953c37878321d2806a3525fee8
-          Darwin:
-            unknown_versioning:
-              dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.4.0/haskell-language-server-macOS-1.4.0.tar.gz
-              dlHash: a7f0ac6be93ffb08cc239e5f5fead99b061061825f99566c1be33ee60cab62a4
-          Windows:
-            unknown_versioning:
-              dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.4.0/haskell-language-server-Windows-1.4.0.tar.gz
-              dlHash: 0ec77cee750037b7a0ede817b46a913a702821f4098c6a858bcb686cb30f7efd
-          Linux_Alpine:
-            unknown_versioning: *hls-140-64
   Stack:
     2.5.1:
       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

lib/GHCup.hs

@@ -868,8 +868,6 @@ setGHC ver sghc = do
   -- create symlink for share dir
   when (isNothing . _tvTarget $ ver) $ lift $ symlinkShareDir ghcdir verS
 
-  when (sghc == SetGHCOnly) $ lift warnAboutHlsCompatibility
-
   pure ver
 
  where
@@ -980,8 +978,6 @@ setHLS ver = do
 
   lift $ createLink destL wrapper
 
-  lift warnAboutHlsCompatibility
-
   pure ()
 
 
@@ -1014,31 +1010,6 @@ setStack ver = do
   pure ()
 
 
--- | Warn if the installed and set HLS is not compatible with the installed and
--- set GHC version.
-warnAboutHlsCompatibility :: ( MonadReader env m
-                             , HasDirs env
-                             , HasLog env
-                             , MonadThrow m
-                             , MonadCatch m
-                             , MonadIO m
-                             )
-                          => m ()
-warnAboutHlsCompatibility = do
-  supportedGHC <- hlsGHCVersions
-  currentGHC   <- fmap _tvVersion <$> ghcSet Nothing
-  currentHLS   <- hlsSet
-
-  case (currentGHC, currentHLS) of
-    (Just gv, Just hv) | gv `notElem` supportedGHC -> do
-      logWarn $
-        "GHC " <> T.pack (prettyShow gv) <> " is not compatible with " <>
-        "Haskell Language Server " <> T.pack (prettyShow hv) <> "." <> "\n" <>
-        "Haskell IDE support may not work until this is fixed." <> "\n" <>
-        "Install a different HLS version, or install and set one of the following GHCs:" <> "\n" <>
-        T.pack (prettyShow supportedGHC)
-        
-    _ -> return ()
 
     ------------------
     --[ List tools ]--

lib/GHCup/Utils.hs

@@ -475,7 +475,7 @@ hlsGHCVersions = do
         . splitOn "~"
         )
       bins
-  pure . sortBy (flip compare) . rights . concat . maybeToList $ vers
+  pure . rights . concat . maybeToList $ vers
 
 
 -- | Get all server binaries for an hls version, if any.

www/ghcup.css

@@ -174,17 +174,7 @@ span.code {
     line-height: 2rem;
 }
 
-#help {
-    margin-bottom: 0px !important;
-}
-
-#collective {
-    margin-top: 1em !important;
-    margin-bottom: 0px !important;
-}
-
 #about {
-    margin-top: 0.5em !important;
     font-size: 16px;
     line-height: 2em;
 }

www/index.html

@@ -137,14 +137,9 @@
 
       </div>
 
-      <p id="help">
+      <p>
 	  Need help? Ask on <a href="https://kiwiirc.com/nextclient/irc.libera.chat/?nick=Guest%7C?#haskell,#haskell-ghcup"><img src="irc.svg" height="18px" alt="" />IRC</a>, <a href="https://discord.gg/pKYf3zDQU7"><img src="Discord-Logo-Black.svg" height="18px" alt="" />Discord</a>, <a href="https://app.element.io/#/room/#haskell-tooling:matrix.org"><img src="Matrix_logo.svg" height="25px" alt="" style="top:5px;position:relative;" /></a> or <a href="https://gitlab.haskell.org/haskell/ghcup-hs/issues">report a bug <img src="Octicons-bug.svg" height="18px" alt="" /></a>.
       </p>
-      <p id="collective">
-		<a id="collective" href="https://opencollective.com/ghcup#category-CONTRIBUTE" target="_blank">
-			<img src="https://opencollective.com/webpack/donate/button@2x.png?color=blue" width=200 />
-		</a>
-      </p>
 
       <p id="about">
         <img src="haskell-logo.svg" alt="" />