From d3505d4ee640b4af7d37a2623fef06e0f31c20eb Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Thu, 25 Feb 2021 15:33:52 +0100
Subject: [PATCH] Bump version to 0.1.13

---
 bootstrap-haskell    | 2 +-
 ghcup.cabal          | 6 ++++--
 lib/GHCup/Version.hs | 8 +++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bootstrap-haskell b/bootstrap-haskell
index 7c39696..519e175 100755
--- a/bootstrap-haskell
+++ b/bootstrap-haskell
@@ -69,7 +69,7 @@ _done() {
 download_ghcup() {
 	_plat="$(uname -s)"
 	_arch=$(uname -m)
-	_ghver="0.1.12"
+	_ghver="0.1.13"
 	_base_url="https://downloads.haskell.org/~ghcup"
 
     case "${_plat}" in
diff --git a/ghcup.cabal b/ghcup.cabal
index ef77118..3c4a079 100644
--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               ghcup
-version:            0.1.12
+version:            0.1.13
 synopsis:           ghc toolchain installer as an exe/library
 description:
   A rewrite of the shell script ghcup, for providing
@@ -336,11 +336,13 @@ library
     GHCup.Utils.Version.QQ
     GHCup.Version
 
+  other-modules:
+    Paths_ghcup
+
   default-extensions:
     Strict
     StrictData
 
-  -- other-modules:
   -- other-extensions:
   hs-source-dirs:  lib
 
diff --git a/lib/GHCup/Version.hs b/lib/GHCup/Version.hs
index c319ef4..2cb8030 100644
--- a/lib/GHCup/Version.hs
+++ b/lib/GHCup/Version.hs
@@ -12,13 +12,15 @@ Portability : POSIX
 -}
 module GHCup.Version where
 
-import           GHCup.Utils.Version.QQ
 import           GHCup.Types
+import           Paths_ghcup (version)
 
-import           Data.Versions
+import           Data.Version (Version(versionBranch))
+import           Data.Versions hiding (version)
 import           URI.ByteString
 import           URI.ByteString.QQ
 
+import qualified Data.List.NonEmpty            as NE
 import qualified Data.Text                     as T
 
 -- | This reflects the API version of the YAML.
@@ -27,7 +29,7 @@ ghcupURL = [uri|https://www.haskell.org/ghcup/data/ghcup-0.0.4.yaml|]
 
 -- | The current ghcup version.
 ghcUpVer :: PVP
-ghcUpVer = [pver|0.1.12|]
+ghcUpVer = PVP . NE.fromList . fmap fromIntegral $ versionBranch version
 
 -- | ghcup version as numeric string.
 numericVer :: String