Tighten checks, alpine 32bit bindists is 1st class

Add more alpine 32bit bindists
Update hasufell.de hosted bindists to webhost.haskell.org
2021-02-21 15:37:05 +01:00 · 2021-02-21 15:35:33 +01:00 · 2021-02-21 15:34:55 +01:00 · 2021-02-20 23:30:28 +01:00 · 2021-02-16 16:40:03 +01:00 · 2021-02-16 16:26:13 +01:00
8 changed files with 179 additions and 65 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,7 +126,7 @@ test:linux:bootstrap_script:
    - ./.gitlab/script/ghcup_bootstrap.sh
  variables:
    GHC_VERSION: "8.10.3"
-    CABAL_VERSION: "3.4.0.0-rc4"
+    CABAL_VERSION: "3.4.0.0"
  extends:
    - .debian

@@ -136,13 +136,13 @@ test:linux:recommended:
  extends: .test_ghcup_version:linux
  variables:
    GHC_VERSION: "8.10.3"
-    CABAL_VERSION: "3.4.0.0-rc4"
+    CABAL_VERSION: "3.4.0.0"

 test:linux:latest:
  extends: .test_ghcup_version:linux
  variables:
    GHC_VERSION: "8.10.3"
-    CABAL_VERSION: "3.4.0.0-rc4"
+    CABAL_VERSION: "3.4.0.0"
  allow_failure: true

 ######## linux 32bit test ########
@@ -159,13 +159,13 @@ test:mac:recommended:
  extends: .test_ghcup_version:darwin
  variables:
    GHC_VERSION: "8.10.3"
-    CABAL_VERSION: "3.4.0.0-rc4"
+    CABAL_VERSION: "3.4.0.0"

 test:mac:latest:
  extends: .test_ghcup_version:darwin
  variables:
    GHC_VERSION: "8.10.3"
-    CABAL_VERSION: "3.4.0.0-rc4"
+    CABAL_VERSION: "3.4.0.0"
  allow_failure: true


@@ -175,13 +175,13 @@ test:freebsd:recommended:
  extends: .test_ghcup_version:freebsd
  variables:
    GHC_VERSION: "8.10.3"
-    CABAL_VERSION: "3.4.0.0-rc4"
+    CABAL_VERSION: "3.4.0.0"

 test:freebsd:latest:
  extends: .test_ghcup_version:freebsd
  variables:
    GHC_VERSION: "8.10.3"
-    CABAL_VERSION: "3.4.0.0-rc4"
+    CABAL_VERSION: "3.4.0.0"
  allow_failure: true


@@ -196,7 +196,7 @@ release:linux:64bit:
  variables:
    ARTIFACT: "x86_64-linux-ghcup"
    GHC_VERSION: "8.10.3"
-    CABAL_VERSION: "3.4.0.0-rc4"
+    CABAL_VERSION: "3.4.0.0"


 release:linux:32bit:
@@ -223,7 +223,7 @@ release:darwin:
  variables:
    ARTIFACT: "x86_64-apple-darwin-ghcup"
    GHC_VERSION: "8.10.3"
-    CABAL_VERSION: "3.4.0.0-rc4"
+    CABAL_VERSION: "3.4.0.0"
    MACOSX_DEPLOYMENT_TARGET: "10.7"


@@ -239,5 +239,5 @@ release:freebsd:
  variables:
    ARTIFACT: "x86_64-portbld-freebsd-ghcup"
    GHC_VERSION: "8.10.3"
-    CABAL_VERSION: "3.4.0.0-rc4"
+    CABAL_VERSION: "3.4.0.0"

--- a/.gitlab/before_script/darwin/install_deps.sh
+++ b/.gitlab/before_script/darwin/install_deps.sh
@@ -9,8 +9,9 @@ mkdir -p "${TMPDIR}"
 curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-apple-darwin-ghcup > ./ghcup-bin
 chmod +x ghcup-bin

