hasufell/ghcup-hs
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'issue-266'

Browse Source
This commit is contained in:
Julian Ospald 2021-10-13 22:09:18 +02:00
commit 09d2a1e815
Signed by: hasufell
GPG Key ID: 3786C5262ECB4A3F
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cabal.project
View File

@ -9,8 +9,18 @@ package ghcup
flags: +tui flags: +tui
constraints: http-io-streams -brotli, constraints: http-io-streams -brotli,
any.Cabal ==3.4.0.0 || ==3.6.2.0 any.Cabal ==3.4.0.0 || ==3.6.2.0,
any.aeson >= 2.0.1.0
source-repository-package
type: git
location: https://github.com/hasufell/aeson-pretty.git
tag: e902ab866bb41d990b66af3644aeb352ff7aaf6f
source-repository-package
type: git
location: https://github.com/hasufell/HsYAML-aeson.git
tag: b4b4ab8592918b52a9f2e5bb0c5a795b9721b4f3
package libarchive package libarchive
flags: -system-libarchive flags: -system-libarchive
@ -21,4 +31,7 @@ package aeson-pretty
package cabal-plan package cabal-plan
flags: -exe flags: -exe
package aeson
flags: +ordered-keymap
allow-newer: base, ghc-prim, template-haskell, language-c allow-newer: base, ghc-prim, template-haskell, language-c

4
ghcup.cabal
View File

@ -92,7 +92,7 @@ library
-fwarn-incomplete-record-updates -fwarn-incomplete-record-updates
build-depends: build-depends:
, aeson >=1.4 && <1.6 , aeson >=1.4
, async >=0.8 && <2.3 , async >=0.8 && <2.3
, base >=4.13 && <5 , base >=4.13 && <5
, base16-bytestring >=0.1.1.6 && <1.1 , base16-bytestring >=0.1.1.6 && <1.1
@ -189,7 +189,7 @@ executable ghcup
-fwarn-incomplete-record-updates -threaded -fwarn-incomplete-record-updates -threaded
build-depends: build-depends:
, aeson >=1.4 && <1.6 , aeson >=1.4
, aeson-pretty ^>=0.8.8 , aeson-pretty ^>=0.8.8
, async ^>=2.2.3 , async ^>=2.2.3
, base >=4.13 && <5 , base >=4.13 && <5

4
lib/GHCup/Types/JSON.hs
View File

@ -28,9 +28,9 @@ import GHCup.Utils.Logger () -- TH is broken shite and nee
-- This is due to the boot file. -- This is due to the boot file.
import Control.Applicative ( (<|>) ) import Control.Applicative ( (<|>) )
import Data.Aeson import Data.Aeson hiding (Key)
import Data.Aeson.TH import Data.Aeson.TH
import Data.Aeson.Types import Data.Aeson.Types hiding (Key)
import Data.List.NonEmpty ( NonEmpty(..) ) import Data.List.NonEmpty ( NonEmpty(..) )
import Data.Text.Encoding as E import Data.Text.Encoding as E
import Data.Versions import Data.Versions