From 187f0577f56f02ad73f7f14fe620b6dfdabc04a6 Mon Sep 17 00:00:00 2001
From: sudoer777 <git@sudoer.ch>
Date: Fri, 15 Sep 2023 02:37:47 -0500
Subject: [PATCH] Revert to LLVM 15 and remove llvm-hs-pretty for lack of
 support

---
 README.md                            |  2 +-
 package.yaml                         |  8 +++----
 really-bad-compiler-in-haskell.cabal |  6 ++++--
 stack.yaml                           | 16 +++++++-------
 stack.yaml.lock                      | 31 +++++++++-------------------
 5 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index 60acfd3..17550b8 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Main repo: https://git.sudoer.ch/me/really-bad-compiler-in-haskell
 
 - Install `ghcup` (for managing Haskell tools) and `nix` (for managing external dependencies).
 - Clone the repo.
-- Use `ghcup` to install `stack 2.9.3`, `HLS 2.2.0.0`, and `cabal 3.6.2.0` (recommended versions of the time of writing).
+- Use `ghcup` to install `stack 2.9.3`, `HLS 2.2.0.0`, and `cabal 3.6.2.0`.
 - Use `stack run <file>` to run the program (for example, `stack run example/1`).
 
 ## File structure
diff --git a/package.yaml b/package.yaml
index 72274b6..80581b1 100644
--- a/package.yaml
+++ b/package.yaml
@@ -6,12 +6,12 @@ dependencies:
   - megaparsec >= 9.0.1 && < 10
   - parser-combinators
   - text
-  - llvm-hs-pure >= 12 && < 13
-  - llvm-hs-pretty >= 12 && < 13
+  - llvm-hs-pure >= 15 && < 16
+  # - llvm-hs-pretty >= 12 && < 13
 tested-with: GHC == 8.10.7
 category: Compilers/Interpreters
 
-# ghc-options: -threaded -Wall -j8 +RTS -A64M -RTS
+ghc-options: -threaded -Wall -j8 +RTS -A64M -RTS
 
 # library:
 #   source-dirs: src
@@ -24,4 +24,4 @@ executable:
 #     main: Testall.hs
 #     source-dirs: test
 
-# default-extensions: OverloadedStrings, LambdaCase
+default-extensions: OverloadedStrings, LambdaCase
diff --git a/really-bad-compiler-in-haskell.cabal b/really-bad-compiler-in-haskell.cabal
index 2ce1b08..cb9167b 100644
--- a/really-bad-compiler-in-haskell.cabal
+++ b/really-bad-compiler-in-haskell.cabal
@@ -22,10 +22,12 @@ executable really-bad-compiler-in-haskell
       Paths_really_bad_compiler_in_haskell
   hs-source-dirs:
       app
+  default-extensions:
+      OverloadedStrings, LambdaCase
+  ghc-options: -threaded -Wall -j8 +RTS -A64M -RTS
   build-depends:
       base >=4.14.3 && <5
-    , llvm-hs-pretty ==12.*
-    , llvm-hs-pure ==12.*
+    , llvm-hs-pure ==15.*
     , megaparsec >=9.0.1 && <10
     , parser-combinators
     , text
diff --git a/stack.yaml b/stack.yaml
index d3653e4..0d6c2e8 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,14 +1,16 @@
-resolver: lts-18.28
+resolver: lts-20.26
 
 packages:
   - .
 extra-deps:
-  - github: llvm-hs/llvm-hs-pretty
-    commit: 655ff4d47b3a584b4c9a5863f6121b954825920c
+  # - github: llvm-hs/llvm-hs-pretty
+  #   commit: 655ff4d47b3a584b4c9a5863f6121b954825920c
   - github: llvm-hs/llvm-hs
-    commit: 423220bffac4990d019fc088c46c5f25310d5a33
+    commit: 5bca2c1a2a3aa98ecfb19181e7a5ebbf3e212b76
     subdirs:
       - llvm-hs-pure
-# nix:
-#   enable: true
-#   packages: [llvm_13, clang_13]
+nix:
+  enable: true
+  packages: [llvm_16, clang_16]
+# system-ghc: true
+# install-ghc: false
diff --git a/stack.yaml.lock b/stack.yaml.lock
index 2ebab3c..6b809c3 100644
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@@ -4,33 +4,22 @@
 #   https://docs.haskellstack.org/en/stable/lock_files
 
 packages:
-- completed:
-    name: llvm-hs-pretty
-    pantry-tree:
-      sha256: 8bf37846506a4987d3033ad6d90f9d38ecba57811861b716008986ff0ff60b7a
-      size: 5098
-    sha256: db5be408733ee280f7c2956dc8bca843f507eab18c85d8016e3f56c5acccf122
-    size: 43688
-    url: https://github.com/llvm-hs/llvm-hs-pretty/archive/655ff4d47b3a584b4c9a5863f6121b954825920c.tar.gz
-    version: 12.0.0
-  original:
-    url: https://github.com/llvm-hs/llvm-hs-pretty/archive/655ff4d47b3a584b4c9a5863f6121b954825920c.tar.gz
 - completed:
     name: llvm-hs-pure
     pantry-tree:
-      sha256: cdb0ef9cee5b3569791494c8ac4e1dc5d0fe778f7c9bd2f661e537d1e2ca639b
+      sha256: b512f9e5f8f2b3e3a06bad2fa5ff053a83d817798c7efcd47e254e68c842169d
       size: 2712
-    sha256: e3f57577735088c23eac466ccb60ab7ffadeeaa1cb92881bfbb585b50ed227e3
-    size: 9805847
+    sha256: 526b67e2da9ce25b3856c221b6772e699a7593dbb5ba38e7ee2436349de70966
+    size: 9802209
     subdir: llvm-hs-pure
-    url: https://github.com/llvm-hs/llvm-hs/archive/423220bffac4990d019fc088c46c5f25310d5a33.tar.gz
-    version: 12.0.0
+    url: https://github.com/llvm-hs/llvm-hs/archive/5bca2c1a2a3aa98ecfb19181e7a5ebbf3e212b76.tar.gz
+    version: 15.0.0
   original:
     subdir: llvm-hs-pure
-    url: https://github.com/llvm-hs/llvm-hs/archive/423220bffac4990d019fc088c46c5f25310d5a33.tar.gz
+    url: https://github.com/llvm-hs/llvm-hs/archive/5bca2c1a2a3aa98ecfb19181e7a5ebbf3e212b76.tar.gz
 snapshots:
 - completed:
-    sha256: 428ec8d5ce932190d3cbe266b9eb3c175cd81e984babf876b64019e2cbe4ea68
-    size: 590100
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/28.yaml
-  original: lts-18.28
+    sha256: 5a59b2a405b3aba3c00188453be172b85893cab8ebc352b1ef58b0eae5d248a2
+    size: 650475
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/26.yaml
+  original: lts-20.26