-./ghcup-bin install ${GHC_VERSION}
-./ghcup-bin set ${GHC_VERSION}
-./ghcup-bin install-cabal ${CABAL_VERSION}
+./ghcup-bin upgrade -i -f
+./ghcup-bin -s file://$(pwd)/ghcup-${JSON_VERSION}.yaml install ${GHC_VERSION}
+./ghcup-bin -s file://$(pwd)/ghcup-${JSON_VERSION}.yaml set ${GHC_VERSION}
+./ghcup-bin -s file://$(pwd)/ghcup-${JSON_VERSION}.yaml install-cabal ${CABAL_VERSION}

 exit 0
--- a/.gitlab/before_script/freebsd/install_deps.sh
+++ b/.gitlab/before_script/freebsd/install_deps.sh
@@ -11,8 +11,9 @@ mkdir -p "${TMPDIR}"
 curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-portbld-freebsd-ghcup > ./ghcup-bin
 chmod +x ghcup-bin

-./ghcup-bin install ${GHC_VERSION}
-./ghcup-bin install-cabal ${CABAL_VERSION}
-./ghcup-bin set ${GHC_VERSION}
+./ghcup-bin upgrade -i -f
+./ghcup-bin -s file://$(pwd)/ghcup-${JSON_VERSION}.yaml install ${GHC_VERSION}
+./ghcup-bin -s file://$(pwd)/ghcup-${JSON_VERSION}.yaml set ${GHC_VERSION}
+./ghcup-bin -s file://$(pwd)/ghcup-${JSON_VERSION}.yaml install-cabal ${CABAL_VERSION}

 exit 0
--- a/.gitlab/before_script/linux/alpine/install_deps.sh
+++ b/.gitlab/before_script/linux/alpine/install_deps.sh
@@ -24,8 +24,9 @@ else
 	curl -sSfL https://downloads.haskell.org/ghcup/x86_64-linux-ghcup > ./ghcup-bin
 fi
 chmod +x ghcup-bin
-./ghcup-bin install ${GHC_VERSION}
-./ghcup-bin install-cabal ${CABAL_VERSION}
+./ghcup-bin upgrade -i -f
+./ghcup-bin -s file://$(pwd)/ghcup-${JSON_VERSION}.yaml install ${GHC_VERSION}
+./ghcup-bin -s file://$(pwd)/ghcup-${JSON_VERSION}.yaml install-cabal ${CABAL_VERSION}

 # utils
 apk add --no-cache \
--- a/.gitlab/before_script/linux/install_deps.sh
+++ b/.gitlab/before_script/linux/install_deps.sh
@@ -12,7 +12,8 @@ sudo apt-get install -y libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev li
 curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-linux-ghcup > ./ghcup-bin
 chmod +x ghcup-bin

-./ghcup-bin install ${GHC_VERSION}
-./ghcup-bin set ${GHC_VERSION}
-./ghcup-bin install-cabal ${CABAL_VERSION}
+./ghcup-bin upgrade -i -f
+./ghcup-bin -s file://$(pwd)/ghcup-${JSON_VERSION}.yaml install ${GHC_VERSION}
+./ghcup-bin -s file://$(pwd)/ghcup-${JSON_VERSION}.yaml set ${GHC_VERSION}
+./ghcup-bin -s file://$(pwd)/ghcup-${JSON_VERSION}.yaml install-cabal ${CABAL_VERSION}

--- a/app/ghcup-gen/Validate.hs
+++ b/app/ghcup-gen/Validate.hs
@@ -67,7 +67,7 @@ validate dls = do
    forM_ (M.toList dls) $ \(t, versions) ->
      forM_ (M.toList versions) $ \(v, vi) ->
        forM_ (M.toList $ _viArch vi) $ \(arch, pspecs) -> do
-          checkHasRequiredPlatforms t v arch (M.keys pspecs)
+          checkHasRequiredPlatforms t v (_viTags vi) arch (M.keys pspecs)

    checkGHCVerIsValid
    forM_ (M.toList dls) $ \(t, _) -> checkMandatoryTags t
@@ -81,17 +81,18 @@ validate dls = do
        lift $ $(logInfo) [i|All good|]
        pure ExitSuccess
 where
-  checkHasRequiredPlatforms t v arch pspecs = do
+  checkHasRequiredPlatforms t v tags arch pspecs = do
    let v' = prettyVer v
