Fix cabal.project.release

* https://github.com/haskell/ghcup-hs/issues/1013
* https://github.com/jtdaugherty/brick/issues/502#issuecomment-1974980299
* 4c395182cb

cabal.ghc8107.project

@@ -10,12 +10,18 @@ else
         flags: +tui +tar
 
 constraints: http-io-streams -brotli,
-             any.aeson >= 2.0.1.0
+             any.aeson >= 2.0.1.0,
+             bzlib-conduit >= 0.3.0.3,
+             bz2 >= 1.0.1.1,
+             bzlib >= 0.5.2.0
 
 if os(mingw32)
+  constraints: 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

cabal.ghc8107.project.freeze

@@ -14,7 +14,7 @@ constraints: any.Cabal ==3.10.2.1,
              aeson +ordered-keymap,
              any.aeson-pretty ==0.8.10,
              aeson-pretty +lib-only,
-             any.alex ==3.5.0.0,
+             any.alex ==3.5.1.0,
              any.ansi-terminal ==1.0.2,
              ansi-terminal -example,
              any.ansi-terminal-types ==0.11.5,
@@ -44,8 +44,9 @@ constraints: any.Cabal ==3.10.2.1,
              any.brick ==2.1.1,
              brick -demos,
              any.bytestring ==0.11.5.3,
-             any.bz2 ==1.0.1.0,
+             any.bz2 ==1.0.1.1,
              bz2 -cross +with-bzlib,
+             any.bzip2-clib ==1.0.8,
              any.c2hs ==0.28.8,
              c2hs +base3 -regression,
              any.cabal-install-parsers ==0.6.1.1,
@@ -241,7 +242,7 @@ constraints: any.Cabal ==3.10.2.1,
              vector +boundschecks -internalchecks -unsafechecks -wall,
              any.vector-binary-instances ==0.2.5.2,
              any.vector-stream ==0.1.0.1,
-             any.versions ==6.0.5,
+             any.versions ==6.0.6,
              any.vty ==6.2,
              any.vty-crossplatform ==0.4.0.0,
              vty-crossplatform -demos,
@@ -255,4 +256,4 @@ constraints: any.Cabal ==3.10.2.1,
              any.zlib ==0.6.3.0,
              zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
              any.zlib-bindings ==0.1.1.5
-index-state: hackage.haskell.org 2024-02-18T14:07:35Z
+index-state: hackage.haskell.org 2024-03-10T10:13:56Z

cabal.ghc902.project

@@ -10,12 +10,18 @@ else
         flags: +tui +tar
 
 constraints: http-io-streams -brotli,
-             any.aeson >= 2.0.1.0
+             any.aeson >= 2.0.1.0,
+             bzlib-conduit >= 0.3.0.3,
+             bz2 >= 1.0.1.1,
+             bzlib >= 0.5.2.0
 
 if os(mingw32)
+  constraints: 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

cabal.ghc902.project.freeze

@@ -14,7 +14,7 @@ constraints: any.Cabal ==3.10.2.1,
              aeson +ordered-keymap,
              any.aeson-pretty ==0.8.10,
              aeson-pretty +lib-only,
-             any.alex ==3.5.0.0,
+             any.alex ==3.5.1.0,
              any.ansi-terminal ==1.0.2,
              ansi-terminal -example,
              any.ansi-terminal-types ==0.11.5,
@@ -47,9 +47,10 @@ constraints: any.Cabal ==3.10.2.1,
              any.brick ==2.1.1,
              brick -demos,
              any.bytestring ==0.11.5.3,
-             any.bz2 ==1.0.1.0,
+             any.bz2 ==1.0.1.1,
              bz2 -cross +with-bzlib,
-             any.bzlib-conduit ==0.3.0.2,
+             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,
@@ -140,7 +141,7 @@ constraints: any.Cabal ==3.10.2.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.15.3,
+             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,
@@ -250,7 +251,7 @@ constraints: any.Cabal ==3.10.2.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.5,
+             any.versions ==6.0.6,
              any.vty ==6.2,
              any.vty-crossplatform ==0.4.0.0,
              vty-crossplatform -demos,
@@ -268,4 +269,4 @@ constraints: any.Cabal ==3.10.2.1,
              any.zlib-bindings ==0.1.1.5,
              any.zstd ==0.1.3.0,
              zstd +standalone
-index-state: hackage.haskell.org 2024-02-18T14:07:35Z
+index-state: hackage.haskell.org 2024-03-10T10:13:56Z

cabal.ghc928.project

@@ -10,12 +10,18 @@ else
         flags: +tui +tar
 
 constraints: http-io-streams -brotli,
