Add some architectures

getFileStatus will resolve symbolic links. getSymbolicLinkStatus doesn't.

.gitignore

@@ -1,3 +1,6 @@
+.ghci
+.vim
+codex.tags
 dist-newstyle/
 cabal.project.local
 .stack-work/

app/ghcup/Main.hs

@@ -1425,6 +1425,13 @@ Version: #{describe_result}|]
   prettyArch :: Architecture -> String
   prettyArch A_64 = "amd64"
   prettyArch A_32 = "i386"
+  prettyArch A_PowerPC = "PowerPC"
+  prettyArch A_PowerPC64 = "PowerPC64"
+  prettyArch A_Sparc = "Sparc"
+  prettyArch A_Sparc64 = "Sparc64"
+  prettyArch A_ARM = "ARM"
+  prettyArch A_ARM64 = "ARM64"
+
   prettyPlatform :: PlatformResult -> String
   prettyPlatform PlatformResult { _platform = plat, _distroVersion = Just v' }
     = show plat <> ", " <> show v'

ghcup-0.0.2.json

@@ -694,7 +694,7 @@
             "Linux_Alpine": {
               "unknown_versioning": {
                 "dlHash": "cb13b645d103e2fba2eb8dfcc4e5f2fbd9550c00c4df42f342b4210436dcb8a8",
-                "dlSubdir": "ghc-8.10.1",
+                "dlSubdir": "ghc-8.10.1-x86_64-unknown-linux",
                 "dlUri": "https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-x86_64-alpine3.10-linux-integer-simple.tar.xz"
               }
             },

hie.yaml

@@ -0,0 +1,4 @@
+cradle:
+  cabal:
+    - path: "."
+      component: "ghcup:lib:ghcup"

lib/GHCup/Data/GHCupDownloads.hs

@@ -883,7 +883,7 @@ ghc_8101_64_darwin = DownloadInfo
 ghc_8101_64_alpine :: DownloadInfo
 ghc_8101_64_alpine = DownloadInfo
   [uri|https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-x86_64-alpine3.10-linux-integer-simple.tar.xz|]
-  (Just [rel|ghc-8.10.1|])
+  (Just [rel|ghc-8.10.1-x86_64-unknown-linux|])
   "cb13b645d103e2fba2eb8dfcc4e5f2fbd9550c00c4df42f342b4210436dcb8a8"
 
 

lib/GHCup/Platform.hs

@@ -48,10 +48,7 @@ import qualified Data.Text                     as T
 -- | Get the full platform request, consisting of architecture, distro, ...
 platformRequest :: (MonadLogger m, MonadCatch m, MonadIO m)
                 => Excepts
-                     '[ NoCompatiblePlatform
+                     '[NoCompatiblePlatform, NoCompatibleArch, DistroNotFound]
-                      , NoCompatibleArch
-                      , DistroNotFound
-                      ]
                      m
                      PlatformRequest
 platformRequest = do
@@ -62,15 +59,21 @@ platformRequest = do
 
 getArchitecture :: Either NoCompatibleArch Architecture
 getArchitecture = case arch of
-  "x86_64" -> Right A_64
+  "x86_64"      -> Right A_64
-  "i386"   -> Right A_32
+  "i386"        -> Right A_32
-  what     -> Left (NoCompatibleArch what)
+  "powerpc"     -> Right A_PowerPC
-
+  "powerpc64"   -> Right A_PowerPC64
+  "powerpc64le" -> Right A_PowerPC64
+  "sparc"       -> Right A_Sparc
+  "sparc64"     -> Right A_Sparc64
+  "arm"         -> Right A_ARM
+  "aarch64"     -> Right A_ARM64
+  what          -> Left (NoCompatibleArch what)
 
 
 getPlatform :: (MonadLogger m, MonadCatch m, MonadIO m)
             => Excepts
-                 '[NoCompatiblePlatform , DistroNotFound]
+                 '[NoCompatiblePlatform, DistroNotFound]
                  m
                  PlatformResult
 getPlatform = do
@@ -82,6 +85,7 @@ getPlatform = do
       ver <-
         ( either (const Nothing) Just
           . versioning
+          -- TODO: maybe do this somewhere else
           . getMajorVersion
           . decUTF8Safe
           )

lib/GHCup/Types.hs

@@ -90,6 +90,12 @@ data Tag = Latest
 
 data Architecture = A_64
                   | A_32
+                  | A_PowerPC
+                  | A_PowerPC64
+                  | A_Sparc
+                  | A_Sparc64
+                  | A_ARM
+                  | A_ARM64
   deriving (Eq, GHC.Generic, Ord, Show)
 
 

lib/GHCup/Utils.hs

@@ -417,13 +417,26 @@ ghcToolFiles ver = do
                    ([s|^([a-zA-Z0-9_-]*[a-zA-Z0-9_]-)?ghc$|] :: ByteString)
     )
 
-  (Just symver) <-
+  let ghcbinPath = bindir </> ghcbin
-    (B.stripPrefix (toFilePath ghcbin <> "-") . takeFileName)
+  ghcIsHadrian    <- liftIO $ isHadrian ghcbinPath
-      <$> (liftIO $ readSymbolicLink $ toFilePath (bindir </> ghcbin))
+  onlyUnversioned <- if ghcIsHadrian
-  when (B.null symver)
+    then pure id
-       (throwIO $ userError $ "Fatal: ghc symlink target is broken")
+    else do
+      (Just symver) <-
+        (B.stripPrefix (toFilePath ghcbin <> "-") . takeFileName)
+          <$> (liftIO $ readSymbolicLink $ toFilePath ghcbinPath)
+      when (B.null symver)
+           (throwIO $ userError $ "Fatal: ghc symlink target is broken")
+      pure $ filter (\x -> not $ symver `B.isSuffixOf` toFilePath x)
 
-  pure . filter (\x -> not $ symver `B.isSuffixOf` toFilePath x) $ files
+  pure $ onlyUnversioned files
+ where
+    -- GHC is moving some builds to Hadrian for bindists,
+    -- which doesn't create versioned binaries.
+    -- https://gitlab.haskell.org/haskell/ghcup-hs/issues/31
+  isHadrian :: Path Abs -- ^ ghcbin path
+            -> IO Bool
+  isHadrian = fmap (/= SymbolicLink) . getFileType
 
 
 -- | This file, when residing in ~/.ghcup/ghc/<ver>/ signals that