+        arch' = prettyArch arch
    when (not $ any (== Linux UnknownLinux) pspecs) $ do
      lift $ $(logError)
-        [i|Linux UnknownLinux missing for for #{t} #{v'} #{arch}|]
+        [i|Linux UnknownLinux missing for for #{t} #{v'} #{arch'}|]
      addError
    when ((not $ any (== Darwin) pspecs) && arch == A_64) $ do
-      lift $ $(logError) [i|Darwin missing for #{t} #{v'} #{arch}|]
+      lift $ $(logError) [i|Darwin missing for #{t} #{v'} #{arch'}|]
      addError
    when ((not $ any (== FreeBSD) pspecs) && arch == A_64) $ lift $ $(logWarn)
-      [i|FreeBSD missing for #{t} #{v'} #{arch}|]
+      [i|FreeBSD missing for #{t} #{v'} #{arch'}|]

    -- alpine needs to be set explicitly, because
    -- we cannot assume that "Linux UnknownLinux" runs on Alpine
@@ -99,8 +100,9 @@ validate dls = do
    when (not $ any (== Linux Alpine) pspecs) $
      case t of
        GHCup -> (lift $ $(logError) [i|Linux Alpine missing for #{t} #{v'} #{arch}|]) >> addError
-        Cabal | v > [vver|2.4.1.0|] -> (lift $ $(logError) [i|Linux Alpine missing for #{t} #{v'} #{arch}|]) >> addError
-        _     -> lift $ $(logWarn) [i|Linux Alpine missing for #{t} #{v'} #{arch}|]
+        Cabal | v > [vver|2.4.1.0|] -> (lift $ $(logError) [i|Linux Alpine missing for #{t} #{v'} #{arch'}|]) >> addError
+        GHC | Latest `elem` tags || Recommended `elem` tags -> lift $ $(logError) [i|Linux Alpine missing for #{t} #{v'} #{arch'}|]
+        _ -> lift $ $(logWarn) [i|Linux Alpine missing for #{t} #{v'} #{arch'}|]

  checkUniqueTags tool = do
    let allTags = join $ M.elems $ availableToolVersions dls tool
--- a/ghcup-0.0.4.yaml
+++ b/ghcup-0.0.4.yaml
@@ -28,7 +28,7 @@ toolRequirements:
          - libncurses5
          - libtinfo5
          notes: ''
-        ">= 20.04":
+        "( >= 20.04 && < 20.10 )":
          distroPKGs:
          - build-essential
          - curl
@@ -40,6 +40,18 @@ toolRequirements:
          - libncurses5
          - libtinfo5
          notes: ''
+        "( >= 20.10 )":
+          distroPKGs:
+          - build-essential
+          - curl
+          - libffi-dev
+          - libffi8ubuntu1
+          - libgmp-dev
+          - libgmp10
+          - libncurses-dev
+          - libncurses5
+          - libtinfo5
+          notes: ''
      Linux_CentOS:
        '( >= 7 && < 8 )':
          distroPKGs:
@@ -193,7 +205,7 @@ ghcupDownloads:
            unknown_versioning: *ghc-802-64-deb8
          Linux_Alpine:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/ghc/ghc-8.0.2-x86_64-alpine-linux.tar.xz
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.0.2/ghc-8.0.2-x86_64-alpine-linux.tar.xz
              dlSubdir: ghc-8.0.2
              dlHash: 517783b660a27ebf95b2568d47292fd633d5f9a4de4c80ad1ccf05e1b9d7313f
          Linux_UnknownLinux:
@@ -220,7 +232,7 @@ ghcupDownloads:
              dlHash: 818621342a2161b8afcc995a0765816bb40aefbfa1db2c8a7d59c04d8b18228a
          Linux_Alpine:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/ghc/ghc-8.0.2-i386-alpine-linux.tar.xz
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.0.2/ghc-8.0.2-i386-alpine-linux.tar.xz
              dlSubdir: ghc-8.0.2
              dlHash: b4cd12a1048b2fff2f23c9eec0dd3a1174d54d017f8d79ec79af4534118e6881
          Linux_UnknownLinux:
@@ -251,7 +263,7 @@ ghcupDownloads:
            unknown_versioning: *ghc-822-64-deb8
          Linux_Alpine:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/ghc/ghc-8.2.2-x86_64-alpine-linux.tar.xz
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.2.2/ghc-8.2.2-x86_64-alpine-linux.tar.xz
              dlSubdir: ghc-8.2.2
              dlHash: adcf3a320a3c402aba07ae9586990dc3c0b550e96aeffb1b9e194313d3ba716d
          Linux_UnknownLinux:
@@ -287,7 +299,7 @@ ghcupDownloads:
            unknown_versioning: *ghc-822-32-deb8
          Linux_Alpine:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/ghc/ghc-8.2.2-i386-alpine-linux.tar.xz
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.2.2/ghc-8.2.2-i386-alpine-linux.tar.xz
              dlSubdir: ghc-8.2.2
              dlHash: 467534c32552cfd318753112dbc70af003693aad4b0081f2a07e61f5b5ea2c22
          Linux_UnknownLinux:
@@ -482,7 +494,7 @@ ghcupDownloads:
            unknown_versioning: *ghc-844-64-centos
          Linux_Alpine:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/ghc/ghc-8.4.4-x86_64-alpine-linux.tar.xz
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.4.4/ghc-8.4.4-x86_64-alpine-linux.tar.xz
              dlSubdir: ghc-8.4.4
              dlHash: 336affff8314d3dc5e85d9c09015ae2ba8a7658b459c8c8ae77ecaa551a56ae7
          Linux_AmazonLinux:
@@ -511,7 +523,7 @@ ghcupDownloads:
            unknown_versioning: *ghc-844-32-deb8
          Linux_Alpine:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/ghc/ghc-8.4.4-i386-alpine-linux.tar.xz
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.4.4/ghc-8.4.4-i386-alpine-linux.tar.xz
              dlSubdir: ghc-8.4.4
              dlHash: 892888d388ef5c9cadf5cfba1146d62237c25b9b066fb62fee940b2b285fd308
          Linux_UnknownLinux:
@@ -765,7 +777,7 @@ ghcupDownloads:
            unknown_versioning: *ghc-865-64-centos
          Linux_Alpine:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/ghc/ghc-8.6.5-x86_64-alpine-linux.tar.xz
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.6.5/ghc-8.6.5-x86_64-alpine-linux.tar.xz
              dlSubdir: ghc-8.6.5
              dlHash: b9d3ed7f7aa24ef2d58bb579252289caa0b8877adee3685e3af2fb73d440afdc
          Linux_AmazonLinux:
@@ -779,7 +791,7 @@ ghcupDownloads:
              dlHash: dfc1bdb1d303a87a8552aa17f5b080e61351f2823c2b99071ec23d0837422169
          FreeBSD:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/ghc/ghc-8.6.5-x86_64-portbld-freebsd.tar.xz
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.6.5/ghc-8.6.5-x86_64-portbld-freebsd.tar.xz
              dlSubdir: ghc-8.6.5
              dlHash: 83a3059a630d40a98e26cb5b520354e12094a96e36ba2f5ab002dad94cf2fb37
        A_32:
@@ -794,7 +806,7 @@ ghcupDownloads:
            unknown_versioning: *ghc-865-32-deb9
          Linux_Alpine:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/ghc/ghc-8.6.5-i386-alpine-linux.tar.xz
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.6.5/ghc-8.6.5-i386-alpine-linux.tar.xz
              dlSubdir: ghc-8.6.5
              dlHash: 3737837550d9b177acfe150e3a3cd4545427ded020487c2ed5194d7b8f116349
          Linux_UnknownLinux:
@@ -963,7 +975,7 @@ ghcupDownloads:
              dlHash: 7016de90dd226b06fc79d0759c5d4c83c2ab01d8c678905442c28bd948dbb782
          FreeBSD:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/ghc/ghc-8.8.3-x86_64-portbld-freebsd.tar.xz
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.8.3/ghc-8.8.3-x86_64-portbld-freebsd.tar.xz
              dlSubdir: ghc-8.8.3
              dlHash: 569719075b4d14b3875a899df522090ae31e6fe085e6dffe518e875b09a2f0be
        A_32:
@@ -1016,7 +1028,7 @@ ghcupDownloads:
            unknown_versioning: *ghc-884-64-centos
          Linux_Alpine:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/ghc/ghc-8.8.4-x86_64-alpine-linux.tar.xz
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.8.4/ghc-8.8.4-x86_64-alpine-linux.tar.xz
              dlSubdir: ghc-8.8.4
              dlHash: 90c6a1661de7f20c7d169cd6270125035b3332063e45103ce028df0beecf434e
          Linux_AmazonLinux:
@@ -1030,7 +1042,7 @@ ghcupDownloads:
              dlHash: e80a789e9d8cfb41dd87f3284b75432427c4461c1731d220d04ead8733ccdb5e
          FreeBSD:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/ghc/ghc-8.8.4-x86_64-portbld-freebsd.tar.xz
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.8.4/ghc-8.8.4-x86_64-portbld-freebsd.tar.xz
              dlSubdir: ghc-8.8.4
              dlHash: 8cebe5ccf454e82acd1ff52ca57590d1ab0f3f44a981b46257ec12158c8c447e
        A_32:
@@ -1045,7 +1057,7 @@ ghcupDownloads:
            unknown_versioning: *ghc-884-32-deb9
          Linux_Alpine:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/ghc/ghc-8.8.4-i386-alpine-linux.tar.xz
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.8.4/ghc-8.8.4-i386-alpine-linux.tar.xz
              dlSubdir: ghc-8.8.4
              dlHash: 1d18e89ee031197e55c48683e78a7ffc67601ac5fd9f73aac555eb064b3859a2
          Linux_UnknownLinux:
@@ -1106,7 +1118,7 @@ ghcupDownloads:
              dlHash: 65b1ca361093de4804a7e40b3e68178e1ef720f84f743641ec8d95e56a45b3a8
          FreeBSD:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/ghc/ghc-8.10.1-x86_64-portbld-freebsd.tar.xz
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.10.1/ghc-8.10.1-x86_64-portbld-freebsd.tar.xz
              dlSubdir: ghc-8.10.1
              dlHash: e8646ec9b60fd40aa9505ee055f22f04601290ab7a1342c2cf37c34de9d3f142
        A_32:
@@ -1122,13 +1134,14 @@ ghcupDownloads:
            unknown_versioning: *ghc-8101-32-deb9
          Linux_Alpine:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/ghc/ghc-8.10.1-i386-alpine-linux.tar.xz
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.10.1/ghc-8.10.1-i386-alpine-linux.tar.xz
              dlSubdir: ghc-8.10.1
              dlHash: 7360cc6b29e9b4ab08f6ea5bc3bcca6f5c216933e81ef1620dcdd700f1fdb289
          Linux_UnknownLinux:
            unknown_versioning: *ghc-8101-32-deb9
    8.10.2:
      viTags:
+      - old
      - base-4.14.1.0
      viChangeLog: https://downloads.haskell.org/~ghc/8.10.2/docs/html/users_guide/8.10.2-notes.html
      viSourceDL:
@@ -1200,12 +1213,11 @@ ghcupDownloads:
            unknown_versioning: *ghc-8102-32-deb9
          Linux_Alpine:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/ghc/ghc-8.10.2-i386-alpine-linux.tar.xz
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.10.2/ghc-8.10.2-i386-alpine-linux.tar.xz
              dlSubdir: ghc-8.10.2
              dlHash: 9ee1cf1e85e9536088b3c9e80e975074e525ea378cd4eb156071bbc4b7b38327
    8.10.3:
      viTags:
-      - Recommended
      - base-4.14.1.0
      viChangeLog: https://downloads.haskell.org/~ghc/8.10.3/docs/html/users_guide/8.10.3-notes.html
      viSourceDL:
@@ -1277,9 +1289,86 @@ ghcupDownloads:
            unknown_versioning: *ghc-8103-32-deb9
          Linux_Alpine:
            unknown_versioning:
-              dlUri: https://files.hasufell.de/ghc/ghc-8.10.3-i386-alpine-linux.tar.xz
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.10.3/ghc-8.10.3-i386-alpine-linux.tar.xz
              dlSubdir: ghc-8.10.3
              dlHash: 309201cdefd2d13b8b3fd09c26c6137048c490d219a0a9c7407c3ce1d011f60c
+    8.10.4:
+      viTags:
+      - Recommended
+      - base-4.14.1.0
+      viChangeLog: https://downloads.haskell.org/~ghc/8.10.4/docs/html/users_guide/8.10.4-notes.html
+      viSourceDL:
+        dlUri: https://downloads.haskell.org/~ghc/8.10.4/ghc-8.10.4-src.tar.xz
+        dlSubdir: ghc-8.10.4
+        dlHash: 52af871b4e08550257d720c2944ac85727d0b948407cef1bebfe7508c224910e
+      viArch:
+        A_64:
+          Linux_Debian:
+            '( >= 9 && < 10 )': &ghc-8104-64-deb9
+              dlUri: https://downloads.haskell.org/~ghc/8.10.4/ghc-8.10.4-x86_64-deb9-linux.tar.xz
+              dlSubdir: ghc-8.10.4
+              dlHash: 5694200a5c38f22c142baf850b1d2f3784211d2ec9302e11693259a1ae8e38b7
+            '( >= 10 && < 11 )': &ghc-8104-64-deb10
+              dlUri: https://downloads.haskell.org/~ghc/8.10.4/ghc-8.10.4-x86_64-deb10-linux.tar.xz
+              dlSubdir: ghc-8.10.4
+              dlHash: 816365565e9927459b035515a7db6a0db62f9796f327389b6f8a0035d12fbda0
+            unknown_versioning: *ghc-8104-64-deb9
+          Linux_Ubuntu:
+            unknown_versioning: &ghc-8104-64-fedora
+              dlUri: https://downloads.haskell.org/~ghc/8.10.4/ghc-8.10.4-x86_64-fedora27-linux.tar.xz
+              dlSubdir: ghc-8.10.4
+              dlHash: a189eed900a8717d6d7906bafd10b9a9a9688ad942d1c75e19df480376dff9ea
+            '( >= 16 && < 19 )': *ghc-8104-64-deb9
+          Linux_Mint:
+            unknown_versioning: *ghc-8104-64-deb10
+          Linux_Fedora:
+            '( >= 27 && < 28 )': *ghc-8104-64-fedora
+            unknown_versioning: *ghc-8104-64-fedora
+          Linux_CentOS:
+            '( >= 7 && < 8 )': &ghc-8104-64-centos
+              dlUri: https://downloads.haskell.org/~ghc/8.10.4/ghc-8.10.4-x86_64-centos7-linux.tar.xz
+              dlSubdir: ghc-8.10.4
+              dlHash: fb8a91f0cf06594172aff46c2f6f7486179e1c3760855c79fbdd3012598cc2cd
+            unknown_versioning: *ghc-8104-64-centos
+          Linux_RedHat:
+            unknown_versioning: *ghc-8104-64-centos
+          Linux_Alpine:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghc/8.10.4/ghc-8.10.4-x86_64-alpine3.10-linux-integer-simple.tar.xz
+              dlSubdir: ghc-8.10.4-x86_64-unknown-linux
+              dlHash: 74c2c07537832708502716ef4ec40019f8e552ddda13c8eadf8f7c4b03a79359
+          Linux_AmazonLinux:
+            unknown_versioning: *ghc-8104-64-centos
+          Linux_UnknownLinux:
+            unknown_versioning: *ghc-8104-64-fedora
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghc/8.10.4/ghc-8.10.4-x86_64-apple-darwin.tar.xz
+              dlSubdir: ghc-8.10.4
+              dlHash: 725ecf6543e63b81a3581fb8c97afd21a08ae11bc0fa4f8ee25d45f0362ef6d5
+          FreeBSD:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghc/8.10.4/ghc-8.10.4-x86_64-portbld-freebsd.tar.xz
+              dlSubdir: ghc-8.10.4
+              dlHash: c9776a2ccf9629b03e967206a507fcdcb6c5189800a626e9461ababf6733c357
+        A_32:
+          Linux_Debian:
+            '( >= 9 && < 10 )': &ghc-8104-32-deb9
+              dlUri: https://downloads.haskell.org/~ghc/8.10.4/ghc-8.10.4-i386-deb9-linux.tar.xz
+              dlSubdir: ghc-8.10.4
+              dlHash: 0022c5b9ac22825bb7b4745af3d92cef0ba1ecd01fab3ef387ddbd47146569ad
+            unknown_versioning: *ghc-8104-32-deb9
+          Linux_Ubuntu:
+            unknown_versioning: *ghc-8104-32-deb9
+          Linux_Mint:
+            unknown_versioning: *ghc-8104-32-deb9
+          Linux_UnknownLinux:
+            unknown_versioning: *ghc-8104-32-deb9
+          Linux_Alpine:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/8.10.4/ghc-8.10.4-i386-alpine-linux.tar.xz
+              dlSubdir: ghc-8.10.4
+              dlHash: 9161a98bed763692101854d83af69c1316030cfe5ee6f6acde283d04ef139735
    9.0.1:
      viTags:
      - Latest
@@ -1352,6 +1441,11 @@ ghcupDownloads:
            unknown_versioning: *ghc-901-32-deb9
          Linux_UnknownLinux:
            unknown_versioning: *ghc-901-32-deb9
+          Linux_Alpine:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/ghc/9.0.1/ghc-9.0.1-i386-alpine-linux.tar.xz
+              dlSubdir: ghc-9.0.1
+              dlHash: ebfeb3b91e6f2bb5a49fd3376746f7fd1b89e62e9838bf5b1530a8756ff1e6aa
  Cabal:
    2.4.1.0:
      viTags:
@@ -1418,8 +1512,7 @@ ghcupDownloads:
              dlHash: 6898ccd6e6dc0872999c06daaf61d546164e12f60a1880d09852c9f0c59c5cf6
    3.2.0.0:
      viTags:
-      - Recommended
-      - Latest
+      - old
      viChangeLog: https://downloads.haskell.org/~cabal/cabal-install-3.2.0.0/changelog
      viArch:
        A_64:
@@ -1448,30 +1541,40 @@ ghcupDownloads:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-i386-unknown-linux.tar.xz
              dlHash: 2b3ac28549916de5f3379241797eaf60e84b6c001f2abbe73d9fadbbaf768e93
-    3.4.0.0-rc4:
+    3.4.0.0:
      viTags:
-      - Prerelease
+      - Recommended
+      - Latest
      viChangeLog: https://github.com/haskell/cabal/blob/master/release-notes/cabal-install-3.4.0.0.md
      viArch:
        A_64:
          Linux_Ubuntu:
-            unknown_versioning: &cabal-3400rc4-ubuntu
-              dlUri: http://oleg.fi/cabal-install-3.4.0.0-rc4/cabal-install-3.4.0.0-x86_64-ubuntu-16.04.tar.xz
-              dlHash: a1be168876816a624b206c55596d9bb5f442541c889ee2438d664698122b9ffe
+            unknown_versioning: &cabal-3400-ubuntu
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.4.0.0/cabal-install-3.4.0.0-x86_64-ubuntu-16.04.tar.xz
+              dlHash: cf28f9ffd763476aa2b1730d85cbf155d366fac541f78ee3951e8cb2d6de63e6
          Linux_Alpine:
            unknown_versioning:
-              dlUri: http://oleg.fi/cabal-install-3.4.0.0-rc4/cabal-install-3.4.0.0-x86_64-alpine-3.11.6-static-noofd.tar.xz
-              dlHash: 49dab6684483594e4c7c3e561ec477268002605253ad34701b471277efbe91bc
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.4.0.0/cabal-install-3.4.0.0-x86_64-alpine-3.11.6-static-noofd.tar.xz
+              dlHash: c74073fe79110946182e522fcadc8dcabf07c87583e8cf7801ed4e0c327241f6
          Linux_UnknownLinux:
-            unknown_versioning: *cabal-3400rc4-ubuntu
+            unknown_versioning: *cabal-3400-ubuntu
          Darwin:
            unknown_versioning:
-              dlUri: http://oleg.fi/cabal-install-3.4.0.0-rc4/cabal-install-3.4.0.0-x86_64-darwin-sierra.tar.xz
-              dlHash: a3f809a3388e90b9fdf52444e30ea9aad3894e2cbe53c37fc3311ceb106eda9e
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.4.0.0/cabal-install-3.4.0.0-x86_64-darwin-sierra.tar.xz
+              dlHash: cb10be9a53e856aa2d852fd88fb6944f138783ffe0ea84d93c9a69244e34ea91
          FreeBSD:
            unknown_versioning:
-              dlUri: http://oleg.fi/cabal-install-3.4.0.0-rc4/cabal-install-3.4.0.0-x86_64-freebsd-12.1-release.tar.xz
-              dlHash: 9705e16d03497b46be4ad477e6c64d10890af853eafa8a9adf6dba89aa9e05f7
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.4.0.0/cabal-install-3.4.0.0-x86_64-freebsd-12.1-release.tar.xz
+              dlHash: a1e2db664ec00e42a1e071a4181f6476f6e0bad321f1ddc0cf27831119f4c6d4
+        A_32:
+          Linux_UnknownLinux:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.4.0.0/cabal-install-3.4.0.0-i386-debian-9.tar.xz
+              dlHash: ef3750644a53f7b1fad141b2ad02d4c7a3b239ec0cbfa7f0528fb02c1dfcebce
+          Linux_Alpine:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/ghcup/unofficial-bindists/cabal/3.4.0.0/cabal-install-3.4.0.0-i386-alpine-linux-musl.tar.gz
+              dlHash: 95adb65f3a72aa8d9ce83685bc06e1eee5b801f56e204e27e957e8a35abd9cf8
  GHCup:
    0.1.12:
      viTags:
--- a/lib/GHCup.hs
+++ b/lib/GHCup.hs
@@ -1314,12 +1314,17 @@ upgradeGHCup dls mtarget force pfreq = do
  tmp   <- lift withGHCupTmpDir
  let fn = [rel|ghcup|]
  p <- liftE $ download dli tmp (Just fn)
-  let fullDest = fromMaybe (binDir </> fn) mtarget
-  liftIO $ hideError NoSuchThing $ deleteFile fullDest
+  let destDir = dirname destFile
+      destFile = fromMaybe (binDir </> fn) mtarget
+  lift $ $(logDebug) [i|mkdir -p #{toFilePath destDir}|]
+  liftIO $ createDirRecursive' destDir
+  lift $ $(logDebug) [i|rm -f #{toFilePath destFile}|]
+  liftIO $ hideError NoSuchThing $ deleteFile destFile
+  lift $ $(logDebug) [i|cp #{toFilePath p} #{toFilePath destFile}|]
  handleIO (throwE . CopyError . show) $ liftIO $ copyFile p
-                                                           fullDest
+                                                           destFile
                                                           Overwrite
-  lift $ chmod_755 fullDest
+  lift $ chmod_755 destFile
  pure latestVer
Author	SHA1	Message	Date
Julian Ospald	f964382175	Tighten checks, alpine 32bit bindists is 1st class	2021-02-21 15:37:05 +01:00
Julian Ospald	0c7f60fae6	Add more alpine 32bit bindists	2021-02-21 15:35:33 +01:00
Julian Ospald	413e63d1ca	Update hasufell.de hosted bindists to webhost.haskell.org	2021-02-21 15:34:55 +01:00
Julian Ospald	8b000f4e48	Add cabal-3.4.0.0 final release	2021-02-20 23:30:28 +01:00
Julian Ospald	b0522507be	Merge branch 'PR/ubunbu-20.10-update-reqs/110'	2021-02-16 16:40:03 +01:00
Julian Ospald	d4bcf7021e	Merge branch 'PR/fix-109'	2021-02-16 16:26:13 +01:00
Julian Ospald	48cf0b1f67	Update libffi req for ubuntu groovy Fixed #110	2021-02-16 14:41:49 +01:00
Julian Ospald	d82e189c01	Fix failed ghcup upgrade if destination dir doesn't exist Fixes #109	2021-02-16 14:37:17 +01:00
Julian Ospald	e5a60d1b9a	Merge branch 'ghc-8.10.4'	2021-02-06 22:39:52 +01:00
Julian Ospald	ff067351cb	Add GHC-8.10.4	2021-02-06 14:28:58 +01:00