-             any.aeson >= 2.0.1.0
+             any.aeson >= 2.0.1.0,
+             bzlib-conduit >= 0.3.0.3,
+             bz2 >= 1.0.1.1,
+             bzlib >= 0.5.2.0
 
 if os(mingw32)
+  constraints: 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

cabal.ghc928.project.freeze

@@ -14,7 +14,7 @@ constraints: any.Cabal ==3.10.2.1,
              aeson +ordered-keymap,
              any.aeson-pretty ==0.8.10,
              aeson-pretty +lib-only,
-             any.alex ==3.5.0.0,
+             any.alex ==3.5.1.0,
              any.ansi-terminal ==1.0.2,
              ansi-terminal -example,
              any.ansi-terminal-types ==0.11.5,
@@ -47,9 +47,10 @@ constraints: any.Cabal ==3.10.2.1,
              any.brick ==2.1.1,
              brick -demos,
              any.bytestring ==0.11.4.0,
-             any.bz2 ==1.0.1.0,
+             any.bz2 ==1.0.1.1,
              bz2 -cross +with-bzlib,
-             any.bzlib-conduit ==0.3.0.2,
+             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,
@@ -140,7 +141,7 @@ constraints: any.Cabal ==3.10.2.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.15.3,
+             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,
@@ -249,7 +250,7 @@ constraints: any.Cabal ==3.10.2.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.5,
+             any.versions ==6.0.6,
              any.vty ==6.2,
              any.vty-crossplatform ==0.4.0.0,
              vty-crossplatform -demos,
@@ -267,4 +268,4 @@ constraints: any.Cabal ==3.10.2.1,
              any.zlib-bindings ==0.1.1.5,
              any.zstd ==0.1.3.0,
              zstd +standalone
-index-state: hackage.haskell.org 2024-02-18T14:07:35Z
+index-state: hackage.haskell.org 2024-03-10T10:13:56Z

cabal.ghc948.project

@@ -10,12 +10,18 @@ else
         flags: +tui +tar
 
 constraints: http-io-streams -brotli,
-             any.aeson >= 2.0.1.0
+             any.aeson >= 2.0.1.0,
+             bzlib-conduit >= 0.3.0.3,
+             bz2 >= 1.0.1.1,
+             bzlib >= 0.5.2.0
 
 if os(mingw32)
+  constraints: 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

cabal.ghc948.project.freeze

@@ -14,7 +14,7 @@ constraints: any.Cabal ==3.10.2.1,
              aeson +ordered-keymap,
              any.aeson-pretty ==0.8.10,
              aeson-pretty +lib-only,
-             any.alex ==3.5.0.0,
+             any.alex ==3.5.1.0,
              any.ansi-terminal ==1.0.2,
              ansi-terminal -example,
              any.ansi-terminal-types ==0.11.5,
@@ -47,9 +47,10 @@ constraints: any.Cabal ==3.10.2.1,
              any.brick ==2.1.1,
              brick -demos,
              any.bytestring ==0.11.5.3,
-             any.bz2 ==1.0.1.0,
+             any.bz2 ==1.0.1.1,
              bz2 -cross +with-bzlib,
-             any.bzlib-conduit ==0.3.0.2,
+             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,
@@ -139,7 +140,7 @@ constraints: any.Cabal ==3.10.2.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.15.3,
+             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,
@@ -248,7 +249,7 @@ constraints: any.Cabal ==3.10.2.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.5,
+             any.versions ==6.0.6,
              any.vty ==6.2,
              any.vty-crossplatform ==0.4.0.0,
              vty-crossplatform -demos,
@@ -266,4 +267,4 @@ constraints: any.Cabal ==3.10.2.1,
              any.zlib-bindings ==0.1.1.5,
              any.zstd ==0.1.3.0,
              zstd +standalone
-index-state: hackage.haskell.org 2024-02-18T14:07:35Z
+index-state: hackage.haskell.org 2024-03-10T10:13:56Z

cabal.project

@@ -10,12 +10,18 @@ else
         flags: +tui +tar
 
 constraints: http-io-streams -brotli,
-             any.aeson >= 2.0.1.0
+             any.aeson >= 2.0.1.0,
+             bzlib-conduit >= 0.3.0.3,
+             bz2 >= 1.0.1.1,
+             bzlib >= 0.5.2.0
 
 if os(mingw32)
+  constraints: 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

cabal.project.release

@@ -18,7 +18,7 @@ elif os(mingw32)
   constraints: zlib +bundled-c-zlib,
                lzma +static,
                text -simdutf,
-               vty-windows >=0.1.0.3
+               vty-windows >=0.2.0.2
   if impl(ghc >= 9.4)
     constraints: language-c >= 0.9.3
 elif os(freebsd)
@@ -30,6 +30,9 @@ elif os(freebsd)
 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
 

