Update stack.yaml for GHC 9.2.5

Author: treeowl

README.md

@@ -216,18 +216,18 @@ or
 
 This script is also run by an automatic workflow.
 
-### New GHC 9.2.3 dev shell
+### New GHC 9.2.5 dev shell
 
-In order to make use of the new profiling options in GHC 9.2, we've added a nix dev shell which builds kore with GHC 9.2.3. To open the shell, run
+In order to make use of the new profiling options in GHC 9.2, we've added a nix dev shell which builds kore with GHC 9.2.5. To open the shell, run
 
 ```
 nix develop .#ghc9
 ```
 
-Then, use stack to build against `stack-nix-ghc9.yaml`:
+Then, use stack to build:
 
 ```
-stack --stack-yaml stack-nix-ghc9.yaml build
+stack build
 ```
 
 If you modified the `kore.cabal` file and want to build with GHC 9, you will have to run

cabal.project

@@ -2,6 +2,9 @@ packages:
   kore
 
 allow-newer:
+  compact:base,
+  compact:bytestring,
+  eventlog2speedscope:hashable,
   ghc-trace-events:base
 
 package *
@@ -14,17 +17,17 @@ package kore
 
 source-repository-package
   type: git
-  location: https://github.com/ttuegel/pipes-sqlite-simple.git
-  tag: a3920f053f92e76f2a7ff7c68e34f9e926817702
+  location: https://github.com/goodlyrottenapple/pipes-sqlite-simple.git
+  tag: 89a0c38cc2114eab3c1fb03ef6ec25749edf7a42
 
 source-repository-package
   type: git
-  location: https://github.com/ttuegel/pipes-ghc-events.git
-  tag: 4ab25e717658fa833aaf5efd76db38ccb1178f96
+  location: https://github.com/goodlyrottenapple/pipes-ghc-events.git
+  tag: c227d88b88ca74eb56da36668cab8ba2af7b32ee
   subdir: eventlog2speedscope
 
 source-repository-package
   type: git
-  location: https://github.com/ttuegel/pipes-ghc-events.git
-  tag: 4ab25e717658fa833aaf5efd76db38ccb1178f96
+  location: https://github.com/goodlyrottenapple/pipes-ghc-events.git
+  tag: c227d88b88ca74eb56da36668cab8ba2af7b32ee
   subdir: pipes-ghc-events

kore/src/Prelude/Kore.hs

@@ -171,10 +171,6 @@ import Data.Tuple
 import Data.Typeable (
     Typeable,
  )
