Merge pull request #156 from phadej/deps-update-2024-07

Update few deps
phadej · Jul 2, 2024 · 1a522d9 · 1a522d9
2 parents 8c28181 + eeac636
commit 1a522d9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/cabal-haddock-server/cabal-haddock-server.cabal b/cabal-haddock-server/cabal-haddock-server.cabal
@@ -83,7 +83,7 @@ library cabal-haddock-server-internal
     , lucid                  ^>=2.11.1
     , optparse-applicative   ^>=0.18.0.0
     , tar                    ^>=0.6.2.0
-    , time-manager           ^>=0.0.0
+    , time-manager           ^>=0.1.0
     , wai                    ^>=3.2.3
     , warp                   ^>=3.4.0
     , zlib                   ^>=0.7.0.0

diff --git a/extras/gentle-introduction-2024.4.1.tar.gz b/extras/gentle-introduction-2024.4.1.tar.gz
diff --git a/peura/peura.cabal b/peura/peura.cabal
@@ -81,7 +81,6 @@ library
     , aeson                  ^>=2.2.1.0
     , ansi-terminal          ^>=1.1
     , async                  ^>=2.2.2
-    , base-compat            ^>=0.13.0
     , cabal-install-parsers  ^>=0.6
     , cabal-plan             ^>=0.7.2.0
     , clock                  ^>=0.8

diff --git a/peura/src/Peura/GHC.hs b/peura/src/Peura/GHC.hs
@@ -90,6 +90,10 @@ getGhcInfo tracer ghc = do
             let pui :: String
                 pui = fromMaybe "" $ lookup "Project Unit Id" info
 
+            let prefix = "ghc-" ++ prettyShow ver ++ "-"
+            unless (L.isPrefixOf prefix pui) $
+                die tracer $ prefix ++ " is not prefix of Project Unit Id: " ++ pui
+
             return GhcInfo
                 { ghcPath     = ghc
                 , ghcPlatform = x ++ "-" ++ y
@@ -110,7 +114,7 @@ ghcStoreDir :: Maybe Version -> GhcInfo -> Path Absolute -> Path Absolute
 ghcStoreDir (Just cabalVer) info storeDir
     -- https://github.com/haskell/cabal/blob/6eaba73ac95c62f8dc576e227b5f9c346910303c/Cabal/src/Distribution/Simple/GHC.hs#L245
     | cabalVer >= mkVersion [3,12]
-    , L.isPrefixOf (prettyShow (ghcVersion info) ++ "-") pui
+    , L.isPrefixOf ("ghc-" ++ prettyShow (ghcVersion info) ++ "-") pui
     = storeDir </> fromUnrootedFilePath pui
   where
     pui = ghcProjectUnitId info