ghcup.cabal

@@ -175,6 +175,7 @@ library
     , base16-bytestring     >=0.1.1.6    && <1.1
     , binary                ^>=0.8.6.0
     , bytestring            >=0.10       && <0.12
+    , bz2                   ^>=1.0.1.1
     , Cabal                 ^>=3.0.0.0 || ^>=3.2.0.0 || ^>=3.4.0.0 || ^>=3.6.0.0 || ^>=3.8.0.0 || ^>= 3.10.0.0
     , case-insensitive      ^>=1.2.1.0
     , casing                ^>=0.1.4.1
@@ -244,7 +245,6 @@ library
     -- GHCup.OptParse.Run uses this
     exposed-modules: GHCup.Prelude.Process.Windows
     build-depends:
-      , bzlib
       , process  ^>=1.6.11.0
       , Win32    >=2.10
 
@@ -261,7 +261,6 @@ library
     install-includes: dirutils.h
     c-sources:        cbits/dirutils.c
     build-depends:
-      , bz2              >=0.5.0.5 && <1.1
       , terminal-size    ^>=0.3.3
       , unix             ^>=2.7 || ^>=2.8
       , unix-bytestring  ^>=0.3.7.3

lib-opt/GHCup/OptParse/GC.hs

@@ -47,6 +47,7 @@ data GCOptions = GCOptions
   , gcHLSNoGHC :: Bool
   , gcCache :: Bool
   , gcTmp :: Bool
+  , gcUnset :: Bool
   } deriving (Eq, Show)
 
 
@@ -77,6 +78,9 @@ gcP =
   <*>
     switch
       (short 't' <> long "tmpdirs" <> help "Remove tmpdir leftovers")
+  <*>
+    switch
+      (short 'u' <> long "unset" <> help "Remove all tool versions that are not 'set'")
 
 
 
@@ -134,6 +138,7 @@ gc GCOptions{..} runAppState runLogger = runGC runAppState (do
   liftE $ when gcHLSNoGHC rmHLSNoGHC
   lift $ when gcCache rmCache
   lift $ when gcTmp rmTmp
+  liftE $ when gcUnset rmUnsetTools
    ) >>= \case
             VRight _ -> do
                   pure ExitSuccess

lib/GHCup.hs

@@ -542,6 +542,26 @@ rmOldGHC = do
   forM_ ghcs $ \ghc -> when (ghc `elem` oldGHCs) $ rmGHCVer ghc
 
 
+rmUnsetTools :: ( MonadReader env m
+                , HasGHCupInfo env
+                , HasPlatformReq env
+                , HasDirs env
+                , HasLog env
+                , MonadIO m
+                , MonadFail m
+                , MonadMask m
+                , MonadUnliftIO m
+                )
+             => Excepts '[NotInstalled, UninstallFailed] m ()
+rmUnsetTools = do
+  vers <- lift $ listVersions Nothing [ListInstalled True, ListSet False] False True (Nothing, Nothing)
+  forM_ vers $ \ListResult{..} -> case lTool of
+    GHC   -> liftE $ rmGHCVer (GHCTargetVersion lCross lVer)
+    HLS   -> liftE $ rmHLSVer lVer
+    Cabal -> liftE $ rmCabalVer lVer
+    Stack -> liftE $ rmStackVer lVer
+    GHCup -> pure ()
+
 
 rmProfilingLibs :: ( MonadReader env m
                    , HasDirs env

stack.yaml

@@ -37,7 +37,7 @@ extra-deps:
   - 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.1@sha256:6c75230057a708168dbc420975572511ad3ec09956bf73c3b6f4be03324e8b13,2815
+  - vty-windows-0.2.0.2
   - yaml-streamly-0.12.4@sha256:b5250c5dc71d668c43c42ed6f86f956d69125136ea960858527a4b2ff712d3d1,5165
   - github: hasufell/uri-bytestring
     commit: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001

test/optparse-test/GCTest.hs

@@ -17,6 +17,7 @@ defaultOptions =
     False
     False
     False
+    False
 
 gcCheckList :: [(String, GCOptions)]
 gcCheckList =
@@ -33,7 +34,9 @@ gcCheckList =
   , ("gc --cache", defaultOptions{gcCache = True})
   , ("gc -t", defaultOptions{gcTmp = True})
   , ("gc --tmpdirs", defaultOptions{gcTmp = True})
-  , ("gc -o -p -s -h -c -t", GCOptions True True True True True True)
+  , ("gc -u", defaultOptions{gcUnset = True})
+  , ("gc --unset", defaultOptions{gcUnset = True})
+  , ("gc -o -p -s -h -c -t -u", GCOptions True True True True True True True)
   ]
 
 gcParseWith :: [String] -> IO GCOptions