Merge pull request #50 from juhp/master

remove package override logic to unbreak ghc-9.10 (Cabal-3.12)

.github/workflows/Dockerfile.base-build

@@ -1,4 +1,4 @@
-FROM fpco/pid1:20.04
+FROM fpco/pid1:22.04
 
 ENV LANG C.UTF-8
 RUN export DEBIAN_FRONTEND=noninteractive && \

.github/workflows/Dockerfile.base-run

@@ -1,4 +1,4 @@
-FROM fpco/pid1:20.04
+FROM fpco/pid1:22.04
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \

curator.cabal

@@ -57,7 +57,8 @@ executable casa-curator
       TypeOperators
   ghc-options: -optP-Wno-nonportable-include-path -threaded
   build-depends:
-      aeson <2.2
+      aeson
+    , attoparsec-aeson
     , base >=4.10 && <5
     , bytestring
     , casa-client

package.yaml

@@ -56,8 +56,8 @@ executables:
       - text
       - optparse-simple
       - containers
-      # aeson 2.2 needs attoparsec-aeson
-      - aeson < 2.2
+      - aeson
+      - attoparsec-aeson
       - http-conduit
       - syb
       - persistent-sqlite

src/Curator/Snapshot.hs

@@ -168,9 +168,8 @@ checkDependencyGraph constraints snapshot = do
                 [ (pn, snapshotVersion (spLocation sp))
                 | (pn, sp) <- Map.toList (Pantry.snapshotPackages snapshot)
                 ]
-    ghcBootPackages0 <- liftIO $ getBootPackages compilerVer
-    let ghcBootPackages = prunedBootPackages ghcBootPackages0 (Map.keysSet snapshotPackages)
-        declared = snapshotPackages <> Map.map (Just . bpVersion) ghcBootPackages
+    ghcBootPackages <- liftIO $ getBootPackages compilerVer
+    let declared = snapshotPackages <> Map.map (Just . bpVersion) ghcBootPackages
         cabalName = "Cabal"
         cabalError err = pure . Map.singleton cabalName $ [OtherError err]
     pkgErrors <- case Map.lookup cabalName declared of
@@ -197,7 +196,7 @@ checkDependencyGraph constraints snapshot = do
           return $ Map.mapWithKey (validatePackage constraints depTree cabalVersion) pkgInfos
     let (rangeErrors, otherErrors) = splitErrors pkgErrors
         rangeErrors' =
-          Map.mapWithKey (\(pname, _, _) bs -> (Map.member pname ghcBootPackages0, bs)) rangeErrors
+          Map.mapWithKey (\(pname, _, _) bs -> (Map.member pname ghcBootPackages, bs)) rangeErrors
     unless (Map.null rangeErrors && Map.null otherErrors) $
       throwM (BrokenDependencyGraph rangeErrors' otherErrors)
 
@@ -549,19 +548,6 @@ getBootPackages ghcVersion = do
           in (name, BootPackage name version (installedUnitId ipi) (depends ipi))
     Map.fromList . map toBootPackage <$> dump (hcPkgInfo db) silent GlobalPackageDB
 
-prunedBootPackages ::
-       Map PackageName BootPackage
-    -> Set PackageName
-    -> Map PackageName BootPackage
-prunedBootPackages ghcBootPackages0 overrides =
-    snd $
-    partitionReplacedDependencies
-        ghcBootPackages0
-        bpName
-        bpId
-        bpDepends
-        overrides
-
 -- | GHC wired-in packages, list taken from Stack.Constants
 -- see also ghc\/compiler\/basicTypes\/Module.hs
 wiredInGhcPackages :: Set PackageName

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-21.25
+resolver: lts-22.43
 nix:
   packages: [ pkg-config libz ]
 

stack.yaml.lock

@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    sha256: a81fb3877c4f9031e1325eb3935122e608d80715dc16b586eb11ddbff8671ecd
-    size: 640086
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/25.yaml
-  original: lts-21.25
+    sha256: 08bd13ce621b41a8f5e51456b38d5b46d7783ce114a50ab604d6bbab0d002146
+    size: 720271
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/43.yaml
+  original: lts-22.43