-import Data.Witherable (
-    Filterable (..),
-    Witherable (..),
- )
 import Debug.Trace hiding (
     traceEvent,
     traceEventIO,
@@ -184,6 +180,10 @@ import GHC.Stack (
     HasCallStack,
  )
 import Injection
+import Witherable (
+    Filterable (..),
+    Witherable (..),
+ )
 import Prelude hiding (
     Applicative (..),
     Monad (..),

stack-nix-ghc9.yaml

@@ -15,7 +15,7 @@
 # resolver:
 #  name: custom-snapshot
 #  location: "./custom-snapshot.yaml"
-resolver: lts-18.18
+resolver: lts-20.8
 
 nix:
   packages:
@@ -47,42 +47,23 @@ packages:
 # Dependency packages to be pulled from upstream that are not in the resolver
 # (e.g., acme-missiles-0.3)
 extra-deps:
-  - ghc-trace-events-0.1.2.1
-
-  - monoidal-containers-0.6.0.1
-  - newtype-0.2.2.0
-
-  - sqlite-simple-0.4.18.0
-  - direct-sqlite-2.3.26
-
-  - witherable-0.3.5
-  - witherable-class-0
-
-  - co-log-0.4.0.1
-
-  - tasty-test-reporter-0.1.1.4
-  - junit-xml-0.1.0.0
-
+  - chronos-1.1.5
+  - co-log-0.5.0.0
   - compact-0.2.0.0
-
   - decision-diagrams-0.2.0.0
+  - typerep-map-0.6.0.0
 
-  - git: https://github.com/ttuegel/pipes-ghc-events.git
-    commit: 4ab25e717658fa833aaf5efd76db38ccb1178f96
+  - git: https://github.com/goodlyrottenapple/pipes-ghc-events.git
+    commit: c227d88b88ca74eb56da36668cab8ba2af7b32ee
     subdirs:
       - eventlog2speedscope
-    # nix-sha256: 05mpk1r04zsaiwzksbn0yd3s6fyah739rp6s4ir5nbb17b7j59pi
-  - git: https://github.com/ttuegel/pipes-ghc-events.git
-    commit: 4ab25e717658fa833aaf5efd76db38ccb1178f96
-    subdirs:
+      - pipes-aeson
       - pipes-ghc-events
-    # nix-sha256: 05mpk1r04zsaiwzksbn0yd3s6fyah739rp6s4ir5nbb17b7j59pi
-  - git: https://github.com/ttuegel/pipes-sqlite-simple.git
-    commit: a3920f053f92e76f2a7ff7c68e34f9e926817702
-    # nix-sha256: 13iag206szfmc8ng77j6qjb6r91ysy9qkvijmf9n9dclvmb1g8an
-  - ghc-events-0.13.0
+      - pipes-sqlite-simple
+    # nix-sha256: 1pzmqmp86am8riwlj3ibbx5yk84qs9qjyqfbrf141vwrd3fj64vs
 
-# TODO (thomas.tuegel): Remove this when stylish-haskell is updated upstream.
+# TODO (treeowl): Remove this when compact and the pipes-ghc-events suite are
+# updated upstream.
 allow-newer: true
 
 ghc-options:

stack.yaml

@@ -5,75 +5,19 @@
 
 packages:
 - completed:
-    hackage: ghc-trace-events-0.1.2.1@sha256:2b7f9be840d748c3d33d0f70120a5d7614ef5862cb854efa272cd0c536319306,3117
+    hackage: chronos-1.1.5@sha256:116b63db6e79574e7ac50bf12a6303af5dae4048b222c0f78380d24f481abb5a,3696
     pantry-tree:
-      size: 710
-      sha256: 50f58ec1f2033c259402ad00ff42cbb0d002492f960967442b5bdd9a7a75dc0a
+      size: 581
+      sha256: 0eb2e0874c845e299c2e174144fd37da1a7957fd0055b2b99b33d23a06c7720e
   original:
-    hackage: ghc-trace-events-0.1.2.1
+    hackage: chronos-1.1.5
 - completed:
-    hackage: monoidal-containers-0.6.0.1@sha256:7d776942659eb4d70d8b8da5d734396374a6eda8b4622df9e61e26b24e9c8e40,2501
+    hackage: co-log-0.5.0.0@sha256:a7e84650eaef7eba2d59ee7664309e79317a7ca67011abedf971f0e6bd6475bb,5448
     pantry-tree:
-      size: 569
-      sha256: c354e916cb3aa9a0728a60f08440dc589a9e6d8275f047dbe9ab73f168247561
+      size: 1043
+      sha256: 33b838c07c8b7e70b2e82bddc889bb1e6386d7e12a9d1593c0b4b263b1fcb925
   original:
-    hackage: monoidal-containers-0.6.0.1
-- completed:
-    hackage: newtype-0.2.2.0@sha256:44435da250d96ab3a5a861425739f6af523495d1a3943f783df4b053b8a4c108,1354
-    pantry-tree:
-      size: 260
-      sha256: e53d22dd191bfef5d9b9a05a9cf48e96067c22521937468445c171f3800810b4
-  original:
-    hackage: newtype-0.2.2.0
-- completed:
-    hackage: sqlite-simple-0.4.18.0@sha256:3ceea56375c0a3590c814e411a4eb86943f8d31b93b110ca159c90689b6b39e5,3002
-    pantry-tree:
-      size: 1930
-      sha256: e58b9955e483d51ee0966f8ba4384305d871480e2a38b32ee0fcd4573d74cf95
-  original:
-    hackage: sqlite-simple-0.4.18.0
-- completed:
-    hackage: direct-sqlite-2.3.26@sha256:04e835402f1508abca383182023e4e2b9b86297b8533afbd4e57d1a5652e0c23,3718
-    pantry-tree:
-      size: 770
-      sha256: 11874ab21e10c5b54cd1e02a037b677dc1e2ee9986f38c599612c56654dc01c3
-  original:
-    hackage: direct-sqlite-2.3.26
-- completed:
-    hackage: witherable-0.3.5@sha256:6590a15735b50ac14dcc138d4265ff1585d5f3e9d3047d5ebc5abf4cd5f50084,1476
-    pantry-tree:
-      size: 271
-      sha256: b99f21dbac28da031eb7c787fbffbe5e77e0aee42b64b5dda082470e907d5ab5
-  original:
-    hackage: witherable-0.3.5
-- completed:
-    hackage: witherable-class-0@sha256:91f05518f9f4af5b02424f13ee7dcdab5d6618e01346aa2f388a72ff93e2e501,775
-    pantry-tree:
-      size: 277
-      sha256: e99696bf95da593a3892c7b9a28db09ffd139b4b1b313f32cec9d26979aa7ce2
-  original:
-    hackage: witherable-class-0
-- completed:
-    hackage: co-log-0.4.0.1@sha256:3d4c17f37693c80d1aa2c41669bc3438fac3e89dc5f479e57d79bc3ddc4dfcc5,5087
-    pantry-tree:
-      size: 1126
-      sha256: e73165ff8f744709428e2e87984c9d60ca1cec43d8455c413181c7c466e7497c
-  original:
-    hackage: co-log-0.4.0.1
-- completed:
-    hackage: tasty-test-reporter-0.1.1.4@sha256:22acd61058a9aa6fafeb742051347f22f1bac8658ad285bc2eb65b86173a1bc2,1765
-    pantry-tree:
-      size: 411
-      sha256: 7d309686e6b362e904a2b49b7513307be54381690ca7472e926f73fd08a8353b
-  original:
-    hackage: tasty-test-reporter-0.1.1.4
-- completed:
-    hackage: junit-xml-0.1.0.0@sha256:5da18fe01fdb2e32904499ad67f32229a1df4bd4422483dd4a26090aeaf5de0d,1417
-    pantry-tree:
-      size: 384
-      sha256: c21b8b22bbbebb15a8d6babb7efbf3d31045ca2f1763d7fc2c44e99d180a1a59
-  original:
-    hackage: junit-xml-0.1.0.0
+    hackage: co-log-0.5.0.0
 - completed:
     hackage: compact-0.2.0.0@sha256:75ef98cb51201b4a0d6de95cbbb62be6237c092a3d594737346c70c5d56c2380,2413
     pantry-tree:
@@ -88,53 +32,68 @@ packages:
       sha256: 340509eeb518acd55bb125d8eeb29aa5247b9600096472db134c739b1924b828
   original:
     hackage: decision-diagrams-0.2.0.0
+- completed:
+    hackage: typerep-map-0.6.0.0@sha256:e54a4e99614ad890a10200da687efa189860c13207a97063db1b6881032ebecc,4890
+    pantry-tree:
+      size: 1487
+      sha256: f970c9dc26194bf708a5c18cf4daac5a1518afa1d8b92e8f1c170959587ee7a6
+  original:
+    hackage: typerep-map-0.6.0.0
 - completed:
     subdir: eventlog2speedscope
     name: eventlog2speedscope
-    version: 0.1.0
-    git: https://github.com/ttuegel/pipes-ghc-events.git
+    version: 0.1.1
+    git: https://github.com/goodlyrottenapple/pipes-ghc-events.git
     pantry-tree:
       size: 363
-      sha256: db17d33a7672b8e31f5fe9a1808331ab6ec0882ac8c15c51ba25d96bcd8f5042
-    commit: 4ab25e717658fa833aaf5efd76db38ccb1178f96
+      sha256: 5c8e4a1e411927009f73f439bc81a4c4cdd31db5a600f82f5304228d0008afe0
+    commit: c227d88b88ca74eb56da36668cab8ba2af7b32ee
   original:
     subdir: eventlog2speedscope
-    git: https://github.com/ttuegel/pipes-ghc-events.git
-    commit: 4ab25e717658fa833aaf5efd76db38ccb1178f96
+    git: https://github.com/goodlyrottenapple/pipes-ghc-events.git
+    commit: c227d88b88ca74eb56da36668cab8ba2af7b32ee
+- completed:
+    subdir: pipes-aeson
+    name: pipes-aeson
+    version: 0.4.2
+    git: https://github.com/goodlyrottenapple/pipes-ghc-events.git
+    pantry-tree:
+      size: 841
+      sha256: ca2885de6e0e32293ff25b2e4ef2ed38b46df3308be004b88c73e7f8b4ed92ff
+    commit: c227d88b88ca74eb56da36668cab8ba2af7b32ee
+  original:
+    subdir: pipes-aeson
+    git: https://github.com/goodlyrottenapple/pipes-ghc-events.git
+    commit: c227d88b88ca74eb56da36668cab8ba2af7b32ee
 - completed:
     subdir: pipes-ghc-events
     name: pipes-ghc-events
     version: 0.1.0.0
-    git: https://github.com/ttuegel/pipes-ghc-events.git
+    git: https://github.com/goodlyrottenapple/pipes-ghc-events.git
     pantry-tree:
       size: 234
       sha256: 442cb60eae9a3f52d872d5fbae872a5b2bf8fe144940cb2b10f75f6a0caf3182
-    commit: 4ab25e717658fa833aaf5efd76db38ccb1178f96
+    commit: c227d88b88ca74eb56da36668cab8ba2af7b32ee
   original:
     subdir: pipes-ghc-events
-    git: https://github.com/ttuegel/pipes-ghc-events.git
-    commit: 4ab25e717658fa833aaf5efd76db38ccb1178f96
+    git: https://github.com/goodlyrottenapple/pipes-ghc-events.git
+    commit: c227d88b88ca74eb56da36668cab8ba2af7b32ee
 - completed:
+    subdir: pipes-sqlite-simple
     name: pipes-sqlite-simple
     version: '0.2'
-    git: https://github.com/ttuegel/pipes-sqlite-simple.git
-    pantry-tree:
-      size: 416
-      sha256: 94a6840d3b1dd1ca7165f9502778637f26cd93d313c8876262fcd5a6f4e497a8
-    commit: a3920f053f92e76f2a7ff7c68e34f9e926817702
-  original:
-    git: https://github.com/ttuegel/pipes-sqlite-simple.git
-    commit: a3920f053f92e76f2a7ff7c68e34f9e926817702
-- completed:
-    hackage: ghc-events-0.13.0@sha256:27f7ed54b6e27ba6142f8e7c2a1dd39cf099d4471eff570327a4e5058995fb3c,5431
+    git: https://github.com/goodlyrottenapple/pipes-ghc-events.git
     pantry-tree:
-      size: 4089
-      sha256: 462ec4fb4f1348f5365c93a83b4475d12a5db9997c838761989b587bcaef1ad2
+      size: 631
+      sha256: 7e6a1c449ab2b3bb7b987f4819578b82ce905e7cc877ea10c5ed740c21b29e41
+    commit: c227d88b88ca74eb56da36668cab8ba2af7b32ee
   original:
-    hackage: ghc-events-0.13.0
+    subdir: pipes-sqlite-simple
+    git: https://github.com/goodlyrottenapple/pipes-ghc-events.git
+    commit: c227d88b88ca74eb56da36668cab8ba2af7b32ee
 snapshots:
 - completed:
-    size: 586296
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/18.yaml
-    sha256: 63539429076b7ebbab6daa7656cfb079393bf644971156dc349d7c0453694ac2
-  original: lts-18.18
+    size: 649327
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/8.yaml
+    sha256: bfafe5735ccb74527d754b1f9999ded72d7c3a6c3a88529449661431ccfbd6cc
+  original: lts-20.8