diff --git a/app/ghcup-gen/GHCupDownloads.hs b/app/ghcup-gen/GHCupDownloads.hs index e5d34cd..99cfb33 100644 --- a/app/ghcup-gen/GHCupDownloads.hs +++ b/app/ghcup-gen/GHCupDownloads.hs @@ -832,6 +832,64 @@ ghc_883_32_musl = DownloadInfo + ----------------- + --[ GHC 8.10.1 ]-- + ----------------- + + + +ghc_8101_32_deb9 :: DownloadInfo +ghc_8101_32_deb9 = DownloadInfo + [uri|https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-i386-deb9-linux.tar.xz|] + (Just [rel|ghc-8.10.1|]) + "8b53eef2c827b5f634d72920a93c0c9dd66ea288691a2bfe28def45d3c686ee2" + + +ghc_8101_64_deb9 :: DownloadInfo +ghc_8101_64_deb9 = DownloadInfo + [uri|https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-x86_64-deb9-linux.tar.xz|] + (Just [rel|ghc-8.10.1|]) + "d1cf7886f27af070f3b7dbe1975a78b43ef2d32b86362cbe953e79464fe70761" + + +ghc_8101_64_deb10 :: DownloadInfo +ghc_8101_64_deb10 = DownloadInfo + [uri|https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-x86_64-deb10-linux.tar.xz|] + (Just [rel|ghc-8.10.1|]) + "c1e31d798b013699b3c0de4fda27fb4cda47f572df0e75e3bd598a3012060615" + + +ghc_8101_64_fedora :: DownloadInfo +ghc_8101_64_fedora = DownloadInfo + [uri|https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-x86_64-fedora27-linux.tar.xz|] + (Just [rel|ghc-8.10.1|]) + "3c4cd72b4806045779739e8f5d1658e30e57123d88c2c8966422cdbcae448470" + + +ghc_8101_64_centos :: DownloadInfo +ghc_8101_64_centos = DownloadInfo + [uri|https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-x86_64-centos7-linux.tar.xz|] + (Just [rel|ghc-8.10.1|]) + "0618b94854edc6be5302489df905e627820b71be6b66c950f5e3088fe92df0a1" + + +ghc_8101_64_darwin :: DownloadInfo +ghc_8101_64_darwin = DownloadInfo + [uri|https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-x86_64-apple-darwin.tar.xz|] + (Just [rel|ghc-8.10.1|]) + "65b1ca361093de4804a7e40b3e68178e1ef720f84f743641ec8d95e56a45b3a8" + + +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|]) + "cb13b645d103e2fba2eb8dfcc4e5f2fbd9550c00c4df42f342b4210436dcb8a8" + + + + + --------------------- --[ Cabal-2.4.1.0 ]-- --------------------- @@ -895,13 +953,39 @@ cabal_3000_64_darwin = DownloadInfo + --------------------- + --[ Cabal-3.2.0.0 ]-- + --------------------- + + +cabal_3200_32_linux :: DownloadInfo +cabal_3200_32_linux = DownloadInfo + [uri|https://downloads.haskell.org/cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-i386-unknown-linux.tar.xz|] + Nothing + "2b3ac28549916de5f3379241797eaf60e84b6c001f2abbe73d9fadbbaf768e93" + +cabal_3200_64_linux :: DownloadInfo +cabal_3200_64_linux = DownloadInfo + [uri|https://downloads.haskell.org/~cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-x86_64-unknown-linux.tar.xz|] + Nothing + "32d1f7cf1065c37cb0ef99a66adb405f409b9763f14c0926f5424ae408c738ac" + +cabal_3200_64_darwin :: DownloadInfo +cabal_3200_64_darwin = DownloadInfo + [uri|https://downloads.haskell.org/cabal/cabal-install-3.2.0.0/cabal-install-3.2.0.0-x86_64-apple-darwin17.7.0.tar.xz|] + Nothing + "9197c17d2ece0f934f5b33e323cfcaf486e4681952687bc3d249488ce3cbe0e9" + + + + ------------- --[ GHCup ]-- ------------- -ghcup_010_64_linux :: DownloadInfo -ghcup_010_64_linux = DownloadInfo +ghcup_001_64_linux :: DownloadInfo +ghcup_001_64_linux = DownloadInfo [uri|file:///home/maerwald/tmp/ghcup-exe|] Nothing "558126339252788a3d44a3f910417277c7ab656f0796b68bdc58afe73296b8cd" @@ -1420,7 +1504,7 @@ ghcupDownloads = M.fromList ) , ( [vver|8.6.5|] , VersionInfo - [Recommended] + [] (Just $ DownloadInfo [uri|https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-src.tar.xz|] (Just [rel|ghc-8.6.5|]) @@ -1570,7 +1654,7 @@ ghcupDownloads = M.fromList ) , ( [vver|8.8.3|] , VersionInfo - [Latest] + [Recommended] (Just $ DownloadInfo [uri|https://downloads.haskell.org/~ghc/8.8.3/ghc-8.8.3-src.tar.xz|] (Just [rel|ghc-8.8.3|]) @@ -1618,6 +1702,71 @@ ghcupDownloads = M.fromList ) ] ) + , ( [vver|8.10.1|] + , VersionInfo + [Latest] + (Just $ DownloadInfo + [uri|https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-src.tar.xz|] + (Just [rel|ghc-8.10.1|]) + "4e3b07f83a266b3198310f19f71e371ebce97c769b14f0d688f4cbf2a2a1edf5" + ) + $ M.fromList + [ ( A_64 + , M.fromList + [ ( Linux UnknownLinux + , M.fromList [(Nothing, ghc_8101_64_fedora)] + ) + , ( Linux Fedora + , M.fromList + [ (Nothing , ghc_8101_64_fedora) + , (Just [vers|27|], ghc_8101_64_fedora) + ] + ) + , ( Linux CentOS + , M.fromList + [ (Nothing , ghc_8101_64_centos) + , (Just [vers|7|], ghc_8101_64_centos) + ] + ) + , ( Linux AmazonLinux + , M.fromList [(Nothing, ghc_8101_64_centos)] + ) + , ( Linux Ubuntu + , M.fromList + [ (Nothing , ghc_8101_64_fedora) + , (Just [vers|16.04|], ghc_8101_64_deb9) + , (Just [vers|18.04|], ghc_8101_64_deb9) + ] + ) + , (Linux Mint, M.fromList [(Nothing, ghc_8101_64_deb10)]) + , ( Linux Debian + , M.fromList + [ (Nothing , ghc_8101_64_deb9) + , (Just [vers|9|] , ghc_8101_64_deb9) + , (Just [vers|10|], ghc_8101_64_deb10) + ] + ) + , (Darwin , M.fromList [(Nothing, ghc_8101_64_darwin)]) + , (Linux Alpine, M.fromList [(Nothing, ghc_8101_64_alpine)]) + ] + ) + , ( A_32 + , M.fromList + [ ( Linux UnknownLinux + , M.fromList [(Nothing, ghc_8101_32_deb9)] + ) + , (Linux Ubuntu, M.fromList [(Nothing, ghc_8101_32_deb9)]) + , (Linux Mint , M.fromList [(Nothing, ghc_8101_32_deb9)]) + , ( Linux Debian + , M.fromList + [ (Nothing , ghc_8101_32_deb9) + , (Just [vers|9|], ghc_8101_32_deb9) + ] + ) + ] + ) + ] + ) ] ) , ( Cabal @@ -1652,7 +1801,7 @@ ghcupDownloads = M.fromList ) , ( [vver|3.0.0.0|] , VersionInfo - [Recommended, Latest] + [] (Just $ DownloadInfo [uri|https://github.com/haskell/cabal/archive/cabal-install-v3.0.0.0.tar.gz|] (Just [rel|cabal-cabal-install-v3.0.0.0/cabal-install|]) @@ -1676,15 +1825,41 @@ ghcupDownloads = M.fromList ) ] ) + , ( [vver|3.2.0.0|] + , VersionInfo + [Recommended, Latest] + (Just $ DownloadInfo + [uri|https://github.com/haskell/cabal/archive/cabal-install-v3.2.0.0.tar.gz|] + (Just [rel|cabal-cabal-install-v3.2.0.0/cabal-install|]) + "77202358bdf0b481c09326268ce18880df14194c5aaa840f99510bdd1a124b75" + ) + $ M.fromList + [ ( A_64 + , M.fromList + [ ( Linux UnknownLinux + , M.fromList [(Nothing, cabal_3200_64_linux)] + ) + , (Darwin, M.fromList [(Nothing, cabal_3200_64_darwin)]) + ] + ) + , ( A_32 + , M.fromList + [ ( Linux UnknownLinux + , M.fromList [(Nothing, cabal_3200_32_linux)] + ) + ] + ) + ] + ) ] ) , ( GHCup , M.fromList - [ ( [vver|0.0.0|] + [ ( [vver|0.0.1|] , VersionInfo [Recommended, Latest] Nothing $ M.fromList [ ( A_64 , M.fromList - [(Linux UnknownLinux, M.fromList [(Nothing, ghcup_010_64_linux)])] + [(Linux UnknownLinux, M.fromList [(Nothing, ghcup_001_64_linux)])] ) ] ) diff --git a/app/ghcup/Main.hs b/app/ghcup/Main.hs index 4660c1b..924e298 100644 --- a/app/ghcup/Main.hs +++ b/app/ghcup/Main.hs @@ -18,7 +18,6 @@ import GHCup.Utils.Logger import GHCup.Utils.Prelude import GHCup.Version -import Control.Monad.Fail ( MonadFail ) import Control.Monad.Logger import Control.Monad.Reader import Control.Monad.Trans.Resource @@ -27,7 +26,6 @@ import Data.Char import Data.Either import Data.Functor import Data.List ( intercalate ) -import Data.Semigroup ( (<>) ) import Data.String.Interpolate import Data.Text ( Text ) import Data.Versions diff --git a/cabal.project b/cabal.project index e3a927d..9462b2b 100644 --- a/cabal.project +++ b/cabal.project @@ -1,6 +1,6 @@ packages: ./ghcup.cabal -with-compiler: ghc-8.6.5 +with-compiler: ghc-8.8.3 optimization: 2 @@ -15,4 +15,5 @@ package tar-bytestring constraints: http-io-streams -brotli -index-state: 2020-03-09T18:53:34Z +allow-newer: base + diff --git a/cabal.project.freeze b/cabal.project.freeze index 173fb6c..84de25e 100644 --- a/cabal.project.freeze +++ b/cabal.project.freeze @@ -1,34 +1,33 @@ -constraints: any.Cabal ==2.4.0.1, - any.Glob ==0.10.0, - any.HsOpenSSL ==0.11.4.17, +constraints: any.Cabal ==3.0.1.0, + any.HsOpenSSL ==0.11.4.18, HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -old-locale, any.IfElse ==0.85, - any.Only ==0.1, - any.QuickCheck ==2.13.2, + any.QuickCheck ==2.14, QuickCheck +templatehaskell, any.StateVar ==1.2, any.abstract-deque ==0.3, abstract-deque -usecas, - any.abstract-par ==0.3.3, - any.aeson ==1.4.6.0, + any.aeson ==1.4.7.1, aeson -bytestring-builder -cffi -developer -fast, any.aeson-pretty ==0.8.8, aeson-pretty -lib-only, + any.alex ==3.2.5, + alex +small_base, any.ansi-terminal ==0.10.3, ansi-terminal -example, any.ansi-wl-pprint ==0.6.9, ansi-wl-pprint -example, - any.array ==0.5.3.0, + any.array ==0.5.4.0, any.ascii-string ==1.0.1.4, any.assoc ==1.0.1, any.async ==2.2.2, async -bench, any.atomic-primops ==0.8.3, atomic-primops -debug, - any.attoparsec ==0.13.2.3, + any.attoparsec ==0.13.2.4, attoparsec -developer, any.auto-update ==0.1.6, - any.base ==4.12.0.0, + any.base ==4.13.0.0, any.base-compat ==0.11.1, any.base-compat-batteries ==0.11.1, any.base-orphans ==0.8.2, @@ -37,59 +36,53 @@ constraints: any.Cabal ==2.4.0.1, any.base64-bytestring ==1.0.0.3, any.bifunctors ==5.5.7, bifunctors +semigroups +tagged, - any.binary ==0.8.6.0, - any.binary-orphans ==1.0.1, + any.binary ==0.8.7.0, any.blaze-builder ==0.4.1.0, - any.bytestring ==0.10.8.2, + any.bytestring ==0.10.10.0, any.bytestring-builder ==0.10.8.2.0, bytestring-builder +bytestring_has_builder, - any.bytestring-handle ==0.1.0.6, - any.bzlib ==0.5.0.5, + any.bz2 ==1.0.0.2, + bz2 -cross +with-bzlib, + any.c2hs ==0.28.6, + c2hs +base3 -regression, any.cabal-doctest ==1.0.8, any.case-insensitive ==1.2.1.0, - any.cassava ==0.5.2.0, - cassava -bytestring--lt-0_10_4, any.cereal ==0.5.8.1, cereal -bytestring-builder, any.clock ==0.8, clock -llvm, any.cmdargs ==0.10.20, cmdargs +quotation -testprog, - any.code-page ==0.2, any.colour ==2.3.5, any.comonad ==5.0.6, comonad +containers +distributive +test-doctests, - any.conduit ==1.3.1.2, - any.conduit-extra ==1.3.4, - any.containers ==0.6.0.1, + any.concurrent-output ==1.10.11, + any.conduit ==1.3.2, + any.conduit-extra ==1.3.5, + any.containers ==0.6.2.1, any.contravariant ==1.5.2, contravariant +semigroups +statevar +tagged, - any.criterion ==1.5.6.2, - criterion -embed-data-files -fast, - any.criterion-measurement ==0.1.2.0, - criterion-measurement -fast, any.data-default-class ==0.1.2.0, any.data-default-instances-base ==0.1.0.1, any.deepseq ==1.4.4.0, any.deferred-folds ==0.9.10.1, - any.dense-linear-algebra ==0.1.0.0, - any.directory ==1.3.3.0 || ==1.3.6.0, + any.directory ==1.3.6.0, any.distributive ==0.6.1, distributive +semigroups +tagged, - any.dlist ==0.8.0.7, + any.dlist ==0.8.0.8, any.easy-file ==0.2.2, any.errors ==2.3.0, any.exceptions ==0.10.4, exceptions +transformers-0-4, - any.extra ==1.7, + any.extra ==1.7.1, any.fast-logger ==3.0.1, any.filepath ==1.4.2.1, any.focus ==1.0.1.3, any.foldl ==1.4.6, any.free ==5.1.3, any.fusion-plugin-types ==0.1.0, - any.generics-sop ==0.5.0.0, - any.ghc-boot-th ==8.6.5, + any.generics-sop ==0.5.1.0, + any.ghc-boot-th ==8.8.3, any.ghc-prim ==0.5.3, any.happy ==1.19.12, happy +small_base, @@ -108,7 +101,7 @@ constraints: any.Cabal ==2.4.0.1, any.hpath-filepath ==0.10.4, any.hpath-io ==0.13.1, any.hpath-posix ==0.13.1, - any.hsc2hs ==0.68.6, + any.hsc2hs ==0.68.7, hsc2hs -in-ghc-tree, any.http-io-streams ==0.1.2.0, http-io-streams -brotli, @@ -118,9 +111,9 @@ constraints: any.Cabal ==2.4.0.1, integer-logarithms -check-bounds +integer-gmp, any.io-streams ==1.5.1.0, io-streams -nointeractivetests, - any.js-flot ==0.8.3, - any.js-jquery ==3.3.1, any.language-bash ==0.9.0, + any.language-c ==0.8.3, + language-c -allwarnings +iecfpextension +separatesyb +usebytestrings, any.lifted-base ==0.2.3.12, any.list-t ==1.0.4, any.lockfree-queue ==0.2.3.1, @@ -129,16 +122,12 @@ constraints: any.Cabal ==2.4.0.1, math-functions +system-erf +system-expm1, any.megaparsec ==8.0.0, megaparsec -dev, - any.microstache ==1.0.1.1, any.mmorph ==1.1.3, any.monad-control ==1.0.2.3, any.monad-logger ==0.3.32, monad-logger +template_haskell, any.monad-loops ==0.4.3, monad-loops +base4, - any.monad-par ==0.3.5, - monad-par -chaselev -newgeneric, - any.monad-par-extras ==0.3.3, any.mono-traversable ==1.0.15.1, any.mtl ==2.2.2, any.mwc-random ==0.14.0.0, @@ -153,8 +142,7 @@ constraints: any.Cabal ==2.4.0.1, any.optics-th ==0.2, any.optics-vl ==0.2, any.optparse-applicative ==0.15.1.0, - any.parallel ==3.2.2.0, - any.parsec ==3.1.13.0, + any.parsec ==3.1.14.0, any.parser-combinators ==1.2.1, parser-combinators -dev, any.pretty ==1.1.3.6, @@ -164,7 +152,7 @@ constraints: any.Cabal ==2.4.0.1, any.primitive ==0.7.0.1, any.primitive-extras ==0.8, any.primitive-unlifted ==0.1.3.0, - any.process ==1.6.5.0 || ==1.6.8.0, + any.process ==1.6.8.0, any.profunctors ==5.5.2, any.random ==1.1, any.recursion-schemes ==5.1.3, @@ -182,11 +170,10 @@ constraints: any.Cabal ==2.4.0.1, semigroupoids +comonad +containers +contravariant +distributive +doctests +tagged +unordered-containers, any.semigroups ==0.19.1, semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +template-haskell +text +transformers +unordered-containers, - any.sop-core ==0.5.0.0, + any.sop-core ==0.5.0.1, any.split ==0.2.3.4, any.splitmix ==0.0.4, splitmix -optimised-mixer +random, - any.statistics ==0.15.2.0, any.stm ==2.5.0.0, any.stm-chans ==3.0.0.4, any.streaming-commons ==0.2.1.2, @@ -202,26 +189,23 @@ constraints: any.Cabal ==2.4.0.1, any.tagged ==0.8.6, tagged +deepseq +transformers, any.tar-bytestring ==0.6.3.1, - any.tasty ==1.2.3, - tasty +clock, - any.tasty-quickcheck ==0.10.1.1, - any.template-haskell ==2.14.0.0, + any.template-haskell ==2.15.0.0, any.terminal-progress-bar ==0.4.1, any.terminal-size ==0.3.2.1, - any.text ==1.2.3.1, + any.text ==1.2.4.0, any.text-conversions ==0.3.0, any.text-short ==0.1.3, text-short -asserts, any.th-abstraction ==0.3.2.0, - any.th-expand-syns ==0.4.5.0, + any.th-expand-syns ==0.4.6.0, any.th-lift ==0.8.1, any.th-lift-instances ==0.1.14, any.th-orphans ==0.13.9, any.th-reify-many ==0.1.9, any.these ==1.0.1, these +aeson +assoc +quickcheck +semigroupoids, - any.time ==1.8.0.2 || ==1.9.3, - any.time-compat ==1.9.2.2, + any.time ==1.9.3, + any.time-compat ==1.9.3, time-compat -old-locale, any.transformers ==0.5.6.2, any.transformers-base ==0.4.5.2, @@ -229,7 +213,6 @@ constraints: any.Cabal ==2.4.0.1, any.transformers-compat ==0.6.5, transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, any.typed-process ==0.2.6.0, - any.unbounded-delays ==0.1.1.0, any.unix ==2.7.2.2, any.unix-bytestring ==0.3.7.3, any.unix-compat ==0.5.2, @@ -246,12 +229,9 @@ constraints: any.Cabal ==2.4.0.1, vector +boundschecks -internalchecks -unsafechecks -wall, any.vector-algorithms ==0.8.0.3, vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, - any.vector-binary-instances ==0.2.5.1, any.vector-builder ==0.3.8, any.vector-th-unbox ==0.2.1.7, any.versions ==3.5.3, - any.wcwidth ==0.0.2, - wcwidth -cli +split-base, any.word8 ==0.1.3, any.zlib ==0.6.2.1, zlib -non-blocking-ffi -pkg-config, diff --git a/ghcup.cabal b/ghcup.cabal index 21675ef..d8a1cdd 100644 --- a/ghcup.cabal +++ b/ghcup.cabal @@ -22,7 +22,7 @@ source-repository head location: https://github.com/hasufell/ghcup-hs common HsOpenSSL - build-depends: HsOpenSSL >=0.11 + build-depends: HsOpenSSL >=0.11.4.18 common aeson build-depends: aeson >=1.4 @@ -48,8 +48,8 @@ common binary common bytestring build-depends: bytestring >=0.10 -common bzlib - build-depends: bzlib >=0.5.0.5 +common bz2 + build-depends: bz2 >=0.5.0.5 common case-insensitive build-depends: case-insensitive >=1.2.1.0 @@ -225,7 +225,7 @@ library , attoparsec , binary , bytestring - , bzlib + , bz2 , case-insensitive , concurrent-output , containers @@ -303,20 +303,20 @@ executable ghcup , bytestring , containers , haskus-utils-variant - , monad-logger - , megaparsec - , mtl - , optparse-applicative - , text - , versions , hpath , hpath-io + , megaparsec + , monad-logger + , mtl + , optparse-applicative , pretty-terminal , resourcet , string-interpolate , table-layout + , text , uri-bytestring , utf8-string + , versions -- main-is: Main.hs @@ -335,28 +335,27 @@ executable ghcup-gen , aeson-pretty , bytestring , containers - , safe-exceptions , haskus-utils-variant + , hpath , monad-logger , mtl , optics , optparse-applicative - , text - , versions - , hpath , pretty-terminal , resourcet + , safe-exceptions , string-interpolate , table-layout + , text , transformers , uri-bytestring , utf8-string + , versions -- main-is: Main.hs - other-modules: - GHCupDownloads - Validate + other-modules: GHCupDownloads + Validate -- other-extensions: build-depends: ghcup diff --git a/lib/GHCup.hs b/lib/GHCup.hs index 8097dd6..9dd3917 100644 --- a/lib/GHCup.hs +++ b/lib/GHCup.hs @@ -28,10 +28,8 @@ import GHCup.Version import Control.Applicative import Control.Exception.Safe import Control.Monad -import Control.Monad.Fail ( MonadFail ) import Control.Monad.Logger import Control.Monad.Reader -import Control.Monad.Trans.Class ( lift ) import Control.Monad.Trans.Resource hiding ( throwM ) import Data.ByteString ( ByteString ) @@ -51,8 +49,6 @@ import Prelude hiding ( abs ) import System.IO.Error import System.Posix.FilePath ( getSearchPath ) -import System.Posix.RawFilePath.Directory.Errors - ( hideError ) import qualified Data.ByteString as B import qualified Data.Map.Strict as Map diff --git a/lib/GHCup/Download.hs b/lib/GHCup/Download.hs index f554644..9fa2349 100644 --- a/lib/GHCup/Download.hs +++ b/lib/GHCup/Download.hs @@ -23,10 +23,8 @@ import GHCup.Utils.Prelude import Control.Applicative import Control.Exception.Safe import Control.Monad -import Control.Monad.Fail ( MonadFail ) import Control.Monad.Logger import Control.Monad.Reader -import Control.Monad.Trans.Class ( lift ) import Control.Monad.Trans.Resource hiding ( throwM ) import Data.Aeson @@ -57,8 +55,6 @@ import "unix" System.Posix.IO.ByteString hiding ( fdWrite ) import "unix-bytestring" System.Posix.IO.ByteString ( fdWrite ) -import System.Posix.RawFilePath.Directory.Errors - ( hideError ) import System.ProgressBar import URI.ByteString import URI.ByteString.QQ diff --git a/lib/GHCup/Platform.hs b/lib/GHCup/Platform.hs index 9c1a9f0..02273da 100644 --- a/lib/GHCup/Platform.hs +++ b/lib/GHCup/Platform.hs @@ -22,7 +22,6 @@ import Control.Exception.Safe import Control.Monad import Control.Monad.Logger import Control.Monad.Reader -import Control.Monad.Trans.Class ( lift ) import Data.ByteString ( ByteString ) import Data.Foldable import Data.Maybe diff --git a/lib/GHCup/Types/JSON.hs b/lib/GHCup/Types/JSON.hs index c87822f..c242316 100644 --- a/lib/GHCup/Types/JSON.hs +++ b/lib/GHCup/Types/JSON.hs @@ -18,7 +18,6 @@ import GHCup.Utils.Prelude import Data.Aeson import Data.Aeson.TH import Data.Aeson.Types -import Data.Text.Encoding ( decodeUtf8 ) import Data.Text.Encoding as E import Data.Versions import Data.Word8 diff --git a/lib/GHCup/Utils.hs b/lib/GHCup/Utils.hs index 1e7350c..69992b0 100644 --- a/lib/GHCup/Utils.hs +++ b/lib/GHCup/Utils.hs @@ -22,10 +22,8 @@ import GHCup.Utils.Prelude import Control.Applicative import Control.Exception.Safe import Control.Monad -import Control.Monad.Fail ( MonadFail ) import Control.Monad.Logger import Control.Monad.Reader -import Control.Monad.Trans.Class ( lift ) import Data.Attoparsec.ByteString import Data.ByteString ( ByteString ) import Data.List diff --git a/lib/GHCup/Utils/Prelude.hs b/lib/GHCup/Utils/Prelude.hs index ef74a7e..dee954c 100644 --- a/lib/GHCup/Utils/Prelude.hs +++ b/lib/GHCup/Utils/Prelude.hs @@ -17,7 +17,6 @@ import Control.Monad.IO.Class import Control.Monad.Trans.Class ( lift ) import Data.Bifunctor import Data.ByteString ( ByteString ) -import Data.Monoid ( (<>) ) import Data.String import Data.Text ( Text ) import Data.Versions diff --git a/lib/GHCup/Utils/Version/QQ.hs b/lib/GHCup/Utils/Version/QQ.hs index e89e459..73b1deb 100644 --- a/lib/GHCup/Utils/Version/QQ.hs +++ b/lib/GHCup/Utils/Version/QQ.hs @@ -11,11 +11,9 @@ module GHCup.Utils.Version.QQ where import Data.Data import Data.Text ( Text ) import Data.Versions -import GHC.Base import Language.Haskell.TH import Language.Haskell.TH.Quote ( QuasiQuoter(..) ) -import Language.Haskell.TH.Syntax ( Exp(..) - , Lift +import Language.Haskell.TH.Syntax ( Lift , dataToExpQ ) import qualified Data.Text as T @@ -33,12 +31,10 @@ deriving instance Data Mess deriving instance Lift Mess deriving instance Data PVP deriving instance Lift PVP -deriving instance Lift (NonEmpty Word) deriving instance Lift VSep deriving instance Data VSep deriving instance Lift VUnit deriving instance Data VUnit -instance Lift Text qq :: (Text -> Q Exp) -> QuasiQuoter qq quoteExp' = QuasiQuoter diff --git a/lib/GHCup/Version.hs b/lib/GHCup/Version.hs index eb405be..a0713e4 100644 --- a/lib/GHCup/Version.hs +++ b/lib/GHCup/Version.hs @@ -8,4 +8,4 @@ import GHCup.Utils.Version.QQ import Data.Versions ghcUpVer :: PVP -ghcUpVer = [pver|0.0.0|] +ghcUpVer = [pver|0.0.1|]