diff --git a/.github/workflows/cabal.project.yaml b/.github/workflows/cabal.project.yaml index b0173298..2d98824c 100644 --- a/.github/workflows/cabal.project.yaml +++ b/.github/workflows/cabal.project.yaml @@ -20,12 +20,14 @@ jobs: fail-fast: false matrix: os: [macOS-11, windows-latest, ubuntu-latest] - ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8"] + ghc: ["8.10.7", "9.0.2", "9.2.8", "9.4.8", "9.6.5"] include: - os: macOS-latest ghc: "9.2.8" - os: macOS-latest ghc: "9.4.8" + - os: macOS-latest + ghc: "9.6.5" steps: - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 54da0b1a..3c1bf170 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -21,7 +21,7 @@ jobs: name: Build linux binary runs-on: ${{ matrix.os }} env: - CABAL_VER: 3.10.2.0 + CABAL_VER: 3.10.3.0 JSON_VERSION: "0.0.8" AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -36,7 +36,7 @@ jobs: ARCH: 32 - os: ubuntu-latest ARTIFACT: "x86_64-linux-ghcup" - GHC_VER: 9.4.8 + GHC_VER: 9.6.5 ARCH: 64 steps: - name: Checkout code @@ -85,7 +85,7 @@ jobs: name: Build ARM binary runs-on: ${{ matrix.os }} env: - CABAL_VER: 3.6.2.0 + CABAL_VER: 3.10.3.0 JSON_VERSION: "0.0.8" AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -100,7 +100,7 @@ jobs: ARCH: ARM - os: [self-hosted, Linux, ARM64, maerwald] ARTIFACT: "aarch64-linux-ghcup" - GHC_VER: 9.4.8 + GHC_VER: 9.6.5 ARCH: ARM64 steps: - name: git config @@ -154,27 +154,28 @@ jobs: name: Build binary (Mac/Win) runs-on: ${{ matrix.os }} env: - CABAL_VER: 3.10.2.0 + CABAL_VER: 3.10.3.0 MACOSX_DEPLOYMENT_TARGET: 10.13 JSON_VERSION: "0.0.8" AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} S3_HOST: ${{ secrets.S3_HOST }} + LLVM_VER: 16 strategy: fail-fast: false matrix: include: - os: [self-hosted, macOS, ARM64] ARTIFACT: "aarch64-apple-darwin-ghcup" - GHC_VER: 9.4.8 + GHC_VER: 9.6.5 ARCH: ARM64 - os: macOS-11 ARTIFACT: "x86_64-apple-darwin-ghcup" - GHC_VER: 9.4.8 + GHC_VER: 9.6.5 ARCH: 64 - os: windows-latest ARTIFACT: "x86_64-mingw64-ghcup" - GHC_VER: 9.4.8 + GHC_VER: 9.6.5 ARCH: 64 steps: - name: Checkout code @@ -185,13 +186,8 @@ jobs: - if: matrix.ARCH == 'ARM64' && runner.os == 'macOS' name: Run build run: | - bash .github/scripts/brew.sh git coreutils llvm@13 autoconf automake - export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$HOME/.brew/opt/llvm@13/bin:$PATH" - export CC="$HOME/.brew/opt/llvm@13/bin/clang" - export CXX="$HOME/.brew/opt/llvm@13/bin/clang++" - export LD=ld - export AR="$HOME/.brew/opt/llvm@13/bin/llvm-ar" - export RANLIB="$HOME/.brew/opt/llvm@13/bin/llvm-ranlib" + bash .github/scripts/brew.sh git coreutils autoconf automake + export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$PATH" bash .github/scripts/build.sh env: ARTIFACT: ${{ matrix.ARTIFACT }} @@ -246,14 +242,14 @@ jobs: name: Build binary (FreeBSD) runs-on: [self-hosted, FreeBSD, X64] env: - CABAL_VER: 3.10.2.0 + CABAL_VER: 3.10.3.0 MACOSX_DEPLOYMENT_TARGET: 10.13 JSON_VERSION: "0.0.8" AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} S3_HOST: ${{ secrets.S3_HOST }} ARTIFACT: "x86_64-portbld-freebsd-ghcup" - GHC_VER: 9.4.8 + GHC_VER: 9.6.5 ARCH: 64 DISTRO: na RUNNER_OS: FreeBSD @@ -283,7 +279,7 @@ jobs: needs: "build-linux" runs-on: ${{ matrix.os }} env: - CABAL_VER: 3.10.2.0 + CABAL_VER: 3.10.3.0 JSON_VERSION: "0.0.8" strategy: matrix: @@ -295,12 +291,12 @@ jobs: DISTRO: Alpine - os: ubuntu-latest ARTIFACT: "x86_64-linux-ghcup" - GHC_VER: 9.4.8 + GHC_VER: 9.6.5 ARCH: 64 DISTRO: Alpine - os: ubuntu-latest ARTIFACT: "x86_64-linux-ghcup" - GHC_VER: 9.4.8 + GHC_VER: 9.6.5 ARCH: 64 DISTRO: Ubuntu @@ -361,7 +357,7 @@ jobs: needs: "build-arm" runs-on: ${{ matrix.os }} env: - CABAL_VER: 3.6.2.0 + CABAL_VER: 3.10.3.0 JSON_VERSION: "0.0.8" strategy: matrix: @@ -373,7 +369,7 @@ jobs: DISTRO: Ubuntu - os: [self-hosted, Linux, ARM64, maerwald] ARTIFACT: "aarch64-linux-ghcup" - GHC_VER: 9.4.8 + GHC_VER: 9.6.5 ARCH: ARM64 DISTRO: Ubuntu @@ -424,7 +420,7 @@ jobs: needs: "build-macwin" runs-on: ${{ matrix.os }} env: - CABAL_VER: 3.10.2.0 + CABAL_VER: 3.10.3.0 MACOSX_DEPLOYMENT_TARGET: 10.13 JSON_VERSION: "0.0.8" strategy: @@ -432,17 +428,17 @@ jobs: include: - os: [self-hosted, macOS, ARM64] ARTIFACT: "aarch64-apple-darwin-ghcup" - GHC_VER: 9.4.8 + GHC_VER: 9.6.5 ARCH: ARM64 DISTRO: na - os: macOS-11 ARTIFACT: "x86_64-apple-darwin-ghcup" - GHC_VER: 9.4.8 + GHC_VER: 9.6.5 ARCH: 64 DISTRO: na - os: windows-latest ARTIFACT: "x86_64-mingw64-ghcup" - GHC_VER: 9.4.8 + GHC_VER: 9.6.5 ARCH: 64 DISTRO: na @@ -500,11 +496,11 @@ jobs: needs: "build-freebsd" runs-on: [self-hosted, FreeBSD, X64] env: - CABAL_VER: 3.10.2.0 + CABAL_VER: 3.10.3.0 MACOSX_DEPLOYMENT_TARGET: 10.13 JSON_VERSION: "0.0.8" ARTIFACT: "x86_64-portbld-freebsd-ghcup" - GHC_VER: 9.4.8 + GHC_VER: 9.6.5 ARCH: 64 DISTRO: na RUNNER_OS: FreeBSD diff --git a/app/ghcup/BrickMain.hs b/app/ghcup/BrickMain.hs index fee22488..1f6225e9 100644 --- a/app/ghcup/BrickMain.hs +++ b/app/ghcup/BrickMain.hs @@ -34,8 +34,8 @@ import Brick AttrMap, EventM, Size(..), - Widget(..), - ViewportType (Vertical), + Widget(..), + ViewportType (Vertical), (<+>), (<=>)) import qualified Brick @@ -50,6 +50,7 @@ import Control.Exception.Safe #if !MIN_VERSION_base(4,13,0) import Control.Monad.Fail ( MonadFail ) #endif +import Control.Monad (when, forM_) import Control.Monad.Reader import Control.Monad.Trans.Except import Control.Monad.Trans.Resource @@ -60,7 +61,7 @@ import Data.List import Data.Maybe import Data.IORef (IORef, readIORef, newIORef, writeIORef, modifyIORef) import Data.Vector ( Vector - + ) import Data.Versions hiding (Lens') import Haskus.Utils.Variant.Excepts @@ -94,8 +95,8 @@ import Optics.Lens (Lens', lens, toLensVL) It is a FocusRing over many list's. Each list contains the information for each tool. Each list has an internal name (for Brick's runtime) and a label which we can use in rendering. This data-structure helps to reuse Brick.Widget.List and to navegate easily across -Consider this code as private. GenericSectionList should not be used directly as the FocusRing should be align with the Vector containing -the elements, otherwise you'd be focusing on a non-existent widget with unknown result (In theory the code is safe unless you have an empty section list). +Consider this code as private. GenericSectionList should not be used directly as the FocusRing should be align with the Vector containing +the elements, otherwise you'd be focusing on a non-existent widget with unknown result (In theory the code is safe unless you have an empty section list). - To build a SectionList use the safe constructor sectionList - To access sections use the lens provider sectionL and the name of the section you'd like to access @@ -116,8 +117,8 @@ makeLensesFor [("sectionListFocusRing", "sectionListFocusRingL"), ("sectionListE type SectionList n e = GenericSectionList n V.Vector e --- | Build a SectionList from nonempty list. If empty we could not defined sectionL lenses. -sectionList :: Foldable t +-- | Build a SectionList from nonempty list. If empty we could not defined sectionL lenses. +sectionList :: Foldable t => n -- The name of the section list -> [(n, t e)] -- a list of tuples (section name, collection of elements) -> Int @@ -129,14 +130,14 @@ sectionList name elements height , sectionListName = name } -- | This lens constructor, takes a name and looks if a section has such a name. --- Used to dispatch events to sections. It is a partial function only meant to +-- Used to dispatch events to sections. It is a partial function only meant to -- be used with the FocusRing inside GenericSectionList sectionL :: Eq n => n -> Lens' (GenericSectionList n t e) (L.GenericList n t e) sectionL section_name = lens g s where is_section_name = (== section_name) . L.listName g section_list = let elms = section_list ^. sectionListElementsL - zeroth = elms V.! 0 -- TODO: This crashes for empty vectors. + zeroth = elms V.! 0 -- TODO: This crashes for empty vectors. in fromMaybe zeroth (V.find is_section_name elms) s gl@(GenericSectionList _ elms _) list = case V.findIndex is_section_name elms of @@ -145,16 +146,16 @@ sectionL section_name = lens g s in gl & sectionListElementsL .~ new_elms moveDown :: (L.Splittable t, Ord n, Foldable t) => EventM n (GenericSectionList n t e) () -moveDown = do +moveDown = do ring <- use sectionListFocusRingL - case F.focusGetCurrent ring of + case F.focusGetCurrent ring of Nothing -> pure () Just l -> do -- If it is the last element, move to the first element of the next focus; else, just handle regular list event. current_list <- use (sectionL l) let current_idx = L.listSelected current_list list_length = current_list & length if current_idx == Just (list_length - 1) - then do + then do new_focus <- sectionListFocusRingL <%= F.focusNext case F.focusGetCurrent new_focus of Nothing -> pure () -- |- Optic.Zoom.zoom doesn't typecheck but Lens.Micro.Mtl.zoom does. It is re-exported by Brick @@ -170,10 +171,10 @@ moveUp = do current_list <- use (sectionL l) let current_idx = L.listSelected current_list if current_idx == Just 0 - then do + then do new_focus <- sectionListFocusRingL <%= F.focusPrev case F.focusGetCurrent new_focus of - Nothing -> pure () + Nothing -> pure () Just new_l -> Brick.zoom (toLensVL $ sectionL new_l) (Brick.modify L.listMoveToEnd) else Brick.zoom (toLensVL $ sectionL l) $ Brick.modify L.listMoveUp @@ -236,9 +237,9 @@ renderSectionList renderElem sectionFocus ge@(GenericSectionList focus elms slNa -- | Equivalent to listSelectedElement sectionListSelectedElement :: (Eq n, L.Splittable t, Traversable t, Semigroup (t e)) => GenericSectionList n t e -> Maybe (Int, e) sectionListSelectedElement generic_section_list = do - current_focus <- generic_section_list ^. sectionListFocusRingL & F.focusGetCurrent + current_focus <- generic_section_list ^. sectionListFocusRingL & F.focusGetCurrent let current_section = generic_section_list ^. sectionL current_focus - L.listSelectedElement current_section + L.listSelectedElement current_section {- Brick app data structures. @@ -313,7 +314,7 @@ app attrs dimAttrs = {- Drawing. -The section for creating our widgets. +The section for creating our widgets. -} @@ -349,7 +350,7 @@ drawNavigation dimAttrs BrickState{ _appSettings = as@BrickSettings{}, ..} <+> minHSize 15 (Brick.str "Version") <+> Brick.padLeft (Pad 1) (minHSize 25 $ Brick.str "Tags") <+> Brick.padLeft (Pad 5) (Brick.str "Notes") - renderList' bis = + renderList' bis = let allElements = V.concatMap L.listElements $ sectionListElements bis minTagSize = V.maximum $ V.map (length . intercalate "," . fmap tagToString . lTag) allElements minVerSize = V.maximum $ V.map (\ListResult{..} -> T.length $ tVerToText (GHCTargetVersion lCross lVer)) allElements @@ -420,7 +421,7 @@ drawNavigation dimAttrs BrickState{ _appSettings = as@BrickSettings{}, ..} minHSize s' = Brick.hLimit s' . Brick.vLimit 1 . (<+> Brick.fill ' ') drawTutorial :: Widget Name -drawTutorial = +drawTutorial = let mkTextBox = Brick.hLimitPercent 70 . Brick.vBox . fmap (Brick.padRight Brick.Max) txt_separator = hBorder <+> Brick.str " o " <+> hBorder @@ -429,7 +430,7 @@ drawTutorial = $ Brick.vLimitPercent 50 $ Brick.withBorderStyle unicode $ borderWithLabel (Brick.txt "Tutorial") - $ Brick.vBox + $ Brick.vBox (fmap center [ mkTextBox [Brick.txtWrap "GHCup is a distribution channel for Haskell's tools."] , txt_separator @@ -468,7 +469,7 @@ drawTutorial = ] , Brick.txtWrap "base-X.Y.Z.W tag is the minimun version of the base package admited in such ghc version" ] - , Brick.txt " " + , Brick.txt " " ]) <=> Brick.padRight Brick.Max (Brick.txt "Press q to exit the tutorial") @@ -520,7 +521,7 @@ drawKeyInfo KeyBindings {..} = <=> Brick.hBox [Brick.txt "Press q to return to Navigation" <+> Brick.padRight Brick.Max (Brick.txt " ") <+> Brick.txt "Press Enter to go to the Tutorial"] drawUI :: AttrMap -> BrickState -> [Widget Name] -drawUI dimAttrs st = +drawUI dimAttrs st = let navg = drawNavigation dimAttrs st in case st ^. mode of Navigation -> [navg] @@ -568,20 +569,20 @@ latestAttr, latestPrereleaseAttr, latestNightlyAttr, prereleaseAttr, nightlyAttr compiledAttr, strayAttr, dayAttr, helpAttr, hoorayAttr:: Brick.AttrName notInstalledAttr = Brick.attrName "not-installed" -setAttr = Brick.attrName "set" -installedAttr = Brick.attrName "installed" -recommendedAttr = Brick.attrName "recommended" +setAttr = Brick.attrName "set" +installedAttr = Brick.attrName "installed" +recommendedAttr = Brick.attrName "recommended" hlsPoweredAttr = Brick.attrName "hls-powered" -latestAttr = Brick.attrName "latest" +latestAttr = Brick.attrName "latest" latestPrereleaseAttr = Brick.attrName "latest-prerelease" latestNightlyAttr = Brick.attrName "latest-nightly" -prereleaseAttr = Brick.attrName "prerelease" -nightlyAttr = Brick.attrName "nightly" -compiledAttr = Brick.attrName "compiled" -strayAttr = Brick.attrName "stray" -dayAttr = Brick.attrName "day" -helpAttr = Brick.attrName "help" -hoorayAttr = Brick.attrName "hooray" +prereleaseAttr = Brick.attrName "prerelease" +nightlyAttr = Brick.attrName "nightly" +compiledAttr = Brick.attrName "compiled" +strayAttr = Brick.attrName "stray" +dayAttr = Brick.attrName "day" +helpAttr = Brick.attrName "help" +hoorayAttr = Brick.attrName "hooray" dimAttributes :: Bool -> AttrMap dimAttributes no_color = Brick.attrMap @@ -620,9 +621,9 @@ keyHandlers KeyBindings {..} = ] where --hideShowHandler' :: (BrickSettings -> Bool) -> (BrickSettings -> Bool) -> m () - hideShowHandler' f = do + hideShowHandler' f = do app_settings <- use appSettings - let + let vers = f app_settings newAppSettings = app_settings & showAllVersions .~ vers ad <- use appData @@ -632,7 +633,7 @@ keyHandlers KeyBindings {..} = tutorialHandler :: BrickEvent Name e -> EventM Name BrickState () -tutorialHandler ev = +tutorialHandler ev = case ev of VtyEvent (Vty.EvKey (Vty.KChar 'q') _ ) -> mode .= Navigation _ -> pure () @@ -663,7 +664,7 @@ eventHandler ev = do Navigation -> navigationHandler ev -{- Core Logic. +{- Core Logic. This section defines the IO actions we can execute within the Brick App: - Install @@ -721,7 +722,7 @@ constructList appD settings = selectBy :: Tool -> (ListResult -> Bool) -> BrickInternalState -> BrickInternalState selectBy tool predicate internal_state = let new_focus = F.focusSetCurrent (Singular tool) (view sectionListFocusRingL internal_state) - tool_lens = sectionL (Singular tool) + tool_lens = sectionL (Singular tool) in internal_state & sectionListFocusRingL .~ new_focus & tool_lens %~ L.listMoveTo 0 -- We move to 0 first diff --git a/app/ghcup/Main.hs b/app/ghcup/Main.hs index fd5fa06f..db044c06 100644 --- a/app/ghcup/Main.hs +++ b/app/ghcup/Main.hs @@ -30,6 +30,7 @@ import GHCup.Prelude.String.QQ import GHCup.Version import Cabal.Plan ( findPlanJson, SearchPlanJson(..) ) +import Control.Monad (when, forM_, unless) import Control.Concurrent import Control.Concurrent.Async import Control.Exception.Safe diff --git a/cabal.ghc8107.Unix.project b/cabal.ghc8107.Unix.project index 6570f447..dedb9163 100644 --- a/cabal.ghc8107.Unix.project +++ b/cabal.ghc8107.Unix.project @@ -11,29 +11,26 @@ else constraints: http-io-streams -brotli, any.aeson >= 2.0.1.0, - any.hsc2hs ==0.68.8, + any.hsc2hs >=0.68.10, bzlib-conduit >= 0.3.0.3, bz2 >= 1.0.1.1, bzlib >= 0.5.2.0, directory >= 1.3.8.3, - filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0 + filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0, + tar >= 0.6.2.0 constraints: text -simdutf if os(mingw32) constraints: zlib +bundled-c-zlib, lzma +static, + text -simdutf, vty-windows >=0.2.0.2 if impl(ghc >= 9.4) constraints: language-c >= 0.9.3 -source-repository-package - type: git - location: https://github.com/haskell/tar.git - tag: d94a988be4311b830149a9f8fc16739927e5fc1c - source-repository-package type: git location: https://github.com/hasufell/uri-bytestring.git diff --git a/cabal.ghc8107.Unix.project.freeze b/cabal.ghc8107.Unix.project.freeze index acbf1960..c1b09c7b 100644 --- a/cabal.ghc8107.Unix.project.freeze +++ b/cabal.ghc8107.Unix.project.freeze @@ -100,13 +100,14 @@ constraints: any.Cabal ==3.10.3.0, any.haskell-lexer ==1.1.1, any.haskus-utils-data ==1.4, any.haskus-utils-types ==1.5.1, - any.haskus-utils-variant ==3.3, - any.hsc2hs ==0.68.8, + any.haskus-utils-variant ==3.4, + haskus-utils-variant +unliftio, + any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, - any.hspec ==2.10.10, - any.hspec-core ==2.10.10, - any.hspec-discover ==2.10.10, - any.hspec-expectations ==0.8.2, + any.hspec ==2.11.8, + any.hspec-core ==2.11.8, + any.hspec-discover ==2.11.8, + any.hspec-expectations ==0.8.4, any.hspec-golden-aeson ==0.9.0.0, any.http-io-streams ==0.1.7.0, http-io-streams -brotli +fast-xor, @@ -151,6 +152,7 @@ constraints: any.Cabal ==3.10.3.0, optparse-applicative +process, any.os-release ==1.0.2.1, os-release -devel, + any.os-string ==2.0.2.1, any.parsec ==3.1.17.0, any.parser-combinators ==1.3.0, parser-combinators -dev, @@ -180,7 +182,6 @@ constraints: any.Cabal ==3.10.3.0, semialign +semigroupoids, any.semigroupoids ==6.0.0.1, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, - any.setenv ==0.1.1.3, any.split ==0.2.5, any.splitmix ==0.1.0.5, splitmix -optimised-mixer, @@ -190,7 +191,7 @@ constraints: any.Cabal ==3.10.3.0, any.tagged ==0.8.8, tagged +deepseq +transformers, any.tagsoup ==0.14.8, - any.tar ==0.6.0.0, + any.tar ==0.6.2.0, any.tasty ==1.5, tasty +unix, any.tasty-hunit ==0.10.1, @@ -222,7 +223,7 @@ constraints: any.Cabal ==3.10.3.0, transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, any.unix ==2.8.5.1, unix -os-string, - any.unix-bytestring ==0.3.7.8, + any.unix-bytestring ==0.4.0.1, any.unix-compat ==0.7.1, unix-compat -old-time, any.unliftio-core ==0.2.1.0, diff --git a/cabal.ghc8107.Win32.project b/cabal.ghc8107.Win32.project index f7c488ec..9ed85dd8 100644 --- a/cabal.ghc8107.Win32.project +++ b/cabal.ghc8107.Win32.project @@ -11,12 +11,15 @@ else constraints: http-io-streams -brotli, any.aeson >= 2.0.1.0, - any.hsc2hs ==0.68.8, + any.hsc2hs >=0.68.10, bzlib-conduit >= 0.3.0.3, bz2 >= 1.0.1.1, bzlib >= 0.5.2.0, directory >= 1.3.8.3, - filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0 + filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0, + tar >= 0.6.2.0 + +constraints: text -simdutf if os(mingw32) constraints: zlib +bundled-c-zlib, @@ -28,11 +31,6 @@ if os(mingw32) constraints: language-c >= 0.9.3 -source-repository-package - type: git - location: https://github.com/haskell/tar.git - tag: d94a988be4311b830149a9f8fc16739927e5fc1c - source-repository-package type: git location: https://github.com/hasufell/uri-bytestring.git diff --git a/cabal.ghc8107.Win32.project.freeze b/cabal.ghc8107.Win32.project.freeze index 34cc141c..d104b248 100644 --- a/cabal.ghc8107.Win32.project.freeze +++ b/cabal.ghc8107.Win32.project.freeze @@ -96,13 +96,14 @@ constraints: any.Cabal ==3.10.2.1 || ==3.10.3.0, any.haskell-lexer ==1.1.1, any.haskus-utils-data ==1.4, any.haskus-utils-types ==1.5.1, - any.haskus-utils-variant ==3.3, - any.hsc2hs ==0.68.8, + any.haskus-utils-variant ==3.4, + haskus-utils-variant +unliftio, + any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, - any.hspec ==2.10.10, - any.hspec-core ==2.10.10, - any.hspec-discover ==2.10.10, - any.hspec-expectations ==0.8.2, + any.hspec ==2.11.7, + any.hspec-core ==2.11.7, + any.hspec-discover ==2.11.7, + any.hspec-expectations ==0.8.4, any.hspec-golden-aeson ==0.9.0.0, any.indexed-profunctors ==0.1.1.1, any.indexed-traversable ==0.1.3, @@ -140,6 +141,7 @@ constraints: any.Cabal ==3.10.2.1 || ==3.10.3.0, optparse-applicative +process, any.os-release ==1.0.2.1, os-release -devel, + any.os-string ==2.0.2, any.parsec ==3.1.14.0 || ==3.1.17.0, any.parser-combinators ==1.3.0, parser-combinators -dev, @@ -170,7 +172,6 @@ constraints: any.Cabal ==3.10.2.1 || ==3.10.3.0, semialign +semigroupoids, any.semigroupoids ==6.0.0.1, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, - any.setenv ==0.1.1.3, any.split ==0.2.5, any.splitmix ==0.1.0.5, splitmix -optimised-mixer, @@ -180,7 +181,7 @@ constraints: any.Cabal ==3.10.2.1 || ==3.10.3.0, any.tagged ==0.8.8, tagged +deepseq +transformers, any.tagsoup ==0.14.8, - any.tar ==0.6.0.0, + any.tar ==0.6.2.0, any.tasty ==1.5, tasty +unix, any.tasty-hunit ==0.10.1, diff --git a/cabal.ghc8107.Win32.project.freeze.orig b/cabal.ghc8107.Win32.project.freeze.orig new file mode 100644 index 00000000..be56bf52 --- /dev/null +++ b/cabal.ghc8107.Win32.project.freeze.orig @@ -0,0 +1,248 @@ +active-repositories: hackage.haskell.org:merge +constraints: any.Cabal ==3.10.2.1 || ==3.10.3.0, + any.Cabal-syntax ==3.10.2.0 || ==3.10.3.0, + any.HUnit ==1.6.2.0, + any.OneTuple ==0.4.1.1, + any.QuickCheck ==2.14.3, + QuickCheck -old-random +templatehaskell, + any.StateVar ==1.2.2, + any.Win32 ==2.6.2.1 || ==2.13.4.0, + any.aeson ==2.2.1.0, + aeson +ordered-keymap, + any.aeson-pretty ==0.8.10, + aeson-pretty +lib-only, + any.alex ==3.5.1.0, + any.ansi-terminal ==1.0.2, + ansi-terminal -example, + any.ansi-terminal-types ==0.11.5, + any.ansi-wl-pprint ==0.6.9, + ansi-wl-pprint -example, + any.array ==0.5.4.0, + any.assoc ==1.1, + assoc +tagged, + any.async ==2.2.5, + async -bench, + any.attoparsec ==0.14.4, + attoparsec -developer, + any.base ==4.14.3.0, + any.base-compat ==0.13.1, + any.base-orphans ==0.9.1, + any.base16-bytestring ==1.0.2.0, + any.bifunctors ==5.6.2, + bifunctors +tagged, + any.bimap ==0.5.0, + any.binary ==0.8.8.0 || ==0.8.9.2, + any.binary-instances ==1.0.4, + any.binary-orphans ==1.0.4.1, + any.bitvec ==1.1.5.0, + bitvec +simd, + any.blaze-builder ==0.4.2.3, + any.brick ==2.1.1, + brick -demos, + any.bytestring ==0.10.12.0 || ==0.11.5.3, + any.bz2 ==1.0.1.2, + bz2 -cross +with-bzlib, + any.c2hs ==0.28.8, + c2hs +base3 -regression, + any.cabal-install-parsers ==0.6.1.1, + any.cabal-plan ==0.7.3.0, + cabal-plan -_ -exe -license-report, + any.call-stack ==0.4.0, + any.case-insensitive ==1.2.1.0, + any.casing ==0.1.4.1, + any.chs-cabal ==0.1.1.1, + any.chs-deps ==0.1.0.0, + chs-deps -cross, + any.colour ==2.3.6, + any.comonad ==5.0.8, + comonad +containers +distributive +indexed-traversable, + any.composition-prelude ==3.0.0.2, + composition-prelude -development, + any.conduit ==1.3.5, + any.config-ini ==0.2.7.0, + config-ini -enable-doctests, + any.containers ==0.6.5.1, + any.contravariant ==1.5.5, + contravariant +semigroups +statevar +tagged, + any.cpphs ==1.20.9.1, + cpphs -old-locale, + any.cryptohash-sha256 ==0.11.102.1, + cryptohash-sha256 -exe +use-cbits, + any.data-array-byte ==0.1.0.1, + any.data-clist ==0.2, + any.data-fix ==0.3.2, + any.deepseq ==1.4.4.0, + any.directory ==1.3.6.0 || ==1.3.8.4, + directory -os-string, + any.disk-free-space ==0.1.0.1, + any.distributive ==0.6.2.1, + distributive +semigroups +tagged, + any.dlist ==1.0, + dlist -werror, + any.exceptions ==0.10.4, + any.file-uri ==0.1.0.0, + any.filepath ==1.4.2.1 || ==1.4.300.1, + filepath -cpphs, + any.foldable1-classes-compat ==0.1, + foldable1-classes-compat +tagged, + any.free ==5.2, + any.generic-arbitrary ==0.2.2, + any.generically ==0.1.1, + any.ghc-boot-th ==8.10.7, + any.ghc-prim ==0.6.1, + any.happy ==1.20.1.1, + any.hashable ==1.4.4.0, + hashable +integer-gmp -random-initial-seed, + any.haskell-lexer ==1.1.1, + any.haskus-utils-data ==1.4, + any.haskus-utils-types ==1.5.1, +<<<<<<< HEAD + any.haskus-utils-variant ==3.3, + any.hsc2hs ==0.68.8, +======= + any.haskus-utils-variant ==3.4, + haskus-utils-variant +unliftio, + any.heaps ==0.4, + any.hsc2hs ==0.68.10, +>>>>>>> cb74721 (Support GHC-9.6 wrt #979) + hsc2hs -in-ghc-tree, + any.hspec ==2.11.7, + any.hspec-core ==2.11.7, + any.hspec-discover ==2.11.7, + any.hspec-expectations ==0.8.4, + any.hspec-golden-aeson ==0.9.0.0, + any.indexed-profunctors ==0.1.1.1, + any.indexed-traversable ==0.1.3, + any.indexed-traversable-instances ==0.1.1.2, + any.integer-conversion ==0.1.0.1, + any.integer-gmp ==1.0.3.0, + any.integer-logarithms ==1.0.3.1, + integer-logarithms -check-bounds +integer-gmp, + any.language-c ==0.9.3, + language-c -allwarnings +iecfpextension +usebytestrings, + any.libarchive ==3.0.4.2, + libarchive -cross -low-memory +no-exe -system-libarchive, + any.libyaml ==0.1.4, + libyaml -no-unicode -system-libyaml, + any.libyaml-clib ==0.2.5, + any.lukko ==0.1.1.3, + lukko +ofd-locking, + any.lzma-static ==5.2.5.5, + any.megaparsec ==9.2.1, + megaparsec -dev, + any.microlens ==0.4.13.1, + any.microlens-mtl ==0.2.0.3, + any.microlens-th ==0.4.3.14, + any.mono-traversable ==1.0.17.0, + any.mtl ==2.2.2, + any.mtl-compat ==0.2.2, + mtl-compat -two-point-one -two-point-two, + any.network-uri ==2.6.4.2, + any.optics ==0.4.2.1, + any.optics-core ==0.4.1.1, + optics-core -explicit-generic-labels, + any.optics-extra ==0.4.2.1, + any.optics-th ==0.4.1, + any.optparse-applicative ==0.17.1.0, + optparse-applicative +process, + any.os-release ==1.0.2.1, + os-release -devel, + any.os-string ==2.0.2, + any.parsec ==3.1.14.0 || ==3.1.17.0, + any.parser-combinators ==1.3.0, + parser-combinators -dev, + any.polyparse ==1.13, + any.pretty ==1.1.3.6, + any.pretty-terminal ==0.1.0.0, +<<<<<<< HEAD + any.primitive ==0.9.0.0, +======= + any.primitive ==0.8.0.0, +>>>>>>> cb74721 (Support GHC-9.6 wrt #979) + any.process ==1.6.13.2 || ==1.6.19.0, + any.profunctors ==5.6.2, + any.quickcheck-arbitrary-adt ==0.3.1.0, + any.quickcheck-io ==0.2.0, + any.random ==1.2.1.2, + any.recursion-schemes ==5.2.2.5, + recursion-schemes +template-haskell, + any.regex-base ==0.94.0.2, + any.regex-posix ==0.96.0.1, + regex-posix -_regex-posix-clib, + any.regex-posix-clib ==2.7, + any.resourcet ==1.2.6, + any.retry ==0.9.3.1, + retry -lib-werror, + any.rts ==1.0.1, + any.safe ==0.3.21, + any.safe-exceptions ==0.1.7.4, + any.scientific ==0.3.7.0, + scientific -bytestring-builder -integer-simple, + any.semialign ==1.3, + semialign +semigroupoids, + any.semigroupoids ==6.0.0.1, + semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, + any.split ==0.2.5, + any.splitmix ==0.1.0.5, + splitmix -optimised-mixer, + any.stm ==2.5.0.1, + any.strict ==0.5, + any.strict-base ==0.4.0.0, + any.tagged ==0.8.8, + tagged +deepseq +transformers, + any.tagsoup ==0.14.8, + any.tar ==0.6.2.0, + any.tasty ==1.5, + tasty +unix, + any.tasty-hunit ==0.10.1, + any.template-haskell ==2.16.0.0, + any.temporary ==1.3, + any.text ==1.2.4.1 || ==2.0.2, + text -developer -simdutf, + any.text-binary ==0.2.1.1, + any.text-iso8601 ==0.1, + any.text-short ==0.1.5, + text-short -asserts, + any.text-zipper ==0.13, + any.tf-random ==0.5, + any.th-abstraction ==0.6.0.0, + any.th-compat ==0.1.5, + any.th-lift ==0.8.4, + any.th-lift-instances ==0.1.20, + any.these ==1.2, + any.time ==1.9.3 || ==1.11.1.2, + any.time-compat ==1.9.6.1, + time-compat -old-locale, + any.transformers ==0.5.6.2, + any.transformers-base ==0.4.6, + transformers-base +orphaninstances, + any.transformers-compat ==0.7.2, + transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, + any.unix-compat ==0.7.1, + unix-compat -old-time, + any.unliftio-core ==0.2.1.0, + any.unordered-containers ==0.2.20, + unordered-containers -debug, + any.uri-bytestring ==0.3.3.1, + uri-bytestring -lib-werror, + any.utf8-string ==1.0.2, + any.uuid-types ==1.0.5.1, + any.vector ==0.13.1.0, + vector +boundschecks -internalchecks -unsafechecks -wall, + any.vector-algorithms ==0.9.0.1, + vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, + any.vector-binary-instances ==0.2.5.2, + any.vector-stream ==0.1.0.1, + any.versions ==6.0.6, + any.vty ==6.2, + any.vty-crossplatform ==0.4.0.0, + vty-crossplatform -demos, + any.vty-windows ==0.2.0.2, + any.witherable ==0.4.2, + any.word-wrap ==0.5, + any.word8 ==0.1.3, + any.yaml ==0.11.11.2, + yaml +no-examples +no-exe, + any.zlib ==0.6.3.0, + zlib +bundled-c-zlib -non-blocking-ffi -pkg-config +index-state: hackage.haskell.org 2024-04-15T02:49:22Z diff --git a/cabal.ghc8107.Win32.project.orig b/cabal.ghc8107.Win32.project.orig new file mode 100644 index 00000000..8a1ef7b7 --- /dev/null +++ b/cabal.ghc8107.Win32.project.orig @@ -0,0 +1,66 @@ +packages: ./ghcup.cabal + +optional-packages: ./vendored/*/*.cabal + +if impl(ghc < 9.0) + package ghcup + flags: +tui -tar +else + package ghcup + flags: +tui +tar + +constraints: http-io-streams -brotli, + any.aeson >= 2.0.1.0, + any.hsc2hs >=0.68.10, + bzlib-conduit >= 0.3.0.3, + bz2 >= 1.0.1.1, + bzlib >= 0.5.2.0, + directory >= 1.3.8.3, + filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0, + tar >= 0.6.2.0 + +if os(mingw32) + constraints: zlib +bundled-c-zlib, + lzma +static, + text -simdutf, + vty-windows >=0.2.0.2 + + if impl(ghc >= 9.4) + constraints: language-c >= 0.9.3 + + +source-repository-package + type: git + location: https://github.com/hasufell/uri-bytestring.git + tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 + +package libarchive + flags: -system-libarchive + +package aeson-pretty + flags: +lib-only + +package cabal-plan + flags: -exe + +package aeson + flags: +ordered-keymap + +<<<<<<< HEAD +package * + test-show-details: direct + +allow-newer: cabal-install-parsers:tar +======= +package streamly + flags: +use-unliftio -streamly-core + +package * + test-show-details: direct + +if impl(ghc >= 9.6) + allow-newer: streamly:Win32, streamly:ghc-prim, streamly:unicode-data, streamly:base, semigroupoids:base +else + allow-newer: streamly:Win32 +>>>>>>> cb74721 (Support GHC-9.6 wrt #979) + diff --git a/cabal.ghc902.Unix.project b/cabal.ghc902.Unix.project index 6570f447..dedb9163 100644 --- a/cabal.ghc902.Unix.project +++ b/cabal.ghc902.Unix.project @@ -11,29 +11,26 @@ else constraints: http-io-streams -brotli, any.aeson >= 2.0.1.0, - any.hsc2hs ==0.68.8, + any.hsc2hs >=0.68.10, bzlib-conduit >= 0.3.0.3, bz2 >= 1.0.1.1, bzlib >= 0.5.2.0, directory >= 1.3.8.3, - filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0 + filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0, + tar >= 0.6.2.0 constraints: text -simdutf if os(mingw32) constraints: zlib +bundled-c-zlib, lzma +static, + text -simdutf, vty-windows >=0.2.0.2 if impl(ghc >= 9.4) constraints: language-c >= 0.9.3 -source-repository-package - type: git - location: https://github.com/haskell/tar.git - tag: d94a988be4311b830149a9f8fc16739927e5fc1c - source-repository-package type: git location: https://github.com/hasufell/uri-bytestring.git diff --git a/cabal.ghc902.Unix.project.freeze b/cabal.ghc902.Unix.project.freeze index 6f15a8b6..60f1f817 100644 --- a/cabal.ghc902.Unix.project.freeze +++ b/cabal.ghc902.Unix.project.freeze @@ -103,13 +103,14 @@ constraints: any.Cabal ==3.10.3.0, any.haskell-lexer ==1.1.1, any.haskus-utils-data ==1.4, any.haskus-utils-types ==1.5.1, - any.haskus-utils-variant ==3.3, - any.hsc2hs ==0.68.8, + any.haskus-utils-variant ==3.4, + haskus-utils-variant +unliftio, + any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, - any.hspec ==2.10.10, - any.hspec-core ==2.10.10, - any.hspec-discover ==2.10.10, - any.hspec-expectations ==0.8.2, + any.hspec ==2.11.8, + any.hspec-core ==2.11.8, + any.hspec-discover ==2.11.8, + any.hspec-expectations ==0.8.4, any.hspec-golden-aeson ==0.9.0.0, any.http-io-streams ==0.1.7.0, http-io-streams -brotli +fast-xor, @@ -152,6 +153,7 @@ constraints: any.Cabal ==3.10.3.0, optparse-applicative +process, any.os-release ==1.0.2.1, os-release -devel, + any.os-string ==2.0.2.1, any.parsec ==3.1.17.0, any.parser-combinators ==1.3.0, parser-combinators -dev, @@ -180,7 +182,6 @@ constraints: any.Cabal ==3.10.3.0, semialign +semigroupoids, any.semigroupoids ==6.0.0.1, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, - any.setenv ==0.1.1.3, any.split ==0.2.5, any.splitmix ==0.1.0.5, splitmix -optimised-mixer, @@ -192,7 +193,7 @@ constraints: any.Cabal ==3.10.3.0, any.tagged ==0.8.8, tagged +deepseq +transformers, any.tagsoup ==0.14.8, - any.tar ==0.6.0.0, + any.tar ==0.6.2.0, any.tasty ==1.5, tasty +unix, any.tasty-hunit ==0.10.1, @@ -225,7 +226,7 @@ constraints: any.Cabal ==3.10.3.0, any.typed-process ==0.2.11.1, any.unix ==2.8.5.1, unix -os-string, - any.unix-bytestring ==0.3.7.8, + any.unix-bytestring ==0.4.0.1, any.unix-compat ==0.7.1, unix-compat -old-time, any.unliftio-core ==0.2.1.0, diff --git a/cabal.ghc902.Win32.project b/cabal.ghc902.Win32.project index f7c488ec..9ed85dd8 100644 --- a/cabal.ghc902.Win32.project +++ b/cabal.ghc902.Win32.project @@ -11,12 +11,15 @@ else constraints: http-io-streams -brotli, any.aeson >= 2.0.1.0, - any.hsc2hs ==0.68.8, + any.hsc2hs >=0.68.10, bzlib-conduit >= 0.3.0.3, bz2 >= 1.0.1.1, bzlib >= 0.5.2.0, directory >= 1.3.8.3, - filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0 + filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0, + tar >= 0.6.2.0 + +constraints: text -simdutf if os(mingw32) constraints: zlib +bundled-c-zlib, @@ -28,11 +31,6 @@ if os(mingw32) constraints: language-c >= 0.9.3 -source-repository-package - type: git - location: https://github.com/haskell/tar.git - tag: d94a988be4311b830149a9f8fc16739927e5fc1c - source-repository-package type: git location: https://github.com/hasufell/uri-bytestring.git diff --git a/cabal.ghc902.Win32.project.freeze b/cabal.ghc902.Win32.project.freeze index 91f94c22..999ee428 100644 --- a/cabal.ghc902.Win32.project.freeze +++ b/cabal.ghc902.Win32.project.freeze @@ -100,13 +100,14 @@ constraints: any.Cabal ==3.10.3.0, any.haskell-lexer ==1.1.1, any.haskus-utils-data ==1.4, any.haskus-utils-types ==1.5.1, - any.haskus-utils-variant ==3.3, - any.hsc2hs ==0.68.8, + any.haskus-utils-variant ==3.4, + haskus-utils-variant +unliftio, + any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, - any.hspec ==2.10.10, - any.hspec-core ==2.10.10, - any.hspec-discover ==2.10.10, - any.hspec-expectations ==0.8.2, + any.hspec ==2.11.7, + any.hspec-core ==2.11.7, + any.hspec-discover ==2.11.7, + any.hspec-expectations ==0.8.4, any.hspec-golden-aeson ==0.9.0.0, any.indexed-profunctors ==0.1.1.1, any.indexed-traversable ==0.1.3, @@ -144,6 +145,7 @@ constraints: any.Cabal ==3.10.3.0, optparse-applicative +process, any.os-release ==1.0.2.1, os-release -devel, + any.os-string ==2.0.2, any.parsec ==3.1.17.0, any.parser-combinators ==1.3.0, parser-combinators -dev, @@ -173,7 +175,6 @@ constraints: any.Cabal ==3.10.3.0, semialign +semigroupoids, any.semigroupoids ==6.0.0.1, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, - any.setenv ==0.1.1.3, any.split ==0.2.5, any.splitmix ==0.1.0.5, splitmix -optimised-mixer, @@ -185,7 +186,7 @@ constraints: any.Cabal ==3.10.3.0, any.tagged ==0.8.8, tagged +deepseq +transformers, any.tagsoup ==0.14.8, - any.tar ==0.6.0.0, + any.tar ==0.6.2.0, any.tasty ==1.5, tasty +unix, any.tasty-hunit ==0.10.1, diff --git a/cabal.ghc902.Win32.project.freeze.orig b/cabal.ghc902.Win32.project.freeze.orig new file mode 100644 index 00000000..1036fcfa --- /dev/null +++ b/cabal.ghc902.Win32.project.freeze.orig @@ -0,0 +1,258 @@ +active-repositories: hackage.haskell.org:merge +constraints: any.Cabal ==3.10.3.0, + any.Cabal-syntax ==3.10.3.0, + any.HUnit ==1.6.2.0, + any.OneTuple ==0.4.1.1, + any.QuickCheck ==2.14.3, + QuickCheck -old-random +templatehaskell, + any.StateVar ==1.2.2, + any.Win32 ==2.12.0.1 || ==2.13.4.0, + any.aeson ==2.2.1.0, + aeson +ordered-keymap, + any.aeson-pretty ==0.8.10, + aeson-pretty +lib-only, + any.alex ==3.5.1.0, + any.ansi-terminal ==1.0.2, + ansi-terminal -example, + any.ansi-terminal-types ==0.11.5, + any.ansi-wl-pprint ==0.6.9, + ansi-wl-pprint -example, + any.array ==0.5.4.0, + any.assoc ==1.1, + assoc +tagged, + any.async ==2.2.5, + async -bench, + any.attoparsec ==0.14.4, + attoparsec -developer, + any.base ==4.15.1.0, + any.base-compat ==0.13.1, + any.base-orphans ==0.9.1, + any.base16-bytestring ==1.0.2.0, + any.bifunctors ==5.6.2, + bifunctors +tagged, + any.bimap ==0.5.0, + any.binary ==0.8.9.2, + any.binary-instances ==1.0.4, + any.binary-orphans ==1.0.4.1, + any.bindings-DSL ==1.0.25, + any.bitvec ==1.1.5.0, + bitvec +simd, + any.blaze-builder ==0.4.2.3, + any.brick ==2.1.1, + brick -demos, + any.bytestring ==0.11.5.3, + any.bz2 ==1.0.1.2, + bz2 -cross +with-bzlib, + any.bzip2-clib ==1.0.8, + any.bzlib-conduit ==0.3.0.3, + any.c2hs ==0.28.8, + c2hs +base3 -regression, + any.cabal-install-parsers ==0.6.1.1, + any.cabal-plan ==0.7.3.0, + cabal-plan -_ -exe -license-report, + any.call-stack ==0.4.0, + any.case-insensitive ==1.2.1.0, + any.casing ==0.1.4.1, + any.cereal ==0.5.8.3, + cereal -bytestring-builder, + any.colour ==2.3.6, + any.comonad ==5.0.8, + comonad +containers +distributive +indexed-traversable, + any.conduit ==1.3.5, + any.conduit-extra ==1.3.6, + any.conduit-zstd ==0.0.2.0, + any.config-ini ==0.2.7.0, + config-ini -enable-doctests, + any.containers ==0.6.4.1, + any.contravariant ==1.5.5, + contravariant +semigroups +statevar +tagged, + any.cryptohash-sha256 ==0.11.102.1, + cryptohash-sha256 -exe +use-cbits, + any.data-array-byte ==0.1.0.1, + any.data-clist ==0.2, + any.data-default-class ==0.1.2.0, + any.data-fix ==0.3.2, + any.deepseq ==1.4.5.0, + any.digest ==0.0.2.1, + digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config, + any.directory ==1.3.6.2 || ==1.3.8.4, + directory -os-string, + any.disk-free-space ==0.1.0.1, + any.distributive ==0.6.2.1, + distributive +semigroups +tagged, + any.dlist ==1.0, + dlist -werror, + any.exceptions ==0.10.4, + any.file-uri ==0.1.0.0, + any.filepath ==1.4.2.1 || ==1.4.300.1, + filepath -cpphs, + any.foldable1-classes-compat ==0.1, + foldable1-classes-compat +tagged, + any.free ==5.2, + any.generic-arbitrary ==0.2.2, + any.generically ==0.1.1, + any.ghc-bignum ==1.1, + any.ghc-boot-th ==9.0.2, + any.ghc-prim ==0.7.0, + any.happy ==1.20.1.1, + any.hashable ==1.4.4.0, + hashable +integer-gmp -random-initial-seed, + any.haskell-lexer ==1.1.1, + any.haskus-utils-data ==1.4, + any.haskus-utils-types ==1.5.1, +<<<<<<< HEAD + any.haskus-utils-variant ==3.3, + any.hsc2hs ==0.68.8, +======= + any.haskus-utils-variant ==3.4, + haskus-utils-variant +unliftio, + any.heaps ==0.4, + any.hsc2hs ==0.68.10, +>>>>>>> cb74721 (Support GHC-9.6 wrt #979) + hsc2hs -in-ghc-tree, + any.hspec ==2.11.7, + any.hspec-core ==2.11.7, + any.hspec-discover ==2.11.7, + any.hspec-expectations ==0.8.4, + any.hspec-golden-aeson ==0.9.0.0, + any.indexed-profunctors ==0.1.1.1, + any.indexed-traversable ==0.1.3, + any.indexed-traversable-instances ==0.1.1.2, + any.integer-conversion ==0.1.0.1, + any.integer-logarithms ==1.0.3.1, + integer-logarithms -check-bounds +integer-gmp, + any.language-c ==0.9.3, + language-c -allwarnings +iecfpextension +usebytestrings, + any.libyaml ==0.1.4, + libyaml -no-unicode -system-libyaml, + any.libyaml-clib ==0.2.5, + any.lukko ==0.1.1.3, + lukko +ofd-locking, + any.lzma-static ==5.2.5.5, + any.megaparsec ==9.2.2, + megaparsec -dev, + any.microlens ==0.4.13.1, + any.microlens-mtl ==0.2.0.3, + any.microlens-th ==0.4.3.14, + any.monad-control ==1.0.3.1, + any.mono-traversable ==1.0.17.0, + any.mtl ==2.2.2, + any.mtl-compat ==0.2.2, + mtl-compat -two-point-one -two-point-two, + any.network ==3.2.0.0, + network -devel, + any.network-uri ==2.6.4.2, + any.optics ==0.4.2.1, + any.optics-core ==0.4.1.1, + optics-core -explicit-generic-labels, + any.optics-extra ==0.4.2.1, + any.optics-th ==0.4.1, + any.optparse-applicative ==0.17.1.0, + optparse-applicative +process, + any.os-release ==1.0.2.1, + os-release -devel, + any.os-string ==2.0.2, + any.parsec ==3.1.17.0, + any.parser-combinators ==1.3.0, + parser-combinators -dev, + any.pretty ==1.1.3.6, + any.pretty-terminal ==0.1.0.0, +<<<<<<< HEAD + any.primitive ==0.9.0.0, +======= + any.primitive ==0.8.0.0, +>>>>>>> cb74721 (Support GHC-9.6 wrt #979) + any.process ==1.6.13.2 || ==1.6.19.0, + any.profunctors ==5.6.2, + any.quickcheck-arbitrary-adt ==0.3.1.0, + any.quickcheck-io ==0.2.0, + any.random ==1.2.1.2, + any.recursion-schemes ==5.2.2.5, + recursion-schemes +template-haskell, + any.regex-base ==0.94.0.2, + any.regex-posix ==0.96.0.1, + regex-posix -_regex-posix-clib, + any.regex-posix-clib ==2.7, + any.resourcet ==1.2.6, + any.retry ==0.9.3.1, + retry -lib-werror, + any.rts ==1.0.2, + any.safe ==0.3.21, + any.safe-exceptions ==0.1.7.4, + any.scientific ==0.3.7.0, + scientific -bytestring-builder -integer-simple, + any.semialign ==1.3, + semialign +semigroupoids, + any.semigroupoids ==6.0.0.1, + semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, + any.split ==0.2.5, + any.splitmix ==0.1.0.5, + splitmix -optimised-mixer, + any.stm ==2.5.0.0, + any.streaming-commons ==0.2.2.6, + streaming-commons -use-bytestring-builder, + any.strict ==0.5, + any.strict-base ==0.4.0.0, + any.tagged ==0.8.8, + tagged +deepseq +transformers, + any.tagsoup ==0.14.8, + any.tar ==0.6.2.0, + any.tasty ==1.5, + tasty +unix, + any.tasty-hunit ==0.10.1, + any.template-haskell ==2.17.0.0, + any.temporary ==1.3, + any.text ==2.0.2, + text -developer -simdutf, + any.text-binary ==0.2.1.1, + any.text-iso8601 ==0.1, + any.text-short ==0.1.5, + text-short -asserts, + any.text-zipper ==0.13, + any.tf-random ==0.5, + any.th-abstraction ==0.6.0.0, + any.th-compat ==0.1.5, + any.th-lift ==0.8.4, + any.th-lift-instances ==0.1.20, + any.these ==1.2, + any.time ==1.9.3 || ==1.11.1.2, + any.time-compat ==1.9.6.1, + time-compat -old-locale, + any.transformers ==0.5.6.2, + any.transformers-base ==0.4.6, + transformers-base +orphaninstances, + any.transformers-compat ==0.7.2, + transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, + any.typed-process ==0.2.11.1, + any.unix-compat ==0.7.1, + unix-compat -old-time, + any.unliftio-core ==0.2.1.0, + any.unordered-containers ==0.2.20, + unordered-containers -debug, + any.uri-bytestring ==0.3.3.1, + uri-bytestring -lib-werror, + any.utf8-string ==1.0.2, + any.uuid-types ==1.0.5.1, + any.vector ==0.13.1.0, + vector +boundschecks -internalchecks -unsafechecks -wall, + any.vector-algorithms ==0.9.0.1, + vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, + any.vector-binary-instances ==0.2.5.2, + any.vector-stream ==0.1.0.1, + any.versions ==6.0.6, + any.vty ==6.2, + any.vty-crossplatform ==0.4.0.0, + vty-crossplatform -demos, + any.vty-windows ==0.2.0.2, + any.witherable ==0.4.2, + any.word-wrap ==0.5, + any.word8 ==0.1.3, + any.yaml ==0.11.11.2, + yaml +no-examples +no-exe, + any.zip ==2.0.0, + zip -dev -disable-bzip2 -disable-zstd, + any.zlib ==0.6.3.0, + zlib +bundled-c-zlib -non-blocking-ffi -pkg-config, + any.zstd ==0.1.3.0, + zstd +standalone +index-state: hackage.haskell.org 2024-04-15T02:49:22Z diff --git a/cabal.ghc902.Win32.project.orig b/cabal.ghc902.Win32.project.orig new file mode 100644 index 00000000..8a1ef7b7 --- /dev/null +++ b/cabal.ghc902.Win32.project.orig @@ -0,0 +1,66 @@ +packages: ./ghcup.cabal + +optional-packages: ./vendored/*/*.cabal + +if impl(ghc < 9.0) + package ghcup + flags: +tui -tar +else + package ghcup + flags: +tui +tar + +constraints: http-io-streams -brotli, + any.aeson >= 2.0.1.0, + any.hsc2hs >=0.68.10, + bzlib-conduit >= 0.3.0.3, + bz2 >= 1.0.1.1, + bzlib >= 0.5.2.0, + directory >= 1.3.8.3, + filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0, + tar >= 0.6.2.0 + +if os(mingw32) + constraints: zlib +bundled-c-zlib, + lzma +static, + text -simdutf, + vty-windows >=0.2.0.2 + + if impl(ghc >= 9.4) + constraints: language-c >= 0.9.3 + + +source-repository-package + type: git + location: https://github.com/hasufell/uri-bytestring.git + tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 + +package libarchive + flags: -system-libarchive + +package aeson-pretty + flags: +lib-only + +package cabal-plan + flags: -exe + +package aeson + flags: +ordered-keymap + +<<<<<<< HEAD +package * + test-show-details: direct + +allow-newer: cabal-install-parsers:tar +======= +package streamly + flags: +use-unliftio -streamly-core + +package * + test-show-details: direct + +if impl(ghc >= 9.6) + allow-newer: streamly:Win32, streamly:ghc-prim, streamly:unicode-data, streamly:base, semigroupoids:base +else + allow-newer: streamly:Win32 +>>>>>>> cb74721 (Support GHC-9.6 wrt #979) + diff --git a/cabal.ghc928.Unix.project b/cabal.ghc928.Unix.project index 6570f447..dedb9163 100644 --- a/cabal.ghc928.Unix.project +++ b/cabal.ghc928.Unix.project @@ -11,29 +11,26 @@ else constraints: http-io-streams -brotli, any.aeson >= 2.0.1.0, - any.hsc2hs ==0.68.8, + any.hsc2hs >=0.68.10, bzlib-conduit >= 0.3.0.3, bz2 >= 1.0.1.1, bzlib >= 0.5.2.0, directory >= 1.3.8.3, - filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0 + filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0, + tar >= 0.6.2.0 constraints: text -simdutf if os(mingw32) constraints: zlib +bundled-c-zlib, lzma +static, + text -simdutf, vty-windows >=0.2.0.2 if impl(ghc >= 9.4) constraints: language-c >= 0.9.3 -source-repository-package - type: git - location: https://github.com/haskell/tar.git - tag: d94a988be4311b830149a9f8fc16739927e5fc1c - source-repository-package type: git location: https://github.com/hasufell/uri-bytestring.git diff --git a/cabal.ghc928.Unix.project.freeze b/cabal.ghc928.Unix.project.freeze index a1c251a4..c72e6899 100644 --- a/cabal.ghc928.Unix.project.freeze +++ b/cabal.ghc928.Unix.project.freeze @@ -103,13 +103,14 @@ constraints: any.Cabal ==3.10.3.0, any.haskell-lexer ==1.1.1, any.haskus-utils-data ==1.4, any.haskus-utils-types ==1.5.1, - any.haskus-utils-variant ==3.3, - any.hsc2hs ==0.68.8, + any.haskus-utils-variant ==3.4, + haskus-utils-variant +unliftio, + any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, - any.hspec ==2.10.10, - any.hspec-core ==2.10.10, - any.hspec-discover ==2.10.10, - any.hspec-expectations ==0.8.2, + any.hspec ==2.11.8, + any.hspec-core ==2.11.8, + any.hspec-discover ==2.11.8, + any.hspec-expectations ==0.8.4, any.hspec-golden-aeson ==0.9.0.0, any.http-io-streams ==0.1.7.0, http-io-streams -brotli +fast-xor, @@ -181,7 +182,6 @@ constraints: any.Cabal ==3.10.3.0, semialign +semigroupoids, any.semigroupoids ==6.0.0.1, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, - any.setenv ==0.1.1.3, any.split ==0.2.5, any.splitmix ==0.1.0.5, splitmix -optimised-mixer, @@ -193,7 +193,7 @@ constraints: any.Cabal ==3.10.3.0, any.tagged ==0.8.8, tagged +deepseq +transformers, any.tagsoup ==0.14.8, - any.tar ==0.6.0.0, + any.tar ==0.6.2.0, any.tasty ==1.5, tasty +unix, any.tasty-hunit ==0.10.1, @@ -226,7 +226,7 @@ constraints: any.Cabal ==3.10.3.0, any.typed-process ==0.2.11.1, any.unix ==2.8.5.1, unix -os-string, - any.unix-bytestring ==0.3.7.8, + any.unix-bytestring ==0.4.0.1, any.unix-compat ==0.7.1, unix-compat -old-time, any.unliftio-core ==0.2.1.0, diff --git a/cabal.ghc928.Win32.project b/cabal.ghc928.Win32.project index f7c488ec..9ed85dd8 100644 --- a/cabal.ghc928.Win32.project +++ b/cabal.ghc928.Win32.project @@ -11,12 +11,15 @@ else constraints: http-io-streams -brotli, any.aeson >= 2.0.1.0, - any.hsc2hs ==0.68.8, + any.hsc2hs >=0.68.10, bzlib-conduit >= 0.3.0.3, bz2 >= 1.0.1.1, bzlib >= 0.5.2.0, directory >= 1.3.8.3, - filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0 + filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0, + tar >= 0.6.2.0 + +constraints: text -simdutf if os(mingw32) constraints: zlib +bundled-c-zlib, @@ -28,11 +31,6 @@ if os(mingw32) constraints: language-c >= 0.9.3 -source-repository-package - type: git - location: https://github.com/haskell/tar.git - tag: d94a988be4311b830149a9f8fc16739927e5fc1c - source-repository-package type: git location: https://github.com/hasufell/uri-bytestring.git diff --git a/cabal.ghc928.Win32.project.freeze b/cabal.ghc928.Win32.project.freeze index e1c466d6..df20ec8e 100644 --- a/cabal.ghc928.Win32.project.freeze +++ b/cabal.ghc928.Win32.project.freeze @@ -100,13 +100,14 @@ constraints: any.Cabal ==3.10.3.0, any.haskell-lexer ==1.1.1, any.haskus-utils-data ==1.4, any.haskus-utils-types ==1.5.1, - any.haskus-utils-variant ==3.3, - any.hsc2hs ==0.68.8, + any.haskus-utils-variant ==3.4, + haskus-utils-variant +unliftio, + any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, - any.hspec ==2.10.10, - any.hspec-core ==2.10.10, - any.hspec-discover ==2.10.10, - any.hspec-expectations ==0.8.2, + any.hspec ==2.11.7, + any.hspec-core ==2.11.7, + any.hspec-discover ==2.11.7, + any.hspec-expectations ==0.8.4, any.hspec-golden-aeson ==0.9.0.0, any.indexed-profunctors ==0.1.1.1, any.indexed-traversable ==0.1.3, @@ -174,7 +175,6 @@ constraints: any.Cabal ==3.10.3.0, semialign +semigroupoids, any.semigroupoids ==6.0.0.1, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, - any.setenv ==0.1.1.3, any.split ==0.2.5, any.splitmix ==0.1.0.5, splitmix -optimised-mixer, @@ -186,7 +186,7 @@ constraints: any.Cabal ==3.10.3.0, any.tagged ==0.8.8, tagged +deepseq +transformers, any.tagsoup ==0.14.8, - any.tar ==0.6.0.0, + any.tar ==0.6.2.0, any.tasty ==1.5, tasty +unix, any.tasty-hunit ==0.10.1, diff --git a/cabal.ghc928.Win32.project.freeze.orig b/cabal.ghc928.Win32.project.freeze.orig new file mode 100644 index 00000000..d5694ec2 --- /dev/null +++ b/cabal.ghc928.Win32.project.freeze.orig @@ -0,0 +1,258 @@ +active-repositories: hackage.haskell.org:merge +constraints: any.Cabal ==3.10.3.0, + any.Cabal-syntax ==3.10.3.0, + any.HUnit ==1.6.2.0, + any.OneTuple ==0.4.1.1, + any.QuickCheck ==2.14.3, + QuickCheck -old-random +templatehaskell, + any.StateVar ==1.2.2, + any.Win32 ==2.12.0.1 || ==2.13.4.0, + any.aeson ==2.2.1.0, + aeson +ordered-keymap, + any.aeson-pretty ==0.8.10, + aeson-pretty +lib-only, + any.alex ==3.5.1.0, + any.ansi-terminal ==1.0.2, + ansi-terminal -example, + any.ansi-terminal-types ==0.11.5, + any.ansi-wl-pprint ==0.6.9, + ansi-wl-pprint -example, + any.array ==0.5.4.0, + any.assoc ==1.1, + assoc +tagged, + any.async ==2.2.5, + async -bench, + any.attoparsec ==0.14.4, + attoparsec -developer, + any.base ==4.16.4.0, + any.base-compat ==0.13.1, + any.base-orphans ==0.9.1, + any.base16-bytestring ==1.0.2.0, + any.bifunctors ==5.6.2, + bifunctors +tagged, + any.bimap ==0.5.0, + any.binary ==0.8.9.0, + any.binary-instances ==1.0.4, + any.binary-orphans ==1.0.4.1, + any.bindings-DSL ==1.0.25, + any.bitvec ==1.1.5.0, + bitvec +simd, + any.blaze-builder ==0.4.2.3, + any.brick ==2.1.1, + brick -demos, + any.bytestring ==0.11.4.0, + any.bz2 ==1.0.1.2, + bz2 -cross +with-bzlib, + any.bzip2-clib ==1.0.8, + any.bzlib-conduit ==0.3.0.3, + any.c2hs ==0.28.8, + c2hs +base3 -regression, + any.cabal-install-parsers ==0.6.1.1, + any.cabal-plan ==0.7.3.0, + cabal-plan -_ -exe -license-report, + any.call-stack ==0.4.0, + any.case-insensitive ==1.2.1.0, + any.casing ==0.1.4.1, + any.cereal ==0.5.8.3, + cereal -bytestring-builder, + any.colour ==2.3.6, + any.comonad ==5.0.8, + comonad +containers +distributive +indexed-traversable, + any.conduit ==1.3.5, + any.conduit-extra ==1.3.6, + any.conduit-zstd ==0.0.2.0, + any.config-ini ==0.2.7.0, + config-ini -enable-doctests, + any.containers ==0.6.5.1, + any.contravariant ==1.5.5, + contravariant +semigroups +statevar +tagged, + any.cryptohash-sha256 ==0.11.102.1, + cryptohash-sha256 -exe +use-cbits, + any.data-array-byte ==0.1.0.1, + any.data-clist ==0.2, + any.data-default-class ==0.1.2.0, + any.data-fix ==0.3.2, + any.deepseq ==1.4.6.1, + any.digest ==0.0.2.1, + digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config, + any.directory ==1.3.6.2 || ==1.3.8.4, + directory -os-string, + any.disk-free-space ==0.1.0.1, + any.distributive ==0.6.2.1, + distributive +semigroups +tagged, + any.dlist ==1.0, + dlist -werror, + any.exceptions ==0.10.4, + any.file-uri ==0.1.0.0, + any.filepath ==1.4.2.2 || ==1.4.300.1, + filepath -cpphs, + any.foldable1-classes-compat ==0.1, + foldable1-classes-compat +tagged, + any.free ==5.2, + any.generic-arbitrary ==0.2.2, + any.generically ==0.1.1, + any.ghc-bignum ==1.2, + any.ghc-boot-th ==9.2.8, + any.ghc-prim ==0.8.0, + any.happy ==1.20.1.1, + any.hashable ==1.4.4.0, + hashable +integer-gmp -random-initial-seed, + any.haskell-lexer ==1.1.1, + any.haskus-utils-data ==1.4, + any.haskus-utils-types ==1.5.1, +<<<<<<< HEAD + any.haskus-utils-variant ==3.3, + any.hsc2hs ==0.68.8, +======= + any.haskus-utils-variant ==3.4, + haskus-utils-variant +unliftio, + any.heaps ==0.4, + any.hsc2hs ==0.68.10, +>>>>>>> cb74721 (Support GHC-9.6 wrt #979) + hsc2hs -in-ghc-tree, + any.hspec ==2.11.7, + any.hspec-core ==2.11.7, + any.hspec-discover ==2.11.7, + any.hspec-expectations ==0.8.4, + any.hspec-golden-aeson ==0.9.0.0, + any.indexed-profunctors ==0.1.1.1, + any.indexed-traversable ==0.1.3, + any.indexed-traversable-instances ==0.1.1.2, + any.integer-conversion ==0.1.0.1, + any.integer-logarithms ==1.0.3.1, + integer-logarithms -check-bounds +integer-gmp, + any.language-c ==0.9.3, + language-c -allwarnings +iecfpextension +usebytestrings, + any.libyaml ==0.1.4, + libyaml -no-unicode -system-libyaml, + any.libyaml-clib ==0.2.5, + any.lukko ==0.1.1.3, + lukko +ofd-locking, + any.lzma-static ==5.2.5.5, + any.megaparsec ==9.2.2, + megaparsec -dev, + any.microlens ==0.4.13.1, + any.microlens-mtl ==0.2.0.3, + any.microlens-th ==0.4.3.14, + any.monad-control ==1.0.3.1, + any.mono-traversable ==1.0.17.0, + any.mtl ==2.2.2, + any.mtl-compat ==0.2.2, + mtl-compat -two-point-one -two-point-two, + any.network ==3.2.0.0, + network -devel, + any.network-uri ==2.6.4.2, + any.optics ==0.4.2.1, + any.optics-core ==0.4.1.1, + optics-core -explicit-generic-labels, + any.optics-extra ==0.4.2.1, + any.optics-th ==0.4.1, + any.optparse-applicative ==0.17.1.0, + optparse-applicative +process, + any.os-release ==1.0.2.1, + os-release -devel, + any.os-string ==2.0.2, + any.parsec ==3.1.17.0, + any.parser-combinators ==1.3.0, + parser-combinators -dev, + any.pretty ==1.1.3.6, + any.pretty-terminal ==0.1.0.0, +<<<<<<< HEAD + any.primitive ==0.9.0.0, +======= + any.primitive ==0.8.0.0, +>>>>>>> cb74721 (Support GHC-9.6 wrt #979) + any.process ==1.6.16.0 || ==1.6.19.0, + any.profunctors ==5.6.2, + any.quickcheck-arbitrary-adt ==0.3.1.0, + any.quickcheck-io ==0.2.0, + any.random ==1.2.1.2, + any.recursion-schemes ==5.2.2.5, + recursion-schemes +template-haskell, + any.regex-base ==0.94.0.2, + any.regex-posix ==0.96.0.1, + regex-posix -_regex-posix-clib, + any.regex-posix-clib ==2.7, + any.resourcet ==1.2.6, + any.retry ==0.9.3.1, + retry -lib-werror, + any.rts ==1.0.2, + any.safe ==0.3.21, + any.safe-exceptions ==0.1.7.4, + any.scientific ==0.3.7.0, + scientific -bytestring-builder -integer-simple, + any.semialign ==1.3, + semialign +semigroupoids, + any.semigroupoids ==6.0.0.1, + semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, + any.split ==0.2.5, + any.splitmix ==0.1.0.5, + splitmix -optimised-mixer, + any.stm ==2.5.0.2, + any.streaming-commons ==0.2.2.6, + streaming-commons -use-bytestring-builder, + any.strict ==0.5, + any.strict-base ==0.4.0.0, + any.tagged ==0.8.8, + tagged +deepseq +transformers, + any.tagsoup ==0.14.8, + any.tar ==0.6.2.0, + any.tasty ==1.5, + tasty +unix, + any.tasty-hunit ==0.10.1, + any.template-haskell ==2.18.0.0, + any.temporary ==1.3, + any.text ==2.0.2, + text -developer -simdutf, + any.text-binary ==0.2.1.1, + any.text-iso8601 ==0.1, + any.text-short ==0.1.5, + text-short -asserts, + any.text-zipper ==0.13, + any.tf-random ==0.5, + any.th-abstraction ==0.6.0.0, + any.th-compat ==0.1.5, + any.th-lift ==0.8.4, + any.th-lift-instances ==0.1.20, + any.these ==1.2, + any.time ==1.11.1.1 || ==1.11.1.2, + any.time-compat ==1.9.6.1, + time-compat -old-locale, + any.transformers ==0.5.6.2, + any.transformers-base ==0.4.6, + transformers-base +orphaninstances, + any.transformers-compat ==0.7.2, + transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, + any.typed-process ==0.2.11.1, + any.unix-compat ==0.7.1, + unix-compat -old-time, + any.unliftio-core ==0.2.1.0, + any.unordered-containers ==0.2.20, + unordered-containers -debug, + any.uri-bytestring ==0.3.3.1, + uri-bytestring -lib-werror, + any.utf8-string ==1.0.2, + any.uuid-types ==1.0.5.1, + any.vector ==0.13.1.0, + vector +boundschecks -internalchecks -unsafechecks -wall, + any.vector-algorithms ==0.9.0.1, + vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, + any.vector-binary-instances ==0.2.5.2, + any.vector-stream ==0.1.0.1, + any.versions ==6.0.6, + any.vty ==6.2, + any.vty-crossplatform ==0.4.0.0, + vty-crossplatform -demos, + any.vty-windows ==0.2.0.2, + any.witherable ==0.4.2, + any.word-wrap ==0.5, + any.word8 ==0.1.3, + any.yaml ==0.11.11.2, + yaml +no-examples +no-exe, + any.zip ==2.0.0, + zip -dev -disable-bzip2 -disable-zstd, + any.zlib ==0.6.3.0, + zlib +bundled-c-zlib -non-blocking-ffi -pkg-config, + any.zstd ==0.1.3.0, + zstd +standalone +index-state: hackage.haskell.org 2024-04-15T02:49:22Z diff --git a/cabal.ghc928.Win32.project.orig b/cabal.ghc928.Win32.project.orig new file mode 100644 index 00000000..8a1ef7b7 --- /dev/null +++ b/cabal.ghc928.Win32.project.orig @@ -0,0 +1,66 @@ +packages: ./ghcup.cabal + +optional-packages: ./vendored/*/*.cabal + +if impl(ghc < 9.0) + package ghcup + flags: +tui -tar +else + package ghcup + flags: +tui +tar + +constraints: http-io-streams -brotli, + any.aeson >= 2.0.1.0, + any.hsc2hs >=0.68.10, + bzlib-conduit >= 0.3.0.3, + bz2 >= 1.0.1.1, + bzlib >= 0.5.2.0, + directory >= 1.3.8.3, + filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0, + tar >= 0.6.2.0 + +if os(mingw32) + constraints: zlib +bundled-c-zlib, + lzma +static, + text -simdutf, + vty-windows >=0.2.0.2 + + if impl(ghc >= 9.4) + constraints: language-c >= 0.9.3 + + +source-repository-package + type: git + location: https://github.com/hasufell/uri-bytestring.git + tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 + +package libarchive + flags: -system-libarchive + +package aeson-pretty + flags: +lib-only + +package cabal-plan + flags: -exe + +package aeson + flags: +ordered-keymap + +<<<<<<< HEAD +package * + test-show-details: direct + +allow-newer: cabal-install-parsers:tar +======= +package streamly + flags: +use-unliftio -streamly-core + +package * + test-show-details: direct + +if impl(ghc >= 9.6) + allow-newer: streamly:Win32, streamly:ghc-prim, streamly:unicode-data, streamly:base, semigroupoids:base +else + allow-newer: streamly:Win32 +>>>>>>> cb74721 (Support GHC-9.6 wrt #979) + diff --git a/cabal.ghc948.Unix.project b/cabal.ghc948.Unix.project index 6570f447..dedb9163 100644 --- a/cabal.ghc948.Unix.project +++ b/cabal.ghc948.Unix.project @@ -11,29 +11,26 @@ else constraints: http-io-streams -brotli, any.aeson >= 2.0.1.0, - any.hsc2hs ==0.68.8, + any.hsc2hs >=0.68.10, bzlib-conduit >= 0.3.0.3, bz2 >= 1.0.1.1, bzlib >= 0.5.2.0, directory >= 1.3.8.3, - filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0 + filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0, + tar >= 0.6.2.0 constraints: text -simdutf if os(mingw32) constraints: zlib +bundled-c-zlib, lzma +static, + text -simdutf, vty-windows >=0.2.0.2 if impl(ghc >= 9.4) constraints: language-c >= 0.9.3 -source-repository-package - type: git - location: https://github.com/haskell/tar.git - tag: d94a988be4311b830149a9f8fc16739927e5fc1c - source-repository-package type: git location: https://github.com/hasufell/uri-bytestring.git diff --git a/cabal.ghc948.Unix.project.freeze b/cabal.ghc948.Unix.project.freeze index c3f506d2..c99c0983 100644 --- a/cabal.ghc948.Unix.project.freeze +++ b/cabal.ghc948.Unix.project.freeze @@ -102,13 +102,14 @@ constraints: any.Cabal ==3.10.3.0, any.haskell-lexer ==1.1.1, any.haskus-utils-data ==1.4, any.haskus-utils-types ==1.5.1, - any.haskus-utils-variant ==3.3, - any.hsc2hs ==0.68.8, + any.haskus-utils-variant ==3.4, + haskus-utils-variant +unliftio, + any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, - any.hspec ==2.10.10, - any.hspec-core ==2.10.10, - any.hspec-discover ==2.10.10, - any.hspec-expectations ==0.8.2, + any.hspec ==2.11.8, + any.hspec-core ==2.11.8, + any.hspec-discover ==2.11.8, + any.hspec-expectations ==0.8.4, any.hspec-golden-aeson ==0.9.0.0, any.http-io-streams ==0.1.7.0, http-io-streams -brotli +fast-xor, @@ -180,7 +181,6 @@ constraints: any.Cabal ==3.10.3.0, semialign +semigroupoids, any.semigroupoids ==6.0.0.1, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, - any.setenv ==0.1.1.3, any.split ==0.2.5, any.splitmix ==0.1.0.5, splitmix -optimised-mixer, @@ -192,7 +192,7 @@ constraints: any.Cabal ==3.10.3.0, any.tagged ==0.8.8, tagged +deepseq +transformers, any.tagsoup ==0.14.8, - any.tar ==0.6.0.0, + any.tar ==0.6.2.0, any.tasty ==1.5, tasty +unix, any.tasty-hunit ==0.10.1, @@ -224,7 +224,7 @@ constraints: any.Cabal ==3.10.3.0, any.typed-process ==0.2.11.1, any.unix ==2.8.5.1, unix -os-string, - any.unix-bytestring ==0.3.7.8, + any.unix-bytestring ==0.4.0.1, any.unix-compat ==0.7.1, unix-compat -old-time, any.unliftio-core ==0.2.1.0, diff --git a/cabal.ghc948.Win32.project b/cabal.ghc948.Win32.project index f7c488ec..9ed85dd8 100644 --- a/cabal.ghc948.Win32.project +++ b/cabal.ghc948.Win32.project @@ -11,12 +11,15 @@ else constraints: http-io-streams -brotli, any.aeson >= 2.0.1.0, - any.hsc2hs ==0.68.8, + any.hsc2hs >=0.68.10, bzlib-conduit >= 0.3.0.3, bz2 >= 1.0.1.1, bzlib >= 0.5.2.0, directory >= 1.3.8.3, - filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0 + filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0, + tar >= 0.6.2.0 + +constraints: text -simdutf if os(mingw32) constraints: zlib +bundled-c-zlib, @@ -28,11 +31,6 @@ if os(mingw32) constraints: language-c >= 0.9.3 -source-repository-package - type: git - location: https://github.com/haskell/tar.git - tag: d94a988be4311b830149a9f8fc16739927e5fc1c - source-repository-package type: git location: https://github.com/hasufell/uri-bytestring.git diff --git a/cabal.ghc948.Win32.project.freeze b/cabal.ghc948.Win32.project.freeze index 21cbbe1e..c8ca03bb 100644 --- a/cabal.ghc948.Win32.project.freeze +++ b/cabal.ghc948.Win32.project.freeze @@ -99,13 +99,14 @@ constraints: any.Cabal ==3.10.3.0, any.haskell-lexer ==1.1.1, any.haskus-utils-data ==1.4, any.haskus-utils-types ==1.5.1, - any.haskus-utils-variant ==3.3, - any.hsc2hs ==0.68.8, + any.haskus-utils-variant ==3.4, + haskus-utils-variant +unliftio, + any.hsc2hs ==0.68.10, hsc2hs -in-ghc-tree, - any.hspec ==2.10.10, - any.hspec-core ==2.10.10, - any.hspec-discover ==2.10.10, - any.hspec-expectations ==0.8.2, + any.hspec ==2.11.7, + any.hspec-core ==2.11.7, + any.hspec-discover ==2.11.7, + any.hspec-expectations ==0.8.4, any.hspec-golden-aeson ==0.9.0.0, any.indexed-profunctors ==0.1.1.1, any.indexed-traversable ==0.1.3, @@ -173,7 +174,6 @@ constraints: any.Cabal ==3.10.3.0, semialign +semigroupoids, any.semigroupoids ==6.0.0.1, semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, - any.setenv ==0.1.1.3, any.split ==0.2.5, any.splitmix ==0.1.0.5, splitmix -optimised-mixer, @@ -185,7 +185,7 @@ constraints: any.Cabal ==3.10.3.0, any.tagged ==0.8.8, tagged +deepseq +transformers, any.tagsoup ==0.14.8, - any.tar ==0.6.0.0, + any.tar ==0.6.2.0, any.tasty ==1.5, tasty +unix, any.tasty-hunit ==0.10.1, diff --git a/cabal.ghc948.Win32.project.freeze.orig b/cabal.ghc948.Win32.project.freeze.orig new file mode 100644 index 00000000..bb80f67f --- /dev/null +++ b/cabal.ghc948.Win32.project.freeze.orig @@ -0,0 +1,256 @@ +active-repositories: hackage.haskell.org:merge +constraints: any.Cabal ==3.10.3.0, + any.Cabal-syntax ==3.10.3.0, + any.HUnit ==1.6.2.0, + any.OneTuple ==0.4.1.1, + any.QuickCheck ==2.14.3, + QuickCheck -old-random +templatehaskell, + any.StateVar ==1.2.2, + any.Win32 ==2.12.0.1 || ==2.13.4.0, + any.aeson ==2.2.1.0, + aeson +ordered-keymap, + any.aeson-pretty ==0.8.10, + aeson-pretty +lib-only, + any.alex ==3.5.1.0, + any.ansi-terminal ==1.0.2, + ansi-terminal -example, + any.ansi-terminal-types ==0.11.5, + any.ansi-wl-pprint ==0.6.9, + ansi-wl-pprint -example, + any.array ==0.5.4.0, + any.assoc ==1.1, + assoc +tagged, + any.async ==2.2.5, + async -bench, + any.attoparsec ==0.14.4, + attoparsec -developer, + any.base ==4.17.2.1, + any.base-compat ==0.13.1, + any.base-orphans ==0.9.1, + any.base16-bytestring ==1.0.2.0, + any.bifunctors ==5.6.2, + bifunctors +tagged, + any.bimap ==0.5.0, + any.binary ==0.8.9.1, + any.binary-instances ==1.0.4, + any.binary-orphans ==1.0.4.1, + any.bindings-DSL ==1.0.25, + any.bitvec ==1.1.5.0, + bitvec +simd, + any.blaze-builder ==0.4.2.3, + any.brick ==2.1.1, + brick -demos, + any.bytestring ==0.11.5.3, + any.bz2 ==1.0.1.2, + bz2 -cross +with-bzlib, + any.bzip2-clib ==1.0.8, + any.bzlib-conduit ==0.3.0.3, + any.c2hs ==0.28.8, + c2hs +base3 -regression, + any.cabal-install-parsers ==0.6.1.1, + any.cabal-plan ==0.7.3.0, + cabal-plan -_ -exe -license-report, + any.call-stack ==0.4.0, + any.case-insensitive ==1.2.1.0, + any.casing ==0.1.4.1, + any.cereal ==0.5.8.3, + cereal -bytestring-builder, + any.colour ==2.3.6, + any.comonad ==5.0.8, + comonad +containers +distributive +indexed-traversable, + any.conduit ==1.3.5, + any.conduit-extra ==1.3.6, + any.conduit-zstd ==0.0.2.0, + any.config-ini ==0.2.7.0, + config-ini -enable-doctests, + any.containers ==0.6.7, + any.contravariant ==1.5.5, + contravariant +semigroups +statevar +tagged, + any.cryptohash-sha256 ==0.11.102.1, + cryptohash-sha256 -exe +use-cbits, + any.data-clist ==0.2, + any.data-default-class ==0.1.2.0, + any.data-fix ==0.3.2, + any.deepseq ==1.4.8.0, + any.digest ==0.0.2.1, + digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config, + any.directory ==1.3.7.1 || ==1.3.8.4, + directory -os-string, + any.disk-free-space ==0.1.0.1, + any.distributive ==0.6.2.1, + distributive +semigroups +tagged, + any.dlist ==1.0, + dlist -werror, + any.exceptions ==0.10.5, + any.file-uri ==0.1.0.0, + any.filepath ==1.4.2.2 || ==1.4.300.1, + filepath -cpphs, + any.foldable1-classes-compat ==0.1, + foldable1-classes-compat +tagged, + any.free ==5.2, + any.generic-arbitrary ==0.2.2, + any.generically ==0.1.1, + any.ghc-bignum ==1.3, + any.ghc-boot-th ==9.4.8, + any.ghc-prim ==0.9.1, + any.happy ==1.20.1.1, + any.hashable ==1.4.4.0, + hashable +integer-gmp -random-initial-seed, + any.haskell-lexer ==1.1.1, + any.haskus-utils-data ==1.4, + any.haskus-utils-types ==1.5.1, +<<<<<<< HEAD + any.haskus-utils-variant ==3.3, + any.hsc2hs ==0.68.8, +======= + any.haskus-utils-variant ==3.4, + haskus-utils-variant +unliftio, + any.heaps ==0.4, + any.hsc2hs ==0.68.10, +>>>>>>> cb74721 (Support GHC-9.6 wrt #979) + hsc2hs -in-ghc-tree, + any.hspec ==2.11.7, + any.hspec-core ==2.11.7, + any.hspec-discover ==2.11.7, + any.hspec-expectations ==0.8.4, + any.hspec-golden-aeson ==0.9.0.0, + any.indexed-profunctors ==0.1.1.1, + any.indexed-traversable ==0.1.3, + any.indexed-traversable-instances ==0.1.1.2, + any.integer-conversion ==0.1.0.1, + any.integer-logarithms ==1.0.3.1, + integer-logarithms -check-bounds +integer-gmp, + any.language-c ==0.9.3, + language-c -allwarnings +iecfpextension +usebytestrings, + any.libyaml ==0.1.4, + libyaml -no-unicode -system-libyaml, + any.libyaml-clib ==0.2.5, + any.lukko ==0.1.1.3, + lukko +ofd-locking, + any.lzma-static ==5.2.5.5, + any.megaparsec ==9.2.2, + megaparsec -dev, + any.microlens ==0.4.13.1, + any.microlens-mtl ==0.2.0.3, + any.microlens-th ==0.4.3.14, + any.monad-control ==1.0.3.1, + any.mono-traversable ==1.0.17.0, + any.mtl ==2.2.2, + any.mtl-compat ==0.2.2, + mtl-compat -two-point-one -two-point-two, + any.network ==3.2.0.0, + network -devel, + any.network-uri ==2.6.4.2, + any.optics ==0.4.2.1, + any.optics-core ==0.4.1.1, + optics-core -explicit-generic-labels, + any.optics-extra ==0.4.2.1, + any.optics-th ==0.4.1, + any.optparse-applicative ==0.17.1.0, + optparse-applicative +process, + any.os-release ==1.0.2.1, + os-release -devel, + any.os-string ==2.0.2, + any.parsec ==3.1.16.1, + any.parser-combinators ==1.3.0, + parser-combinators -dev, + any.pretty ==1.1.3.6, + any.pretty-terminal ==0.1.0.0, +<<<<<<< HEAD + any.primitive ==0.9.0.0, +======= + any.primitive ==0.8.0.0, +>>>>>>> cb74721 (Support GHC-9.6 wrt #979) + any.process ==1.6.18.0 || ==1.6.19.0, + any.profunctors ==5.6.2, + any.quickcheck-arbitrary-adt ==0.3.1.0, + any.quickcheck-io ==0.2.0, + any.random ==1.2.1.2, + any.recursion-schemes ==5.2.2.5, + recursion-schemes +template-haskell, + any.regex-base ==0.94.0.2, + any.regex-posix ==0.96.0.1, + regex-posix -_regex-posix-clib, + any.regex-posix-clib ==2.7, + any.resourcet ==1.2.6, + any.retry ==0.9.3.1, + retry -lib-werror, + any.rts ==1.0.2, + any.safe ==0.3.21, + any.safe-exceptions ==0.1.7.4, + any.scientific ==0.3.7.0, + scientific -bytestring-builder -integer-simple, + any.semialign ==1.3, + semialign +semigroupoids, + any.semigroupoids ==6.0.0.1, + semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, + any.split ==0.2.5, + any.splitmix ==0.1.0.5, + splitmix -optimised-mixer, + any.stm ==2.5.1.0, + any.streaming-commons ==0.2.2.6, + streaming-commons -use-bytestring-builder, + any.strict ==0.5, + any.strict-base ==0.4.0.0, + any.tagged ==0.8.8, + tagged +deepseq +transformers, + any.tagsoup ==0.14.8, + any.tar ==0.6.2.0, + any.tasty ==1.5, + tasty +unix, + any.tasty-hunit ==0.10.1, + any.template-haskell ==2.19.0.0, + any.temporary ==1.3, + any.text ==2.0.2, + any.text-binary ==0.2.1.1, + any.text-iso8601 ==0.1, + any.text-short ==0.1.5, + text-short -asserts, + any.text-zipper ==0.13, + any.tf-random ==0.5, + any.th-abstraction ==0.6.0.0, + any.th-compat ==0.1.5, + any.th-lift ==0.8.4, + any.th-lift-instances ==0.1.20, + any.these ==1.2, + any.time ==1.11.1.2 || ==1.12.2, + any.time-compat ==1.9.6.1, + time-compat -old-locale, + any.transformers ==0.5.6.2, + any.transformers-base ==0.4.6, + transformers-base +orphaninstances, + any.transformers-compat ==0.7.2, + transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, + any.typed-process ==0.2.11.1, + any.unix-compat ==0.7.1, + unix-compat -old-time, + any.unliftio-core ==0.2.1.0, + any.unordered-containers ==0.2.20, + unordered-containers -debug, + any.uri-bytestring ==0.3.3.1, + uri-bytestring -lib-werror, + any.utf8-string ==1.0.2, + any.uuid-types ==1.0.5.1, + any.vector ==0.13.1.0, + vector +boundschecks -internalchecks -unsafechecks -wall, + any.vector-algorithms ==0.9.0.1, + vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, + any.vector-binary-instances ==0.2.5.2, + any.vector-stream ==0.1.0.1, + any.versions ==6.0.6, + any.vty ==6.2, + any.vty-crossplatform ==0.4.0.0, + vty-crossplatform -demos, + any.vty-windows ==0.2.0.2, + any.witherable ==0.4.2, + any.word-wrap ==0.5, + any.word8 ==0.1.3, + any.yaml ==0.11.11.2, + yaml +no-examples +no-exe, + any.zip ==2.0.0, + zip -dev -disable-bzip2 -disable-zstd, + any.zlib ==0.6.3.0, + zlib +bundled-c-zlib -non-blocking-ffi -pkg-config, + any.zstd ==0.1.3.0, + zstd +standalone +index-state: hackage.haskell.org 2024-04-15T02:49:22Z diff --git a/cabal.ghc948.Win32.project.orig b/cabal.ghc948.Win32.project.orig new file mode 100644 index 00000000..8a1ef7b7 --- /dev/null +++ b/cabal.ghc948.Win32.project.orig @@ -0,0 +1,66 @@ +packages: ./ghcup.cabal + +optional-packages: ./vendored/*/*.cabal + +if impl(ghc < 9.0) + package ghcup + flags: +tui -tar +else + package ghcup + flags: +tui +tar + +constraints: http-io-streams -brotli, + any.aeson >= 2.0.1.0, + any.hsc2hs >=0.68.10, + bzlib-conduit >= 0.3.0.3, + bz2 >= 1.0.1.1, + bzlib >= 0.5.2.0, + directory >= 1.3.8.3, + filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0, + tar >= 0.6.2.0 + +if os(mingw32) + constraints: zlib +bundled-c-zlib, + lzma +static, + text -simdutf, + vty-windows >=0.2.0.2 + + if impl(ghc >= 9.4) + constraints: language-c >= 0.9.3 + + +source-repository-package + type: git + location: https://github.com/hasufell/uri-bytestring.git + tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 + +package libarchive + flags: -system-libarchive + +package aeson-pretty + flags: +lib-only + +package cabal-plan + flags: -exe + +package aeson + flags: +ordered-keymap + +<<<<<<< HEAD +package * + test-show-details: direct + +allow-newer: cabal-install-parsers:tar +======= +package streamly + flags: +use-unliftio -streamly-core + +package * + test-show-details: direct + +if impl(ghc >= 9.6) + allow-newer: streamly:Win32, streamly:ghc-prim, streamly:unicode-data, streamly:base, semigroupoids:base +else + allow-newer: streamly:Win32 +>>>>>>> cb74721 (Support GHC-9.6 wrt #979) + diff --git a/cabal.ghc965.Unix.project b/cabal.ghc965.Unix.project new file mode 100644 index 00000000..dedb9163 --- /dev/null +++ b/cabal.ghc965.Unix.project @@ -0,0 +1,55 @@ +packages: ./ghcup.cabal + +optional-packages: ./vendored/*/*.cabal + +if impl(ghc < 9.0) + package ghcup + flags: +tui -tar +else + package ghcup + flags: +tui +tar + +constraints: http-io-streams -brotli, + any.aeson >= 2.0.1.0, + any.hsc2hs >=0.68.10, + bzlib-conduit >= 0.3.0.3, + bz2 >= 1.0.1.1, + bzlib >= 0.5.2.0, + directory >= 1.3.8.3, + filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0, + tar >= 0.6.2.0 + +constraints: text -simdutf + +if os(mingw32) + constraints: zlib +bundled-c-zlib, + lzma +static, + text -simdutf, + vty-windows >=0.2.0.2 + + if impl(ghc >= 9.4) + constraints: language-c >= 0.9.3 + + +source-repository-package + type: git + location: https://github.com/hasufell/uri-bytestring.git + tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 + +package libarchive + flags: -system-libarchive + +package aeson-pretty + flags: +lib-only + +package cabal-plan + flags: -exe + +package aeson + flags: +ordered-keymap + +package * + test-show-details: direct + +allow-newer: cabal-install-parsers:tar + diff --git a/cabal.ghc965.Unix.project.freeze b/cabal.ghc965.Unix.project.freeze new file mode 100644 index 00000000..9276e66f --- /dev/null +++ b/cabal.ghc965.Unix.project.freeze @@ -0,0 +1,258 @@ +active-repositories: hackage.haskell.org:merge +constraints: any.Cabal ==3.10.3.0, + any.Cabal-syntax ==3.10.3.0, + any.HUnit ==1.6.2.0, + any.HsOpenSSL ==0.11.7.6, + HsOpenSSL -fast-bignum -homebrew-openssl -macports-openssl -use-pkg-config, + any.OneTuple ==0.4.1.1, + any.QuickCheck ==2.14.3, + QuickCheck -old-random +templatehaskell, + any.StateVar ==1.2.2, + any.aeson ==2.2.1.0, + aeson +ordered-keymap, + any.aeson-pretty ==0.8.10, + aeson-pretty +lib-only, + any.alex ==3.5.1.0, + any.ansi-terminal ==1.0.2, + ansi-terminal -example, + any.ansi-terminal-types ==0.11.5, + any.ansi-wl-pprint ==0.6.9, + ansi-wl-pprint -example, + any.array ==0.5.6.0, + any.assoc ==1.1, + assoc +tagged, + any.async ==2.2.5, + async -bench, + any.attoparsec ==0.14.4, + attoparsec -developer, + any.base ==4.18.2.1, + any.base-compat ==0.13.1, + any.base-orphans ==0.9.1, + any.base16-bytestring ==1.0.2.0, + any.base64-bytestring ==1.2.1.0, + any.bifunctors ==5.6.2, + bifunctors +tagged, + any.bimap ==0.5.0, + any.binary ==0.8.9.1, + any.binary-instances ==1.0.4, + any.binary-orphans ==1.0.4.1, + any.bindings-DSL ==1.0.25, + any.bitvec ==1.1.5.0, + bitvec +simd, + any.blaze-builder ==0.4.2.3, + any.brick ==2.1.1, + brick -demos, + any.bytestring ==0.11.5.3, + any.bz2 ==1.0.1.2, + bz2 -cross +with-bzlib, + any.bzlib-conduit ==0.3.0.3, + any.c2hs ==0.28.8, + c2hs +base3 -regression, + any.cabal-install-parsers ==0.6.1.1, + any.cabal-plan ==0.7.3.0, + cabal-plan -_ -exe -license-report, + any.call-stack ==0.4.0, + any.case-insensitive ==1.2.1.0, + any.casing ==0.1.4.1, + any.cereal ==0.5.8.3, + cereal -bytestring-builder, + any.colour ==2.3.6, + any.comonad ==5.0.8, + comonad +containers +distributive +indexed-traversable, + any.conduit ==1.3.5, + any.conduit-extra ==1.3.6, + any.conduit-zstd ==0.0.2.0, + any.config-ini ==0.2.7.0, + config-ini -enable-doctests, + any.containers ==0.6.7, + any.contravariant ==1.5.5, + contravariant +semigroups +statevar +tagged, + any.cryptohash-sha1 ==0.11.101.0, + any.cryptohash-sha256 ==0.11.102.1, + cryptohash-sha256 -exe +use-cbits, + any.data-clist ==0.2, + any.data-default-class ==0.1.2.0, + any.data-fix ==0.3.2, + any.deepseq ==1.4.8.1, + any.digest ==0.0.2.1, + digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config, + any.directory ==1.3.8.4, + directory -os-string, + any.disk-free-space ==0.1.0.1, + any.distributive ==0.6.2.1, + distributive +semigroups +tagged, + any.dlist ==1.0, + dlist -werror, + any.exceptions ==0.10.7, + any.file-uri ==0.1.0.0, + any.filepath ==1.4.300.1, + any.free ==5.2, + any.generic-arbitrary ==0.2.2, + any.generically ==0.1.1, + any.ghc-bignum ==1.3, + any.ghc-boot-th ==9.6.5, + any.ghc-byteorder ==4.11.0.0.10, + any.ghc-prim ==0.10.0, + any.happy ==1.20.1.1, + any.hashable ==1.4.4.0, + hashable +integer-gmp -random-initial-seed, + any.haskell-lexer ==1.1.1, + any.haskus-utils-data ==1.4, + any.haskus-utils-types ==1.5.1, + any.haskus-utils-variant ==3.4, + haskus-utils-variant +unliftio, + any.hsc2hs ==0.68.10, + hsc2hs -in-ghc-tree, + any.hspec ==2.11.8, + any.hspec-core ==2.11.8, + any.hspec-discover ==2.11.8, + any.hspec-expectations ==0.8.4, + any.hspec-golden-aeson ==0.9.0.0, + any.http-io-streams ==0.1.7.0, + http-io-streams -brotli +fast-xor, + any.indexed-profunctors ==0.1.1.1, + any.indexed-traversable ==0.1.3, + any.indexed-traversable-instances ==0.1.1.2, + any.integer-conversion ==0.1.0.1, + any.integer-logarithms ==1.0.3.1, + integer-logarithms -check-bounds +integer-gmp, + any.io-streams ==1.5.2.2, + io-streams +network -nointeractivetests +zlib, + any.language-c ==0.9.3, + language-c -allwarnings +iecfpextension +usebytestrings, + any.libyaml ==0.1.4, + libyaml -no-unicode -system-libyaml, + any.libyaml-clib ==0.2.5, + any.lukko ==0.1.1.3, + lukko +ofd-locking, + any.lzma-static ==5.2.5.5, + any.megaparsec ==9.2.2, + megaparsec -dev, + any.microlens ==0.4.13.1, + any.microlens-mtl ==0.2.0.3, + any.microlens-th ==0.4.3.15, + any.monad-control ==1.0.3.1, + any.mono-traversable ==1.0.17.0, + any.mtl ==2.3.1, + any.mtl-compat ==0.2.2, + mtl-compat -two-point-one -two-point-two, + any.network ==3.1.4.0, + network -devel, + any.network-uri ==2.6.4.2, + any.openssl-streams ==1.2.3.0, + any.optics ==0.4.2.1, + any.optics-core ==0.4.1.1, + optics-core -explicit-generic-labels, + any.optics-extra ==0.4.2.1, + any.optics-th ==0.4.1, + any.optparse-applicative ==0.17.1.0, + optparse-applicative +process, + any.os-release ==1.0.2.1, + os-release -devel, + any.os-string ==2.0.2.1, + any.parsec ==3.1.16.1, + any.parser-combinators ==1.3.0, + parser-combinators -dev, + any.pretty ==1.1.3.6, + any.pretty-terminal ==0.1.0.0, + any.primitive ==0.9.0.0, + any.process ==1.6.19.0, + any.profunctors ==5.6.2, + any.quickcheck-arbitrary-adt ==0.3.1.0, + any.quickcheck-io ==0.2.0, + any.random ==1.2.1.2, + any.recursion-schemes ==5.2.2.5, + recursion-schemes +template-haskell, + any.regex-base ==0.94.0.2, + any.regex-posix ==0.96.0.1, + regex-posix -_regex-posix-clib, + any.resourcet ==1.2.6, + any.retry ==0.9.3.1, + retry -lib-werror, + any.rts ==1.0.2, + any.safe ==0.3.21, + any.safe-exceptions ==0.1.7.4, + any.scientific ==0.3.7.0, + scientific -bytestring-builder -integer-simple, + any.semialign ==1.3, + semialign +semigroupoids, + any.semigroupoids ==6.0.0.1, + semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, + any.split ==0.2.5, + any.splitmix ==0.1.0.5, + splitmix -optimised-mixer, + any.stm ==2.5.1.0, + any.streaming-commons ==0.2.2.6, + streaming-commons -use-bytestring-builder, + any.strict ==0.5, + any.strict-base ==0.4.0.0, + any.tagged ==0.8.8, + tagged +deepseq +transformers, + any.tagsoup ==0.14.8, + any.tar ==0.6.2.0, + any.tasty ==1.5, + tasty +unix, + any.tasty-hunit ==0.10.1, + any.template-haskell ==2.20.0.0, + any.temporary ==1.3, + any.terminal-progress-bar ==0.4.2, + any.terminal-size ==0.3.4, + any.terminfo ==0.4.1.6, + any.text ==2.0.2, + any.text-binary ==0.2.1.1, + any.text-iso8601 ==0.1, + any.text-short ==0.1.5, + text-short -asserts, + any.text-zipper ==0.13, + any.tf-random ==0.5, + any.th-abstraction ==0.6.0.0, + any.th-compat ==0.1.5, + any.th-lift ==0.8.4, + any.th-lift-instances ==0.1.20, + any.these ==1.2, + any.time ==1.11.1.2, + any.time-compat ==1.9.6.1, + time-compat -old-locale, + any.transformers ==0.6.1.0, + any.transformers-base ==0.4.6, + transformers-base +orphaninstances, + any.transformers-compat ==0.7.2, + transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, + any.typed-process ==0.2.11.1, + any.unix ==2.8.5.1, + unix -os-string, + any.unix-bytestring ==0.4.0.1, + any.unix-compat ==0.7.1, + unix-compat -old-time, + any.unliftio-core ==0.2.1.0, + any.unordered-containers ==0.2.20, + unordered-containers -debug, + any.uri-bytestring ==0.3.3.1, + uri-bytestring -lib-werror, + any.utf8-string ==1.0.2, + any.uuid-types ==1.0.5.1, + any.vector ==0.13.1.0, + vector +boundschecks -internalchecks -unsafechecks -wall, + any.vector-algorithms ==0.9.0.1, + vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, + any.vector-binary-instances ==0.2.5.2, + any.vector-stream ==0.1.0.1, + any.versions ==6.0.6, + any.vty ==6.2, + any.vty-crossplatform ==0.4.0.0, + vty-crossplatform -demos, + any.vty-unix ==0.2.0.0, + any.witherable ==0.4.2, + any.word-wrap ==0.5, + any.word8 ==0.1.3, + any.xor ==0.0.1.2, + any.yaml ==0.11.11.2, + yaml +no-examples +no-exe, + any.zip ==2.0.1, + zip -dev -disable-bzip2 -disable-zstd, + any.zlib ==0.6.3.0, + zlib -bundled-c-zlib -non-blocking-ffi -pkg-config, + any.zlib-bindings ==0.1.1.5, + any.zstd ==0.1.3.0, + zstd +standalone +index-state: hackage.haskell.org 2024-04-27T07:39:32Z diff --git a/cabal.ghc965.Win32.project b/cabal.ghc965.Win32.project new file mode 100644 index 00000000..9ed85dd8 --- /dev/null +++ b/cabal.ghc965.Win32.project @@ -0,0 +1,55 @@ +packages: ./ghcup.cabal + +optional-packages: ./vendored/*/*.cabal + +if impl(ghc < 9.0) + package ghcup + flags: +tui -tar +else + package ghcup + flags: +tui +tar + +constraints: http-io-streams -brotli, + any.aeson >= 2.0.1.0, + any.hsc2hs >=0.68.10, + bzlib-conduit >= 0.3.0.3, + bz2 >= 1.0.1.1, + bzlib >= 0.5.2.0, + directory >= 1.3.8.3, + filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0, + tar >= 0.6.2.0 + +constraints: text -simdutf + +if os(mingw32) + constraints: zlib +bundled-c-zlib, + lzma +static, + text -simdutf, + vty-windows >=0.2.0.2 + + if impl(ghc >= 9.4) + constraints: language-c >= 0.9.3 + + +source-repository-package + type: git + location: https://github.com/hasufell/uri-bytestring.git + tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 + +package libarchive + flags: -system-libarchive + +package aeson-pretty + flags: +lib-only + +package cabal-plan + flags: -exe + +package aeson + flags: +ordered-keymap + +package * + test-show-details: direct + +allow-newer: cabal-install-parsers:tar + diff --git a/cabal.ghc965.Win32.project.freeze b/cabal.ghc965.Win32.project.freeze new file mode 100644 index 00000000..80ca36ef --- /dev/null +++ b/cabal.ghc965.Win32.project.freeze @@ -0,0 +1,243 @@ +active-repositories: hackage.haskell.org:merge +constraints: any.Cabal ==3.10.3.0, + any.Cabal-syntax ==3.10.3.0, + any.HUnit ==1.6.2.0, + any.OneTuple ==0.4.1.1, + any.QuickCheck ==2.14.3, + QuickCheck -old-random +templatehaskell, + any.StateVar ==1.2.2, + any.Win32 ==2.13.3.0, + any.aeson ==2.2.1.0, + aeson +ordered-keymap, + any.aeson-pretty ==0.8.10, + aeson-pretty +lib-only, + any.alex ==3.5.1.0, + any.ansi-terminal ==1.0.2, + ansi-terminal -example, + any.ansi-terminal-types ==0.11.5, + any.ansi-wl-pprint ==0.6.9, + ansi-wl-pprint -example, + any.array ==0.5.6.0, + any.assoc ==1.1, + assoc +tagged, + any.async ==2.2.5, + async -bench, + any.attoparsec ==0.14.4, + attoparsec -developer, + any.base ==4.18.2.1, + any.base-compat ==0.13.1, + any.base-orphans ==0.9.1, + any.base16-bytestring ==1.0.2.0, + any.bifunctors ==5.6.2, + bifunctors +tagged, + any.bimap ==0.5.0, + any.binary ==0.8.9.1, + any.binary-instances ==1.0.4, + any.binary-orphans ==1.0.4.1, + any.bindings-DSL ==1.0.25, + any.bitvec ==1.1.5.0, + bitvec +simd, + any.blaze-builder ==0.4.2.3, + any.brick ==2.1.1, + brick -demos, + any.bytestring ==0.11.5.3, + any.bz2 ==1.0.1.2, + bz2 -cross +with-bzlib, + any.bzip2-clib ==1.0.8, + any.bzlib-conduit ==0.3.0.3, + any.c2hs ==0.28.8, + c2hs +base3 -regression, + any.cabal-install-parsers ==0.6.1.1, + any.cabal-plan ==0.7.3.0, + cabal-plan -_ -exe -license-report, + any.call-stack ==0.4.0, + any.case-insensitive ==1.2.1.0, + any.casing ==0.1.4.1, + any.cereal ==0.5.8.3, + cereal -bytestring-builder, + any.colour ==2.3.6, + any.comonad ==5.0.8, + comonad +containers +distributive +indexed-traversable, + any.conduit ==1.3.5, + any.conduit-extra ==1.3.6, + any.conduit-zstd ==0.0.2.0, + any.config-ini ==0.2.7.0, + config-ini -enable-doctests, + any.containers ==0.6.7, + any.contravariant ==1.5.5, + contravariant +semigroups +statevar +tagged, + any.cryptohash-sha256 ==0.11.102.1, + cryptohash-sha256 -exe +use-cbits, + any.data-clist ==0.2, + any.data-default-class ==0.1.2.0, + any.data-fix ==0.3.2, + any.deepseq ==1.4.8.1, + any.digest ==0.0.2.1, + digest -have_arm64_crc32c -have_builtin_prefetch -have_mm_prefetch -have_sse42 -have_strong_getauxval -have_weak_getauxval +pkg-config, + any.directory ==1.3.8.4, + directory -os-string, + any.disk-free-space ==0.1.0.1, + any.distributive ==0.6.2.1, + distributive +semigroups +tagged, + any.dlist ==1.0, + dlist -werror, + any.exceptions ==0.10.7, + any.file-uri ==0.1.0.0, + any.filepath ==1.4.300.1, + any.free ==5.2, + any.generic-arbitrary ==0.2.2, + any.generically ==0.1.1, + any.ghc-bignum ==1.3, + any.ghc-boot-th ==9.6.5, + any.ghc-prim ==0.10.0, + any.happy ==1.20.1.1, + any.hashable ==1.4.4.0, + hashable +integer-gmp -random-initial-seed, + any.haskell-lexer ==1.1.1, + any.haskus-utils-data ==1.4, + any.haskus-utils-types ==1.5.1, + any.haskus-utils-variant ==3.4, + haskus-utils-variant +unliftio, + any.hsc2hs ==0.68.10, + hsc2hs -in-ghc-tree, + any.hspec ==2.11.7, + any.hspec-core ==2.11.7, + any.hspec-discover ==2.11.7, + any.hspec-expectations ==0.8.4, + any.hspec-golden-aeson ==0.9.0.0, + any.indexed-profunctors ==0.1.1.1, + any.indexed-traversable ==0.1.3, + any.indexed-traversable-instances ==0.1.1.2, + any.integer-conversion ==0.1.0.1, + any.integer-logarithms ==1.0.3.1, + integer-logarithms -check-bounds +integer-gmp, + any.language-c ==0.9.3, + language-c -allwarnings +iecfpextension +usebytestrings, + any.libyaml ==0.1.4, + libyaml -no-unicode -system-libyaml, + any.libyaml-clib ==0.2.5, + any.lukko ==0.1.1.3, + lukko +ofd-locking, + any.lzma-static ==5.2.5.5, + any.megaparsec ==9.2.2, + megaparsec -dev, + any.microlens ==0.4.13.1, + any.microlens-mtl ==0.2.0.3, + any.microlens-th ==0.4.3.14, + any.monad-control ==1.0.3.1, + any.mono-traversable ==1.0.17.0, + any.mtl ==2.3.1, + any.mtl-compat ==0.2.2, + mtl-compat -two-point-one -two-point-two, + any.network ==3.2.0.0, + network -devel, + any.network-uri ==2.6.4.2, + any.optics ==0.4.2.1, + any.optics-core ==0.4.1.1, + optics-core -explicit-generic-labels, + any.optics-extra ==0.4.2.1, + any.optics-th ==0.4.1, + any.optparse-applicative ==0.17.1.0, + optparse-applicative +process, + any.os-release ==1.0.2.1, + os-release -devel, + any.os-string ==2.0.2, + any.parsec ==3.1.16.1, + any.parser-combinators ==1.3.0, + parser-combinators -dev, + any.pretty ==1.1.3.6, + any.pretty-terminal ==0.1.0.0, + any.primitive ==0.9.0.0, + any.process ==1.6.19.0, + any.profunctors ==5.6.2, + any.quickcheck-arbitrary-adt ==0.3.1.0, + any.quickcheck-io ==0.2.0, + any.random ==1.2.1.2, + any.recursion-schemes ==5.2.2.5, + recursion-schemes +template-haskell, + any.regex-base ==0.94.0.2, + any.regex-posix ==0.96.0.1, + regex-posix -_regex-posix-clib, + any.regex-posix-clib ==2.7, + any.resourcet ==1.2.6, + any.retry ==0.9.3.1, + retry -lib-werror, + any.rts ==1.0.2, + any.safe ==0.3.21, + any.safe-exceptions ==0.1.7.4, + any.scientific ==0.3.7.0, + scientific -bytestring-builder -integer-simple, + any.semialign ==1.3, + semialign +semigroupoids, + any.semigroupoids ==6.0.0.1, + semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers, + any.split ==0.2.5, + any.splitmix ==0.1.0.5, + splitmix -optimised-mixer, + any.stm ==2.5.1.0, + any.streaming-commons ==0.2.2.6, + streaming-commons -use-bytestring-builder, + any.strict ==0.5, + any.strict-base ==0.4.0.0, + any.tagged ==0.8.8, + tagged +deepseq +transformers, + any.tagsoup ==0.14.8, + any.tar ==0.6.2.0, + any.tasty ==1.5, + tasty +unix, + any.tasty-hunit ==0.10.1, + any.template-haskell ==2.20.0.0, + any.temporary ==1.3, + any.text ==2.0.2, + any.text-binary ==0.2.1.1, + any.text-iso8601 ==0.1, + any.text-short ==0.1.5, + text-short -asserts, + any.text-zipper ==0.13, + any.tf-random ==0.5, + any.th-abstraction ==0.6.0.0, + any.th-compat ==0.1.5, + any.th-lift ==0.8.4, + any.th-lift-instances ==0.1.20, + any.these ==1.2, + any.time ==1.11.1.2, + any.time-compat ==1.9.6.1, + time-compat -old-locale, + any.transformers ==0.6.1.0, + any.transformers-base ==0.4.6, + transformers-base +orphaninstances, + any.transformers-compat ==0.7.2, + transformers-compat -five +five-three -four +generic-deriving +mtl -three -two, + any.typed-process ==0.2.11.1, + any.unix-compat ==0.7.1, + unix-compat -old-time, + any.unliftio-core ==0.2.1.0, + any.unordered-containers ==0.2.20, + unordered-containers -debug, + any.uri-bytestring ==0.3.3.1, + uri-bytestring -lib-werror, + any.utf8-string ==1.0.2, + any.uuid-types ==1.0.5.1, + any.vector ==0.13.1.0, + vector +boundschecks -internalchecks -unsafechecks -wall, + any.vector-algorithms ==0.9.0.1, + vector-algorithms +bench +boundschecks -internalchecks -llvm +properties -unsafechecks, + any.vector-binary-instances ==0.2.5.2, + any.vector-stream ==0.1.0.1, + any.versions ==6.0.6, + any.vty ==6.2, + any.vty-crossplatform ==0.4.0.0, + vty-crossplatform -demos, + any.vty-windows ==0.2.0.2, + any.witherable ==0.4.2, + any.word-wrap ==0.5, + any.word8 ==0.1.3, + any.yaml ==0.11.11.2, + yaml +no-examples +no-exe, + any.zip ==2.0.0, + zip -dev -disable-bzip2 -disable-zstd, + any.zlib ==0.6.3.0, + zlib +bundled-c-zlib -non-blocking-ffi -pkg-config, + any.zstd ==0.1.3.0, + zstd +standalone +index-state: hackage.haskell.org 2024-04-15T02:49:22Z diff --git a/cabal.ghc965.project b/cabal.ghc965.project new file mode 100644 index 00000000..57ed7c1d --- /dev/null +++ b/cabal.ghc965.project @@ -0,0 +1,8 @@ +if os(mingw32) + import: cabal.ghc965.Win32.project + import: cabal.ghc965.Win32.project.freeze +else + import: cabal.ghc965.Unix.project + import: cabal.ghc965.Unix.project.freeze + +with-compiler: ghc-9.6.5 diff --git a/cabal.project b/cabal.project index 6570f447..dedb9163 100644 --- a/cabal.project +++ b/cabal.project @@ -11,29 +11,26 @@ else constraints: http-io-streams -brotli, any.aeson >= 2.0.1.0, - any.hsc2hs ==0.68.8, + any.hsc2hs >=0.68.10, bzlib-conduit >= 0.3.0.3, bz2 >= 1.0.1.1, bzlib >= 0.5.2.0, directory >= 1.3.8.3, - filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0 + filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0, + tar >= 0.6.2.0 constraints: text -simdutf if os(mingw32) constraints: zlib +bundled-c-zlib, lzma +static, + text -simdutf, vty-windows >=0.2.0.2 if impl(ghc >= 9.4) constraints: language-c >= 0.9.3 -source-repository-package - type: git - location: https://github.com/haskell/tar.git - tag: d94a988be4311b830149a9f8fc16739927e5fc1c - source-repository-package type: git location: https://github.com/hasufell/uri-bytestring.git diff --git a/cabal.project.release b/cabal.project.release index 835877df..b1c57327 100644 --- a/cabal.project.release +++ b/cabal.project.release @@ -1,6 +1,4 @@ -packages: ./ghcup.cabal - -optional-packages: ./vendored/*/*.cabal +import: cabal.project optimization: 2 @@ -14,55 +12,9 @@ if os(linux) elif os(darwin) constraints: zlib +bundled-c-zlib, lzma +static -elif os(mingw32) - constraints: zlib +bundled-c-zlib, - lzma +static, - text -simdutf, - vty-windows >=0.2.0.2 - if impl(ghc >= 9.4) - constraints: language-c >= 0.9.3 elif os(freebsd) constraints: zlib +bundled-c-zlib, zip +disable-zstd package * ghc-options: -split-sections -constraints: http-io-streams -brotli, - any.aeson >= 2.0.1.0, - any.hsc2hs ==0.68.8, - bzlib-conduit >= 0.3.0.3, - bz2 >= 1.0.1.1, - bzlib >= 0.5.2.0, - directory >= 1.3.8.3, - filepath == 1.4.101.0 || == 1.4.300.1 || >= 1.5.2.0 - -package libarchive - flags: -system-libarchive - -package libyaml-streamly - flags: -system-libyaml - -package aeson-pretty - flags: +lib-only - -package cabal-plan - flags: -exe - -package aeson - flags: +ordered-keymap - -package streamly - flags: +use-unliftio - -source-repository-package - type: git - location: https://github.com/haskell/tar.git - tag: d94a988be4311b830149a9f8fc16739927e5fc1c - -source-repository-package - type: git - location: https://github.com/hasufell/uri-bytestring.git - tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 - -allow-newer: cabal-install-parsers:tar, streamly:Win32 - diff --git a/data/metadata b/data/metadata index c9dae0c5..99a488d8 160000 --- a/data/metadata +++ b/data/metadata @@ -1 +1 @@ -Subproject commit c9dae0c58799854823e8c41858ca4cc172ef4c8b +Subproject commit 99a488d812709c104954c607352e44c73a27441a diff --git a/ghcup.cabal b/ghcup.cabal index 3873442e..462fe21f 100644 --- a/ghcup.cabal +++ b/ghcup.cabal @@ -30,7 +30,8 @@ extra-source-files: test/ghcup-test/golden/unix/GHCupInfo.json test/ghcup-test/golden/windows/GHCupInfo.json -tested-with: GHC==9.4.8 +tested-with: GHC==9.6.4 + , GHC==9.4.8 , GHC==9.2.8 , GHC==9.0.2 , GHC==8.10.7 @@ -77,17 +78,18 @@ common app-common-depends , directory ^>=1.3.6.0 , filepath >=1.4.101.0 , haskus-utils-types ^>=1.5 - , haskus-utils-variant ^>=3.3 + , haskus-utils-variant ^>=3.3 || ^>=3.4 , megaparsec >=8.0.0 && <9.3 - , mtl ^>=2.2 + , mtl ^>=2.2 || ^>=2.3 , optparse-applicative >=0.15.1.0 && <0.18 , pretty ^>=1.1.3.1 , pretty-terminal ^>=0.1.0.0 , process ^>=1.6.11.0 - , resourcet ^>=1.2.2 + , resourcet ^>=1.2.2 || ^>=1.3 , safe ^>=0.3.18 , safe-exceptions ^>=0.1 , tagsoup ^>=0.14 + , transformers ^>=0.5 || ^>=0.6 , template-haskell >=2.7 && <2.22 , temporary ^>=1.3 , text ^>=2.0 @@ -189,16 +191,16 @@ library , filepath >=1.4.101.0 , file-uri ^>=0.1.0.0 , haskus-utils-types ^>=1.5 - , haskus-utils-variant ^>=3.3 + , haskus-utils-variant ^>=3.3 || ^>=3.4 , lzma-static ^>=5.2.5.3 , megaparsec >=8.0.0 && <9.3 - , mtl ^>=2.2 + , mtl ^>=2.2 || ^>=2.3 , optics ^>=0.4 , os-release ^>=1.0.0 , pretty ^>=1.1.3.1 , pretty-terminal ^>=0.1.0.0 , regex-posix ^>=0.96 - , resourcet ^>=1.2.2 + , resourcet ^>=1.2.2 || ^>=1.3 , retry >=0.8.1.2 && <0.10 , safe ^>=0.3.18 , safe-exceptions ^>=0.1 @@ -208,7 +210,7 @@ library , temporary ^>=1.3 , text ^>=2.0 , time >=1.9.3 && <1.12 - , transformers ^>=0.5 + , transformers ^>=0.5 || ^>=0.6 , unliftio-core ^>=0.2.0.1 , unordered-containers ^>=0.2.10.0 , uri-bytestring ^>=0.3.2.2 @@ -263,7 +265,7 @@ library build-depends: , terminal-size ^>=0.3.3 , unix ^>=2.7 || ^>=2.8 - , unix-bytestring ^>=0.3.7.3 + , unix-bytestring ^>=0.4 if flag(tui) cpp-options: -DBRICK @@ -354,7 +356,7 @@ executable ghcup other-modules: BrickMain build-depends: , brick ^>=2.1 - , transformers ^>=0.5 + , transformers ^>=0.5 || ^>=0.6 , vty ^>=6.0 || ^>=6.1 || ^>=6.2 , optics ^>=0.4 @@ -400,7 +402,7 @@ test-suite ghcup-test , filepath >=1.4.101.0 , generic-arbitrary >=0.1.0 && <0.2.1 || >=0.2.2 && <0.3 , ghcup - , hspec >=2.7.10 && <2.11 + , hspec >=2.7.10 && <2.12 , hspec-golden-aeson ^>=0.9 , QuickCheck ^>=2.14.1 , quickcheck-arbitrary-adt ^>=0.3.1.0 diff --git a/lib-opt/GHCup/OptParse/Common.hs b/lib-opt/GHCup/OptParse/Common.hs index 7853398a..08d54153 100644 --- a/lib-opt/GHCup/OptParse/Common.hs +++ b/lib-opt/GHCup/OptParse/Common.hs @@ -3,6 +3,7 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE DuplicateRecordFields #-} +{-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE TypeApplications #-} {-# LANGUAGE NumericUnderscores #-} {-# LANGUAGE ViewPatterns #-} @@ -22,6 +23,7 @@ import GHCup.Prelude.Process import GHCup.Prelude.Logger import GHCup.Prelude.MegaParsec +import Control.Monad (forM, when, join) import Control.DeepSeq import Control.Concurrent import Control.Concurrent.Async @@ -867,3 +869,11 @@ parseNewUrlSource "StackSetupURL" = pure NewStackSetupURL parseNewUrlSource s' = (eitherDecode . LE.encodeUtf8 . LT.pack $ s') <|> (fmap NewURI . first show . parseURI .UTF8.fromString $ s') + +#if MIN_VERSION_transformers(0,6,0) +instance Alternative (Either [a]) where + empty = Left [] + Left _ <|> n = n + m <|> _ = m +#endif + diff --git a/lib-opt/GHCup/OptParse/Compile.hs b/lib-opt/GHCup/OptParse/Compile.hs index a9d65c96..57832f57 100644 --- a/lib-opt/GHCup/OptParse/Compile.hs +++ b/lib-opt/GHCup/OptParse/Compile.hs @@ -25,6 +25,7 @@ import GHCup.OptParse.Common #if !MIN_VERSION_base(4,13,0) import Control.Monad.Fail ( MonadFail ) #endif +import Control.Monad (when, forM_, forM) import Control.Concurrent (threadDelay) import Control.Monad.Reader import Control.Monad.Trans.Resource diff --git a/lib-opt/GHCup/OptParse/Config.hs b/lib-opt/GHCup/OptParse/Config.hs index e8b815f6..1183756f 100644 --- a/lib-opt/GHCup/OptParse/Config.hs +++ b/lib-opt/GHCup/OptParse/Config.hs @@ -22,6 +22,7 @@ import GHCup.OptParse.Common #if !MIN_VERSION_base(4,13,0) import Control.Monad.Fail ( MonadFail ) #endif +import Control.Monad (when) import Control.Exception ( displayException ) import Control.Monad.Reader import Control.Monad.Trans.Resource diff --git a/lib-opt/GHCup/OptParse/GC.hs b/lib-opt/GHCup/OptParse/GC.hs index dc4b8e38..b7e9fa13 100644 --- a/lib-opt/GHCup/OptParse/GC.hs +++ b/lib-opt/GHCup/OptParse/GC.hs @@ -20,6 +20,7 @@ import GHCup.Prelude.String.QQ #if !MIN_VERSION_base(4,13,0) import Control.Monad.Fail ( MonadFail ) #endif +import Control.Monad (when) import Control.Monad.Reader import Control.Monad.Trans.Resource import Data.Functor diff --git a/lib-opt/GHCup/OptParse/Install.hs b/lib-opt/GHCup/OptParse/Install.hs index 4ec5af52..493f3614 100644 --- a/lib-opt/GHCup/OptParse/Install.hs +++ b/lib-opt/GHCup/OptParse/Install.hs @@ -28,6 +28,7 @@ import Control.Concurrent (threadDelay) #if !MIN_VERSION_base(4,13,0) import Control.Monad.Fail ( MonadFail ) #endif +import Control.Monad (when, forM_) import Control.Monad.Reader import Control.Monad.Trans.Resource import Data.Either diff --git a/lib-opt/GHCup/OptParse/List.hs b/lib-opt/GHCup/OptParse/List.hs index fe56c884..610f3b8d 100644 --- a/lib-opt/GHCup/OptParse/List.hs +++ b/lib-opt/GHCup/OptParse/List.hs @@ -20,6 +20,7 @@ import GHCup.Prelude.String.QQ #if !MIN_VERSION_base(4,13,0) import Control.Monad.Fail ( MonadFail ) #endif +import Control.Monad (forM_) import Control.Monad.Reader import Control.Monad.Trans.Resource import Data.Char diff --git a/lib-opt/GHCup/OptParse/Nuke.hs b/lib-opt/GHCup/OptParse/Nuke.hs index 28ebf134..4b97de4c 100644 --- a/lib-opt/GHCup/OptParse/Nuke.hs +++ b/lib-opt/GHCup/OptParse/Nuke.hs @@ -19,6 +19,7 @@ import GHCup.Prelude.Logger #if !MIN_VERSION_base(4,13,0) import Control.Monad.Fail ( MonadFail ) #endif +import Control.Monad (forM_, void) import Control.Monad.Reader import Control.Monad.Trans.Resource import Data.Maybe diff --git a/lib-opt/GHCup/OptParse/Prefetch.hs b/lib-opt/GHCup/OptParse/Prefetch.hs index 3550ab7f..e651ced2 100644 --- a/lib-opt/GHCup/OptParse/Prefetch.hs +++ b/lib-opt/GHCup/OptParse/Prefetch.hs @@ -23,6 +23,7 @@ import GHCup.OptParse.Common #if !MIN_VERSION_base(4,13,0) import Control.Monad.Fail ( MonadFail ) #endif +import Control.Monad (forM_) import Control.Monad.Reader import Control.Monad.Trans.Resource import Data.Functor diff --git a/lib-opt/GHCup/OptParse/Rm.hs b/lib-opt/GHCup/OptParse/Rm.hs index 565183dc..7ce69190 100644 --- a/lib-opt/GHCup/OptParse/Rm.hs +++ b/lib-opt/GHCup/OptParse/Rm.hs @@ -25,6 +25,7 @@ import GHCup.OptParse.Common #if !MIN_VERSION_base(4,13,0) import Control.Monad.Fail ( MonadFail ) #endif +import Control.Monad (forM_) import Control.Monad.Reader import Control.Monad.Trans.Resource import Data.Functor diff --git a/lib-opt/GHCup/OptParse/Run.hs b/lib-opt/GHCup/OptParse/Run.hs index 72caeab5..463d5834 100644 --- a/lib-opt/GHCup/OptParse/Run.hs +++ b/lib-opt/GHCup/OptParse/Run.hs @@ -28,6 +28,7 @@ import Control.Exception.Safe ( MonadMask, MonadCatch ) #if !MIN_VERSION_base(4,13,0) import Control.Monad.Fail ( MonadFail ) #endif +import Control.Monad (when, forM_, forM, unless) import Control.Monad.Reader import Control.Monad.Trans.Resource import Data.Functor diff --git a/lib-opt/GHCup/OptParse/Upgrade.hs b/lib-opt/GHCup/OptParse/Upgrade.hs index 22d7d443..06971515 100644 --- a/lib-opt/GHCup/OptParse/Upgrade.hs +++ b/lib-opt/GHCup/OptParse/Upgrade.hs @@ -21,6 +21,7 @@ import Control.Concurrent (threadDelay) #if !MIN_VERSION_base(4,13,0) import Control.Monad.Fail ( MonadFail ) #endif +import Control.Monad (forM_) import Control.Monad.Reader import Control.Monad.Trans.Resource import Data.Functor diff --git a/lib/GHCup/Prelude/File.hs b/lib/GHCup/Prelude/File.hs index 20722573..528418d6 100644 --- a/lib/GHCup/Prelude/File.hs +++ b/lib/GHCup/Prelude/File.hs @@ -74,6 +74,7 @@ import Control.DeepSeq (force) import Control.Exception (evaluate) import GHC.IO.Exception import System.IO.Error +import Control.Monad (when, forM_, filterM) -- | Merge one file tree to another given a copy operation. diff --git a/lib/GHCup/Prelude/File/Search.hs b/lib/GHCup/Prelude/File/Search.hs index 6a667c58..d956622a 100644 --- a/lib/GHCup/Prelude/File/Search.hs +++ b/lib/GHCup/Prelude/File/Search.hs @@ -10,6 +10,7 @@ module GHCup.Prelude.File.Search ( import GHCup.Types(ProcessError(..), CapturedProcess(..)) +import Control.Monad (forM) import Control.Monad.Reader import Data.Maybe import Data.Text ( Text ) diff --git a/lib/GHCup/Prelude/Process/Posix.hs b/lib/GHCup/Prelude/Process/Posix.hs index d3beff38..06f64f67 100644 --- a/lib/GHCup/Prelude/Process/Posix.hs +++ b/lib/GHCup/Prelude/Process/Posix.hs @@ -55,7 +55,7 @@ import qualified System.Posix.Process as SPP import qualified System.Console.Terminal.Size as TP import qualified Data.ByteString as BS import qualified Data.ByteString.Lazy as BL -import qualified "unix-bytestring" System.Posix.IO.ByteString +import qualified System.Posix.IO.ByteString.Ext as SPIB diff --git a/stack.yaml b/stack.yaml index 5f4c26c7..4df4c73d 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,46 +1,44 @@ -resolver: lts-21.25 +resolver: lts-22.17 packages: - . extra-deps: - - Cabal-3.8.1.0 - - Cabal-syntax-3.8.1.0 + - Cabal-3.10.3.0 + - Cabal-syntax-3.10.3.0 - Win32-2.14.0.0@sha256:e34af84fec733b5c0c8f052ec39499785e719e2fbbe308983adf26c82ea3704d,5942 + - ansi-wl-pprint-0.6.9@sha256:fb737bc96e2aef34ad595d54ced7a73f648c521ebcb00fe0679aff45ccd49212,2448 - brick-2.1.1@sha256:ff36d64f1027eac17a14a83de053067413accb58b79e5002dce2a79cb8a3dcb3,17385 - - bzip2-clib-1.0.8@sha256:f595d0b797e3990b336a36986e5537e84105d13f01f4cb8b470ef671f75555ee,1139 - bz2-1.0.1.1@sha256:d21b768c3d41e0cd313beb866dc003a57004ec46b95a6aaf31963603861d1383,3741 - - cabal-install-parsers-0.6 + - bzip2-clib-1.0.8@sha256:f595d0b797e3990b336a36986e5537e84105d13f01f4cb8b470ef671f75555ee,1139 + - cabal-install-parsers-0.6.1.1 - cabal-plan-0.7.3.0 - chs-cabal-0.1.1.1@sha256:e8c8c1bf1dbeec64ad86d67ae6dca1c45afd644d20869546dfdcd03910d3848d,1149 - chs-deps-0.1.0.0@sha256:0cdada6d2c682c41b20331b8c63c2ecfc7e806928585195fd544c9d41f3074fd,2496 - - directory-1.3.8.3 + - directory-1.3.8.4@sha256:ae1730011f547153bb52139f217d1d524202b3da730a369660fc539e5dcfff31,3166 - file-uri-0.1.0.0@sha256:d6dcc12bde249362c93e413f87a41558b827333dfe3f97d953e47e1070c0da6f,1857 - - filepath-1.4.101.0 + - filepath-1.4.300.2 - generic-arbitrary-0.2.2@sha256:202ffbf2032672a51318f2e80d7e75b72f8950e690346b4314f38bc7e39215f7,1189 - haskus-utils-data-1.4@sha256:bfa94363b94b14779edd6834fbd59dbb847c3d7b8f48e3844f456ffdc077da4a,1466 - haskus-utils-types-1.5.1@sha256:991c472f4e751e2f0d7aab6ad4220ef151d6160876dcf0511bbf876bbd432020,1298 - - haskus-utils-variant-3.3@sha256:3df3fa0a557d75c0e8f94fe9954f76a692eaf8d368c401e30ab028624d55386b,2198 + - haskus-utils-variant-3.4 - language-c-0.9.3 - libarchive-3.0.4.2 - lzma-static-5.2.5.5@sha256:55ed074cda2b82008e020a51e2f8c22f2487a58a4989ab359bf04dd6c903b894,7431 - megaparsec-9.2.2@sha256:c306a135ec25d91d252032c6128f03598a00e87ea12fcf5fc4878fdffc75c768,3219 + - optparse-applicative-0.17.1.0 - os-release-1.0.2.1@sha256:2c3e8f7a9a0e17d5042d14d2036d52b42c8d5606e8d004697af462a95c87a9e2,2718 - - process-1.6.18.0@sha256:69fbbca4151e1a6d1a5da41a1e17c254871675a4f2aed5213bbdfb10b5e52742,3148 + - parsec-3.1.17.0@sha256:8407cbd428d7f640a0fff8891bd2f7aca13cebe70a5e654856f8abec9a648b56,5149 + - process-1.6.20.0@sha256:6630bbd3c42c2384d58d7e74d8041338f01c76def7e823afd8a08772b6c08ad3,2679 - strict-base-0.4.0.0@sha256:2ff4e43cb95eedf2995558d7fc34d19362846413dd39e6aa6a5b3ea8228fef9f,1248 - time-1.11.1.2@sha256:a957467595420495c2dd440d9efa1f58c62277cf9438c7e7a515d7a4c65571ec,6287 - - unicode-data-0.3.1@sha256:ae3a3aca89a32b912ddde7a644c0c04eaf23ee42014c74fe3d6b9aaf36ce7ec9,5481 - - unix-2.8.5.0@sha256:633f15ef0bd50a16a7b5c5e86e6659fee6e4e211e098cc8bd0029f452bfcfddc,9808 - - unix-bytestring-0.3.7.8@sha256:b8070935929a7654ce398fdecc9b5f90b02c455407db8ea7989256e821e33b1f,3053 + - unicode-data-0.4.0.1 + - unix-2.8.5.1@sha256:3f702a252a313a7bcb56e3908a14e7f9f1b40e41b7bdc8ae8a9605a1a8686f06,9808 + - unix-bytestring-0.4.0.1 - versions-6.0.5 - - vty-6.2@sha256:3536dc83a3fee17d9a114baf58fe47b6f080c24987266f0cd0b7b4b1fcd9cf19,3520 - - vty-crossplatform-0.4.0.0@sha256:50593f91ad16777d921138475a8d2784d538fd206addd30664c620278d6c8544,3172 - - vty-unix-0.2.0.0@sha256:2af3d0bdae3c4b7b7e567ee374efe32c7439fabdf9096465ce011a6c6736e9ae,2932 - - vty-windows-0.2.0.2 + - vty-windows-0.2.0.2@sha256:add74928c695b83f651116a73171b097524c7989d2b08c7c6e2816c982047cab,2815 - github: hasufell/uri-bytestring commit: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 - - github: haskell/tar - commit: d94a988be4311b830149a9f8fc16739927e5fc1c allow-newer: true @@ -48,9 +46,10 @@ allow-newer-deps: - Cabal - Cabal-syntax - ansi-terminal + - cabal-install-parsers - mintty - process - - cabal-install-parsers + - streamly flags: http-io-streams: