Use homebrew llvm

Fix aarch64 darwin thanks to bgamari
Drop some mingw64 packages we don't need
2021-06-11 22:17:18 +02:00 · 2021-06-11 22:17:02 +02:00 · 2021-06-11 22:12:23 +02:00 · 2021-06-11 20:29:24 +02:00 · 2021-06-11 20:27:47 +02:00 · 2021-06-11 14:36:52 +02:00
10 changed files with 44 additions and 49 deletions
--- a/.gitlab/before_script/darwin/install_deps.sh
+++ b/.gitlab/before_script/darwin/install_deps.sh
@@ -7,33 +7,17 @@ set -eux
 mkdir -p "${TMPDIR}"

 if [ $ARCH = 'ARM64' ] ; then
-	curl -L -O https://downloads.haskell.org/~ghc/8.10.5/ghc-8.10.5-aarch64-apple-darwin.tar.xz
-	tar -xf ghc-*.tar.*
-	cd ghc-*
-	./configure --prefix="${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/ghc/8.10.5
-	make install
-	for i in "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/ghc/8.10.5/bin/*-8.10.5 ; do
-		ln -s "${i}" "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/${i##*/}
-	done
-	for x in "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/*-8.10.5 ; do
-		ln -s ${x##*/} ${x%-8.10.5}
-	done
-	unset x i
-	cd ..
-	rm -rf ghc-8.10.5 ghc-*.tar.*
-
-	curl -L -O https://github.com/haskell/cabal/files/6617482/cabal-install-3.5-arm64-darwin-11.4-bootstrapped.tar.gz
-	tar xf cabal-install-*
-	mv cabal "${GHCUP_INSTALL_BASE_PREFIX}"/.ghcup/bin/cabal
-	rm -rf cabal-install
+	export PATH="/opt/homebrew/opt/llvm/bin:$PATH"
+	curl -sSfL https://downloads.haskell.org/~ghcup/0.1.15.1/aarch64-apple-darwin-ghcup-0.1.15.1 > ./ghcup-bin
+	chmod +x ghcup-bin
 else
 	curl -sSfL https://downloads.haskell.org/~ghcup/x86_64-apple-darwin-ghcup > ./ghcup-bin
 	chmod +x ghcup-bin
-
 	./ghcup-bin upgrade -i -f
-	./ghcup-bin install ${GHC_VERSION}
-	./ghcup-bin set ${GHC_VERSION}
-	./ghcup-bin install-cabal ${CABAL_VERSION}
 fi

+./ghcup-bin install ${GHC_VERSION}
+./ghcup-bin set ${GHC_VERSION}
+./ghcup-bin install-cabal ${CABAL_VERSION}
+
 exit 0
--- a/.gitlab/script/ghcup_release.sh
+++ b/.gitlab/script/ghcup_release.sh
@@ -37,12 +37,12 @@ else
 fi

 mkdir out
-cp "$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup')" .
-ver=$(./ghcup --numeric-version)
+binary=$(ecabal new-exec -w ghc-${GHC_VERSION} --verbose=0 --offline sh -- -c 'command -v ghcup')
+ver=$("${binary}" --numeric-version)
 if [ "${OS}" = "DARWIN" ] ; then
-	strip ./ghcup
+	strip "${binary}"
 else
-	strip -s ./ghcup
+	strip -s "${binary}"
 fi
-cp ghcup out/${ARTIFACT}-${ver}
+cp "${binary}" out/${ARTIFACT}-${ver}

--- a/.gitlab/script/ghcup_version.sh
+++ b/.gitlab/script/ghcup_version.sh
@@ -109,11 +109,7 @@ else # test wget a bit
 fi
 [ "$(ghc --numeric-version)" = "${ghc_ver}" ]
 eghcup set 8.10.3
-eghcup list
-which ghc
 eghcup set 8.10.3
-eghcup list
-which ghc
 [ "$(ghc --numeric-version)" = "8.10.3" ]
 eghcup set ${GHC_VERSION}
 [ "$(ghc --numeric-version)" = "${ghc_ver}" ]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Revision history for ghcup

-## 0.1.15 -- ????-??-??
+## 0.1.15.1 -- ????-??-??

+* Add Apple Silicon support
 * Add windows support wrt [#130](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/130)
 * Add date to GHC bindist names created by ghcup
 * Warn when /tmp doesn't have 5GB or more of disk space
--- a/bootstrap-haskell.ps1
+++ b/bootstrap-haskell.ps1
@@ -67,7 +67,7 @@ function Add-EnvPath {

      $hiveKey = $envKey = $null
      try {
-          $hiveKey = [Microsoft.Win32.RegistryKey]::OpenBaseKey($hive, 'Default')
+          $hiveKey = [Microsoft.Win32.RegistryKey]::OpenRemoteBaseKey($hive, '')
          $envKey = $hiveKey.OpenSubKey($keyPath, $true)
          $rawPath = $envKey.GetValue('PATH', '', 'DoNotExpandEnvironmentNames')

@@ -78,8 +78,8 @@ function Add-EnvPath {
          }
      }
      finally {
-          if ($envKey) { $envKey.Dispose() }
-          if ($hiveKey) { $hiveKey.Dispose() }
+          if ($envKey) { $envKey.Close() }
+          if ($hiveKey) { $hiveKey.Close() }
      }
  }
 }
@@ -272,15 +272,15 @@ if (!(Test-Path -Path ('{0}' -f $MsysDir))) {
      $ghcBuildDeps = $Quick
    } elseif (!($Silent)) {
      $ghcBuildDeps = $Host.UI.PromptForChoice('Install Dependencies'
-        , 'Install various dependencies to be able to build GHC itself and make use of ''ghcup compile'' command? (recommended, however this might take a while)'
+        , 'Install a standard set of mingw64 packages to be able to build various haskell packages requiring unix libraries? (recommended, however this might take a while... if you skip this, you might have to do it manually later)'
        , [System.Management.Automation.Host.ChoiceDescription[]] @('&Yes'
            '&No'), 0)
    } else {
      $ghcBuildDeps = 0
    }
    if ($ghcBuildDeps -eq 0) {
-      Print-Msg -msg 'Installing GHC Build Dependencies...'
-      Exec "$Bash" '-lc' 'pacman --noconfirm -S --needed git tar curl wget base-devel gettext binutils autoconf make libtool automake python p7zip patch unzip mingw-w64-x86_64-toolchain mingw-w64-x86_64-gcc mingw-w64-x86_64-gdb mingw-w64-x86_64-python2 mingw-w64-x86_64-python3-sphinx'
+      Print-Msg -msg 'Installing Dependencies...'
+      Exec "$Bash" '-lc' 'pacman --noconfirm -S --needed git tar curl wget base-devel gettext binutils autoconf make libtool automake pkgconf python p7zip patch unzip'
    }

    Print-Msg -msg 'Updating SSL root certificate authorities...'
@@ -398,3 +398,4 @@ if ((Get-Process -ID $PID).ProcessName.StartsWith("bootstrap-haskell")) {
  # aED5Ujwyq3Qre+TGVRUqwkEauDhQiX2A008G00fRO6+di6yJRCRn5eaRAbdU3Xww
  # E5VhEwLBnwzWrvLKtdEclhgUCo5Tq87QMXVdgX4aRmunl4ZE+Q==
 # SIG # End signature block
+
--- a/cabal.project
+++ b/cabal.project
@@ -11,6 +11,11 @@ source-repository-package
    location: https://github.com/Bodigrim/tar
    tag: ac197ec7ea4838dc2b4e22b9b888b080cedf29cf

+source-repository-package
+    type: git
+    location: https://github.com/bgamari/terminal-size
+    tag: 34ea816bd63f75f800eedac12c6908c6f3736036
+
 constraints: http-io-streams -brotli

 package libarchive
--- a/ghcup-0.0.5.yaml
+++ b/ghcup-0.0.5.yaml
@@ -1631,11 +1631,11 @@ ghcupDownloads:
              dlUri: https://downloads.haskell.org/~ghc/8.10.5/ghc-8.10.5-x86_64-apple-darwin.tar.xz
              dlSubdir: ghc-8.10.5
              dlHash: ef0f47eff8962d58fa447123636cf8ef31c1e5b2d0ae90177d3388861ddf4a22
-          # FreeBSD:
-          #   unknown_versioning:
-          #     dlUri: https://downloads.haskell.org/~ghc/8.10.5/ghc-8.10.5-x86_64-portbld-freebsd.tar.xz
-          #     dlSubdir: ghc-8.10.5
-          #     dlHash: c9776a2ccf9629b03e967206a507fcdcb6c5189800a626e9461ababf6733c357
+          FreeBSD:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/ghc/8.10.5/ghc-8.10.5-x86_64-portbld-freebsd.tar.xz
+              dlSubdir: ghc-8.10.5
+              dlHash: 11a0b490bfb2f57b5bc87c69c197542eafce1b4991cc22f625179a6c6e567834
          Windows:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/~ghc/8.10.5/ghc-8.10.5-x86_64-unknown-mingw32.tar.xz
@@ -1665,6 +1665,11 @@ ghcupDownloads:
              dlUri: https://downloads.haskell.org/~ghc/8.10.5/ghc-8.10.5-aarch64-deb10-linux.tar.xz
              dlSubdir: ghc-8.10.5
              dlHash: 9a085cd8a7f8e0ace21ac67dbf659a56fcf41564b48817ba42cd8a1aac7f0ddc
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghc/8.10.5/ghc-8.10.5-aarch64-apple-darwin.tar.xz
+              dlSubdir: ghc-8.10.5
+              dlHash: 03684e70ff03d041b9a4e0f84c177953a241ab8ec7a028c72fa21ac67e66cb09
        A_ARM:
          Linux_UnknownLinux:
            unknown_versioning:
@@ -2008,6 +2013,11 @@ ghcupDownloads:
            unknown_versioning:
              dlUri: https://downloads.haskell.org/~cabal/cabal-install-3.4.0.0/cabal-install-3.4.0.0-aarch64-ubuntu-18.04.tar.xz
              dlHash: 04d378347896dfdc3510b192b97489815cfa5d692f46e2758da0f789e682b8f0
+          Darwin:
+            unknown_versioning:
+              dlUri: https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal/3.4.0.0/cabal-install-3.4.0.0-aarch64-darwin-big-sur.tar.xz
+              dlHash: 46d8f96446a6bcdb81b3a9fbc14b137dc4f08436b46fe6446c5fba7bcb9b3d75
+
        A_ARM:
          Linux_UnknownLinux:
            unknown_versioning:
--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -1,6 +1,6 @@
 cabal-version:   3.0
 name:            ghcup
-version:         0.1.15
+version:         0.1.15.1
 license:         LGPL-3.0-only
 license-file:    LICENSE
 copyright:       Julian Ospald 2020
@@ -115,7 +115,7 @@ library
    , generics-sop          ^>=0.5
    , haskus-utils-types    ^>=1.5
    , haskus-utils-variant  >=3.0        && <3.2
-    , lzma-static           ^>=5.2.5.2
+    , lzma-static           ^>=5.2.5.3
    , megaparsec            >=8.0.0      && <9.1
    , monad-logger          ^>=0.3.31
    , mtl                   ^>=2.2
--- a/lib/GHCup/Platform.hs
+++ b/lib/GHCup/Platform.hs
@@ -98,7 +98,6 @@ getPlatform = do
        either (const Nothing) Just
          . versioning
          -- TODO: maybe do this somewhere else
-          . getMajorVersion
          . decUTF8Safe'
        <$> getDarwinVersion
      pure $ PlatformResult { _platform = Darwin, _distroVersion = ver }
@@ -112,7 +111,6 @@ getPlatform = do
  lift $ $(logDebug) [i|Identified Platform as: #{prettyShow pfr}|]
  pure pfr
 where
-  getMajorVersion = T.intercalate "." . take 2 . T.split (== '.')
  getFreeBSDVersion = lift $ fmap _stdOut $ executeOut "freebsd-version" [] Nothing
  getDarwinVersion = lift $ fmap _stdOut $ executeOut "sw_vers"
                                                        ["-productVersion"]
--- a/stack.yaml
+++ b/stack.yaml
@@ -27,8 +27,8 @@ extra-deps:
  - hspec-core-2.7.10@sha256:2aba6ea126442b29e8183ab27f1c811706b19b1d83b02f193a896f6fc1589d13,4621
  - hspec-discover-2.7.10@sha256:d08bf5dd785629f589571477d9beb7cd91529471bd89f39517c1cb4b9b38160f,2184
  - hspec-golden-aeson-0.9.0.0@sha256:aa17274114026661ba4dfc9c60c230673c8f408bd86482fd611d2d5cb6aff996,2179
-  - lzma-static-5.2.5.2@sha256:ac38dcad9ab423342a72ba48415bd75f62234e9c9e11831495b75603b5a060f6,7184
  - libarchive-3.0.2.1@sha256:40ebf2a278e585802427bc58826867208bb33822f63d56107a1fcc3ca04d691d,10990
+  - lzma-static-5.2.5.3@sha256:2758ee58c35992fcf7db78e98684c357a16a82fa2a4e7c352a6c210c08c555d8,7308
  - os-release-1.0.1@sha256:1281c62081f438fc3f0874d3bae6a4887d5964ac25261ba06e29d368ab173467,2716
  - primitive-0.7.0.1@sha256:a381571c36edc7dca28b77fe8159b43c14c640087ec5946adacf949feec64231,3433
  - regex-posix-clib-2.7
Author	SHA1	Message	Date
Julian Ospald	d9fe4b8723	Use homebrew llvm	2021-06-11 22:17:18 +02:00
Julian Ospald	da2e7e0411	Fix aarch64 darwin thanks to bgamari	2021-06-11 22:17:02 +02:00
Julian Ospald	79d6a50e44	Drop some mingw64 packages we don't need	2021-06-11 22:12:23 +02:00
Julian Ospald	a13a5e5d20	Update darwin aarch64 install deps	2021-06-11 20:29:24 +02:00
Julian Ospald	82743dda2b	Merge remote-tracking branch 'origin/merge-requests/96'	2021-06-11 20:27:47 +02:00
jneira	6f80dd1fcc	Registry api win7 compat	2021-06-11 14:36:52 +02:00
Julian Ospald	1325dce493	Update darwin aarch64 install deps	2021-06-11 11:52:20 +02:00
Julian Ospald	ac21c19b7e	Remove unnecessary micro version stripping Since we can specify version bounds now, this is unnecessary.	2021-06-11 11:26:44 +02:00
Julian Ospald	2b4088d068	Add FreeBSD 8.10.5 tarballs	2021-06-10 18:24:42 +02:00
Julian Ospald	d86dc9b1d7	Fix release script	2021-06-10 15:39:50 +02:00
Julian Ospald	9982311c87	Update lzma-static	2021-06-10 15:10:53 +02:00
Julian Ospald	40c88d0b66	Add Darwin Big Sur AARCH64 binaries	2021-06-10 15:07:25 +02:00
Julian Ospald	e0ee1c2f94	Bump to 0.1.15.1	2021-06-10 14:00:26 +02:00
Julian Ospald	b4fa2780eb	Cleanup	2021-06-10 13:57:59 +02:00
Julian Ospald	df86183e97	Merge branch 'update-CI'	2021-06-10 13:57:36 +02:00