Fix changelog subcommand on darwin

Fix freebsd tui
Update alpine install-deps
2020-07-13 23:10:17 +02:00 · 2020-07-13 22:45:38 +02:00 · 2020-07-13 22:34:38 +02:00 · 2020-07-13 22:15:39 +02:00 · 2020-07-13 21:29:13 +02:00 · 2020-07-13 21:17:01 +02:00
13 changed files with 72 additions and 58 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,10 @@ dist-newstyle/
 cabal.project.local
 .stack-work/
 bin/
+/*.prof
+/*.ps
+/*.hp
+tags
+TAGS
+/tmp/
+.entangled
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -150,7 +150,7 @@ release:linux:64bit:
    - ./.gitlab/before_script/linux/alpine/install_deps.sh
  variables:
    ARTIFACT: "x86_64-linux-ghcup"
-    GHC_VERSION: "8.10.1"
+    GHC_VERSION: "8.8.3"
    CABAL_VERSION: "3.2.0.0"


@@ -162,7 +162,7 @@ release:linux:32bit:
    - ./.gitlab/before_script/linux/alpine/install_deps.sh
  variables:
    ARTIFACT: "i386-linux-ghcup"
-    GHC_VERSION: "8.10.1"
+    GHC_VERSION: "8.8.3"
    CABAL_VERSION: "3.2.0.0"


@@ -177,7 +177,7 @@ release:darwin:
    - ./.gitlab/before_script/darwin/install_deps.sh
  variables:
    ARTIFACT: "x86_64-apple-darwin-ghcup"
-    GHC_VERSION: "8.10.1"
+    GHC_VERSION: "8.8.3"
    CABAL_VERSION: "3.2.0.0"
    MACOSX_DEPLOYMENT_TARGET: "10.7"

@@ -193,5 +193,6 @@ release:freebsd:
    - ./.gitlab/before_script/freebsd/install_deps.sh
  variables:
    ARTIFACT: "x86_64-portbld-freebsd-ghcup"
-    GHC_VERSION: "8.10.1"
+    GHC_VERSION: "8.8.3"
+    CABAL_VERSION: "3.2.0.0"

--- a/.gitlab/before_script/linux/alpine/install_deps.sh
+++ b/.gitlab/before_script/linux/alpine/install_deps.sh
@@ -23,26 +23,13 @@ ln -sf libncursesw.so.6 /usr/lib/libtinfow.so.6
 ln -sf libtinfow.so.6 /usr/lib/libtinfow.so

 if [ "${BIT}" = "32" ] ; then
-	curl -sSfL https://downloads.haskell.org/~ghcup/0.1.5/i386-linux-ghcup-0.1.5 > ./ghcup-bin
+	curl -sSfL https://downloads.haskell.org/ghcup/i386-linux-ghcup > ./ghcup-bin
 else
-	curl -sSfL https://downloads.haskell.org/~ghcup/0.1.5/x86_64-linux-ghcup-0.1.5 > ./ghcup-bin
+	curl -sSfL https://downloads.haskell.org/ghcup/x86_64-linux-ghcup > ./ghcup-bin
 fi
 chmod +x ghcup-bin
-./ghcup-bin upgrade
 ./ghcup-bin install ${GHC_VERSION}
-# ./ghcup-bin install-cabal ${CABAL_VERSION}
-# install cabal-3.2.0.0
-if [ "${BIT}" = "32" ] ; then
-	curl -sSfL -o cabal-install-3.2.0.0-i386-alpine-linux-musl.tar.xz 'https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.2.0.0-i386-alpine-linux-musl.tar.xz&dl=1'
-	tar xf cabal-install-3.2.0.0-i386-alpine-linux-musl.tar.xz
-	cp cabal-install-3.2.0.0-i386-alpine-linux-musl "${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin/cabal"
-else
-	curl -sSfL -o cabal-install-3.2.0.0-x86_64-alpine-linux-musl.tar.xz 'https://hasufell.de/d/d3e215db133e4fcaa61e/files/?p=/cabal-install-3.2.0.0-x86_64-alpine-linux-musl.tar.xz&dl=1'
-	tar xf cabal-install-3.2.0.0-x86_64-alpine-linux-musl.tar.xz
-	cp cabal-install-3.2.0.0-x86_64-alpine-linux-musl "${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin/cabal"
-fi
-chmod +x "${GHCUP_INSTALL_BASE_PREFIX}/.ghcup/bin/cabal"
-
+./ghcup-bin install-cabal ${CABAL_VERSION}

 # utils
 apk add --no-cache \
--- a/.gitlab/script/ghcup_release.sh
+++ b/.gitlab/script/ghcup_release.sh
@@ -22,7 +22,7 @@ if [ "${OS}" = "LINUX" ] ; then
 		ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections -optl-static' -ftui
 	fi
 elif [ "${OS}" = "FREEBSD" ] ; then
-	ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections' --constraint="zlib static"
+	ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections' --constraint="zlib static" -ftui
 else
 	ecabal build -w ghc-${GHC_VERSION} --constraint="zlib static" --constraint="lzma static" -ftui
 fi
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -20,5 +20,5 @@ ghcup set 8.8.3
 cabal update
 cabal build --constraint="zlib static" --constraint="lzma static" -ftui
 cp "$(cabal new-exec --verbose=0 --offline sh -- -c 'command -v ghcup')" .
-strip -s ghcup
+strip ./ghcup
 cp ghcup "./${ARTIFACT}"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Revision history for ghcup

+## 0.1.6 -- 2020-07-13
+
+* Create a new curses (brick) based TUI, accessible via `ghcup tui` #24
+* Support multiple installed versions of cabal #23
+* Improvements to `ghcup list` (show unavailable bindists for platform)
+* Fix redhat downloads #29
+* Support for hadrian bindists (fixes alpine-8.10.1) #31
+* Add FreeBSD bindists 8.6.5 and 8.8.3
+* Fix memory leak during unpack
+
 ## 0.1.5 -- 2020-04-30

 * Fix errors when PATH variable contains path components that are actually files
--- a/app/ghcup/BrickMain.hs
+++ b/app/ghcup/BrickMain.hs
@@ -283,7 +283,11 @@ changelog' AppState {..} (_, ListResult {..}) = do
    Nothing -> pure $ Left
      [i|Could not find ChangeLog for #{lTool}, version #{prettyVer lVer}|]
    Just uri -> do
-      exec "xdg-open" True [serializeURIRef' uri] Nothing Nothing >>= \case
+      let cmd = case _rPlatform pfreq of
+                  Darwin  -> "open"
+                  Linux _ -> "xdg-open"
+                  FreeBSD -> "xdg-open"
+      exec cmd True [serializeURIRef' uri] Nothing Nothing >>= \case
        Right _ -> pure $ Right ()
        Left  e -> pure $ Left [i|#{e}|]

--- a/app/ghcup/Main.hs
+++ b/app/ghcup/Main.hs
@@ -1308,9 +1308,14 @@ Make sure to clean up #{tmpdir} afterwards.|])
                  pure ExitSuccess
                Just uri -> do
                  let uri' = T.unpack . decUTF8Safe . serializeURIRef' $ uri
+                      cmd = case _rPlatform pfreq of
+                              Darwin  -> "open"
+                              Linux _ -> "xdg-open"
+                              FreeBSD -> "xdg-open"
+
                  if clOpen
                    then
-                      exec "xdg-open"
+                      exec cmd
                           True
                           [serializeURIRef' uri]
                           Nothing
--- a/4
+++ b/4
@@ -28,7 +28,7 @@ eghcup() {
 download_ghcup() {
 	_plat="$(uname -s)"
 	_arch=$(uname -m)
-	_ghver="0.1.5"
+	_ghver="0.1.6"

    case "${_plat}" in
        "linux"|"Linux")
@@ -65,7 +65,7 @@ download_ghcup() {
 				*) die "Unknown architecture: ${_arch}"
 					;;
 			esac
-			_url=https://downloads.haskell.org/~ghcup/0.1.5/x86_64-apple-darwin-ghcup-0.1.5-p2 ;;
+			_url=https://downloads.haskell.org/~ghcup/${_ghver}/x86_64-apple-darwin-ghcup-${_ghver} ;;
        *) die "Unknown platform: ${_plat}"
 			;;
    esac
--- a/ghcup-0.0.2.json
+++ b/ghcup-0.0.2.json
@@ -2322,37 +2322,37 @@
      }
    },
    "GHCup": {
-      "0.1.5": {
+      "0.1.6": {
        "viArch": {
          "A_64": {
            "FreeBSD": {
              "unknown_versioning": {
-                "dlHash": "6dd57cc5958ef3a6ba7de22808d9292d31dada8af95277578b69be35fc090194",
+                "dlHash": "52707d89c3a4114b577855612d915c1e10295c4354e7e641b4a37a90c34fea53",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.5/x86_64-portbld-freebsd-ghcup-0.1.5"
+                "dlUri": "https://downloads.haskell.org/ghcup/0.1.6/x86_64-portbld-freebsd-ghcup-0.1.6"
              }
            },
            "Darwin": {
              "unknown_versioning": {
-                "dlHash": "456770c3b1510d44a0e401e0677faa9f5670ef81a11646f47cbba1b95404e788",
+                "dlHash": "bbf56b5820f97b5ee15d292803a2df06922d31b396f9322459f9e3782e78d59c",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.5/x86_64-apple-darwin-ghcup-0.1.5-p2"
+                "dlUri": "https://downloads.haskell.org/ghcup/0.1.6/x86_64-apple-darwin-ghcup-0.1.6"
              }
            },
            "Linux_UnknownLinux": {
              "unknown_versioning": {
-                "dlHash": "cfdb01dde77121859b5d90b6707238b54e23787fcbb3003e18ab52a5dbfee330",
+                "dlHash": "bdbec0cdf4c8511c4082dd83993d15034c0fbcb5722ecf418c1cee40667da8af",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.5/x86_64-linux-ghcup-0.1.5"
+                "dlUri": "https://downloads.haskell.org/ghcup/0.1.6/x86_64-linux-ghcup-0.1.6"
              }
            }
          },
          "A_32": {
            "Linux_UnknownLinux": {
              "unknown_versioning": {
-                "dlHash": "3707f60d703912709335dc0103fb1af5e5dfa83050825a8156b56bc81760b2a8",
+                "dlHash": "0366ed6c00862c3c002cdefc3e37523ad80e655387956c7ab58b268aaa6fae5d",
                "dlSubdir": null,
-                "dlUri": "https://downloads.haskell.org/~ghcup/0.1.5/i386-linux-ghcup-0.1.5"
+                "dlUri": "https://downloads.haskell.org/ghcup/0.1.6/i386-linux-ghcup-0.1.6"
              }
            }
          }
--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               ghcup
-version:            0.1.5
+version:            0.1.6
 synopsis:           ghc toolchain installer as an exe/library
 description:
  A rewrite of the shell script ghcup, for providing
--- a/lib/GHCup/Data/GHCupDownloads.hs
+++ b/lib/GHCup/Data/GHCupDownloads.hs
@@ -1039,32 +1039,32 @@ cabal_3200_64_alpine = DownloadInfo
    -------------


-ghcup_015_32_linux :: DownloadInfo
-ghcup_015_32_linux = DownloadInfo
-  [uri|https://downloads.haskell.org/~ghcup/0.1.5/i386-linux-ghcup-0.1.5|]
+ghcup_016_32_linux :: DownloadInfo
+ghcup_016_32_linux = DownloadInfo
+  [uri|https://downloads.haskell.org/ghcup/0.1.6/i386-linux-ghcup-0.1.6|]
  Nothing
-  "3707f60d703912709335dc0103fb1af5e5dfa83050825a8156b56bc81760b2a8"
+  "0366ed6c00862c3c002cdefc3e37523ad80e655387956c7ab58b268aaa6fae5d"


-ghcup_015_64_linux :: DownloadInfo
-ghcup_015_64_linux = DownloadInfo
-  [uri|https://downloads.haskell.org/~ghcup/0.1.5/x86_64-linux-ghcup-0.1.5|]
+ghcup_016_64_linux :: DownloadInfo
+ghcup_016_64_linux = DownloadInfo
+  [uri|https://downloads.haskell.org/ghcup/0.1.6/x86_64-linux-ghcup-0.1.6|]
  Nothing
-  "cfdb01dde77121859b5d90b6707238b54e23787fcbb3003e18ab52a5dbfee330"
+  "bdbec0cdf4c8511c4082dd83993d15034c0fbcb5722ecf418c1cee40667da8af"


-ghcup_015_64_freebsd :: DownloadInfo
-ghcup_015_64_freebsd = DownloadInfo
-  [uri|https://downloads.haskell.org/~ghcup/0.1.5/x86_64-portbld-freebsd-ghcup-0.1.5|]
+ghcup_016_64_freebsd :: DownloadInfo
+ghcup_016_64_freebsd = DownloadInfo
+  [uri|https://downloads.haskell.org/ghcup/0.1.6/x86_64-portbld-freebsd-ghcup-0.1.6|]
  Nothing
-  "6dd57cc5958ef3a6ba7de22808d9292d31dada8af95277578b69be35fc090194"
+  "52707d89c3a4114b577855612d915c1e10295c4354e7e641b4a37a90c34fea53"


-ghcup_015_64_darwin10_13 :: DownloadInfo
-ghcup_015_64_darwin10_13 = DownloadInfo
-  [uri|https://downloads.haskell.org/~ghcup/0.1.5/x86_64-apple-darwin-ghcup-0.1.5-p2|]
+ghcup_016_64_darwin10_13 :: DownloadInfo
+ghcup_016_64_darwin10_13 = DownloadInfo
+  [uri|https://downloads.haskell.org/ghcup/0.1.6/x86_64-apple-darwin-ghcup-0.1.6|]
  Nothing
-  "456770c3b1510d44a0e401e0677faa9f5670ef81a11646f47cbba1b95404e788"
+  "bbf56b5820f97b5ee15d292803a2df06922d31b396f9322459f9e3782e78d59c"



@@ -2005,7 +2005,7 @@ ghcupDownloads = M.fromList
    )
  , ( GHCup
    , M.fromList
-      [ ( [vver|0.1.5|]
+      [ ( [vver|0.1.6|]
        , VersionInfo
            [Recommended, Latest]
            (Just
@@ -2016,16 +2016,16 @@ ghcupDownloads = M.fromList
              [ ( A_64
                , M.fromList
                  [ ( Linux UnknownLinux
-                    , M.fromList [(Nothing, ghcup_015_64_linux)]
+                    , M.fromList [(Nothing, ghcup_016_64_linux)]
                    )
-                  , (Darwin , M.fromList [(Nothing, ghcup_015_64_darwin10_13)])
-                  , (FreeBSD, M.fromList [(Nothing, ghcup_015_64_freebsd)])
+                  , (Darwin , M.fromList [(Nothing, ghcup_016_64_darwin10_13)])
+                  , (FreeBSD, M.fromList [(Nothing, ghcup_016_64_freebsd)])
                  ]
                )
              , ( A_32
                , M.fromList
                  [ ( Linux UnknownLinux
-                    , M.fromList [(Nothing, ghcup_015_32_linux)]
+                    , M.fromList [(Nothing, ghcup_016_32_linux)]
                    )
                  ]
                )
--- a/lib/GHCup/Version.hs
+++ b/lib/GHCup/Version.hs
@@ -16,7 +16,7 @@ ghcupURL :: URI
 ghcupURL = [uri|https://www.haskell.org/ghcup/data/ghcup-0.0.2.json|]

 ghcUpVer :: PVP
-ghcUpVer = [pver|0.1.5|]
+ghcUpVer = [pver|0.1.6|]

 numericVer :: String
 numericVer = T.unpack . prettyPVP $ ghcUpVer
Author	SHA1	Message	Date
Julian Ospald	63c70ee74b	Fix changelog subcommand on darwin	2020-07-13 23:10:17 +02:00
Julian Ospald	2e0bbca2e0	Fix freebsd tui	2020-07-13 22:45:38 +02:00
Julian Ospald	b52fa23ca2	Update alpine install-deps	2020-07-13 22:34:38 +02:00
Julian Ospald	ba03b78f23	Update ghcup binaries	2020-07-13 22:15:39 +02:00
Julian Ospald	04ef472c15	Fix freebsd gitlab-ci	2020-07-13 21:29:13 +02:00
Julian Ospald	75cd8f2341	Fix stripping in travis	2020-07-13 21:17:01 +02:00
Julian Ospald	f2e26c1800	Fix release build	2020-07-13 20:48:37 +02:00
Julian Ospald	0f7dd597d2	Update .gitignore	2020-07-13 20:37:34 +02:00
Julian Ospald	fb0eba9201	Release 0.1.6	2020-07-13 20:31:14 +02:00
Julian Ospald	3c80929c38	Merge branch 'ghc-8.10.1'	2020-07-13 20:06:17 +02:00