Upgrade to GHC 9.8

We also undo some hacks that were working around issues with the older GHC version:

This reverts commit 5b63936.

This reverts commit 3ff3d52.

Author: roconnor-blockstream

Simplicity.Haskell.nix

@@ -1,4 +1,4 @@
-{ mkDerivation, cabal-install, base, binary, cereal, lens-family, lib, MemoTrie, mtl, prettyprinter, QuickCheck, stdenv, split, tasty, tasty-hunit, tasty-quickcheck, tardis, unification-fd, vector }:
+{ mkDerivation, base, binary, cereal, lens-family, lib, MemoTrie, mtl, prettyprinter, QuickCheck, stdenv, split, tasty, tasty-hunit, tasty-quickcheck, tardis, unification-fd, vector }:
 mkDerivation (rec {
   pname = "Simplicity";
   version = "0.0.0";
@@ -21,23 +21,11 @@ mkDerivation (rec {
   # testFlags = ["--quickcheck-replay=582534"];
 
   # Cabal's haddock doesn't work for Backpack / internal libraries / modules reexports.
-  # Under ghc8, the documenation generated is pretty badly broken.
-  # Under ghc9, Setup.hs haddock simply crashes.
-  #
-  # To work around these issues we manually build the documentation using cabal haddock.
-  # Even cabal haddock hardcodes links to internal modules that are reexported which is a problem.
-  # To deal with that, we build directly into the $doc directly.
-  # This isn't very great because the documenation isn't really in the right place, but the result is usable.
-  doHaddock = false;
-  enableSeparateDocOutput = true;
-  buildTools = [ cabal-install ];
+  # Until that is fix we manually generate some documentation pages
+  haddockFlags = ["--haddock-option='--use-contents=index.html'"];
   postHaddock = ''
-   CABAL_CONFIG=/dev/null CABAL_DIR=`pwd` env -u GHC_PACKAGE_PATH cabal --package-db=$packageConfDir configure --docdir=$doc/share/doc/${pname}-${version}
-   CABAL_CONFIG=/dev/null CABAL_DIR=`pwd` env -u GHC_PACKAGE_PATH cabal --package-db=$packageConfDir haddock --distdir=$doc
-  '';
-  # Delete all cabal build material other than the documentation.
-  postInstall = ''
-    find $doc ! -path '*/doc/*' -delete ||:
+    cp ${./manual-index.html} dist/doc/html/Simplicity/index.html
+    cp ${./Simplicity-Primitive.html} dist/doc/html/Simplicity/Simplicity-Primitive.html
   '';
 
   license = lib.licenses.mit;

Simplicity.cabal

@@ -57,17 +57,17 @@ library Simplicity-Core
   hs-source-dirs:      Haskell/Core
   default-language:    Haskell2010
   ghc-options:         -O2
-  build-depends:       base >=4.9 && <4.18,
+  build-depends:       base >=4.9 && <4.20,
                        binary >=0.7 && <0.9,
-                       bytestring >=0.10 && <0.12,
+                       bytestring >=0.10 && <0.13,
                        containers >=0.5.10 && <0.7,
                        cereal >=0.5 && <0.6,
                        lens-family >=2.0 && <2.2,
-                       mtl >=2.2 && <2.3,
+                       mtl >=2.2 && <2.4,
                        MemoTrie >=0.6 && <0.7,
                        split >=0.2.3 && <0.3,
                        tardis >=0.4.1 && <0.6,
-                       transformers >=0.5 && <0.6,
+                       transformers >=0.5 && <0.7,
                        unification-fd >=0.10 && <0.12,
                        vector >=0.12 && <0.14
 
@@ -78,8 +78,8 @@ library Simplicity-Bitcoin
   default-language:    Haskell2010
   ghc-options:         -O2
   build-depends:       Simplicity-Core,
-                       base >=4.9 && <4.18,
-                       bytestring >=0.10 && <0.12,
+                       base >=4.9 && <4.20,
+                       bytestring >=0.10 && <0.13,
                        cereal >=0.5 && <0.6,
                        vector >=0.12 && <0.14
 
@@ -90,8 +90,8 @@ library Simplicity-Elements
   default-language:    Haskell2010
   ghc-options:         -O2
   build-depends:       Simplicity-Core,
-                       base >=4.9 && <4.18,
-                       bytestring >=0.10 && <0.12,
+                       base >=4.9 && <4.20,
+                       bytestring >=0.10 && <0.13,
                        cereal >=0.5 && <0.6,
                        containers >=0.5.10 && <0.7,
                        lens-family >=2.0 && <2.2,
@@ -113,13 +113,13 @@ library Simplicity-Indef
   default-language:    Haskell2010
   ghc-options:         -O2
   build-depends:       Simplicity-Core,
-                       base >=4.9 && <4.18,
-                       bytestring >=0.10 && <0.12,
+                       base >=4.9 && <4.20,
+                       bytestring >=0.10 && <0.13,
                        cereal >=0.5 && <0.6,
                        containers >=0.5.10 && <0.7,
                        lens-family >=2.0 && <2.2,
-                       mtl >=2.2 && <2.3,
-                       transformers >=0.5 && <0.6,
+                       mtl >=2.2 && <2.4,
+                       transformers >=0.5 && <0.7,
                        unification-fd >=0.10 && <0.12,
                        vector >=0.12 && <0.14
 
@@ -206,8 +206,8 @@ library
   default-language:    Haskell2010
   ghc-options:         -O2
   build-depends:       Simplicity-Core, Simplicity-Bitcoin, Simplicity-Elements, Simplicity-Indef,
-                       base >=4.9 && <4.18,
-                       bytestring >=0.10 && <0.12,
+                       base >=4.9 && <4.20,
+                       bytestring >=0.10 && <0.13,
                        cereal >=0.5 && <0.6,
                        containers >=0.5.10 && <0.7,
                        lens-family >=2.0 && <2.2,
@@ -239,17 +239,17 @@ Test-Suite testsuite
   C-sources:           C/rsort.c, C/dag.c, C/primitive/elements/primitive.c, C/bitstream.c
                        Haskell/cbits/bitstream.c, Haskell/cbits/dag.c
   build-depends:       Simplicity,
-                       base >=4.9 && <4.18,
-                       bytestring >=0.10 && <0.12,
+                       base >=4.9 && <4.20,
+                       bytestring >=0.10 && <0.13,
                        cereal >=0.5 && <0.6,
                        containers >=0.5.10 && <0.7,
                        lens-family >=2.0 && <2.2,
                        QuickCheck >=2.10 && <2.15,
-                       mtl >=2.2 && <2.3,
+                       mtl >=2.2 && <2.4,
                        tasty >=0.11 && <1.5,
                        tasty-hunit >=0.9 && <0.11,
                        tasty-quickcheck >=0.8 && <0.11,
-                       transformers >=0.5 && <0.6,
+                       transformers >=0.5 && <0.7,
                        vector >=0.12 && <0.14
 
 executable GenPrecomputed
@@ -264,7 +264,7 @@ executable GenPrecomputed
     hs-source-dirs:   Haskell-Generate
     default-language: Haskell2010
     build-depends:    Simplicity,
-                      base >=4.9 && <4.18,
+                      base >=4.9 && <4.20,
                       prettyprinter >=1.7 && <1.8,
                       split >=0.2.3 && <0.3,
 
@@ -281,9 +281,9 @@ executable GenPrimitive
     default-language: Haskell2010
     other-modules:    NameWrangler
     build-depends:    Simplicity,
-                      base >=4.9 && <4.18,
+                      base >=4.9 && <4.20,
                       containers >=0.5.10 && <0.7,
-                      mtl >=2.2 && <2.3,
+                      mtl >=2.2 && <2.4,
                       split >=0.2.3 && <0.3,
                       unification-fd >=0.10 && <0.12,
 
@@ -299,8 +299,8 @@ executable GenTests
     hs-source-dirs:   Haskell-Generate
     default-language: Haskell2010
     build-depends:    Simplicity,
-                      base >=4.9 && <4.18,
-                      bytestring >=0.10 && <0.12,
+                      base >=4.9 && <4.20,
+                      bytestring >=0.10 && <0.13,
                       cereal >=0.5 && <0.6,
                       lens-family >=2.0 && <2.2,
                       split >=0.2.3 && <0.3,
@@ -319,9 +319,9 @@ executable GenRustJets
     other-modules:    NameWrangler
     other-extensions: OverloadedStrings
     build-depends:    Simplicity,
-                      base >=4.9 && <4.18,
+                      base >=4.9 && <4.20,
                       containers >=0.5.10 && <0.7,
                       prettyprinter >=1.7 && <1.8,
                       split >=0.2.3 && <0.3,
-                      transformers >=0.5 && <0.6,
+                      transformers >=0.5 && <0.7,
                       unification-fd >=0.10 && <0.12,

default.nix

@@ -1,5 +1,5 @@
 { nixpkgs ? import <nixpkgs> {}
-, ghc ? "ghc94"
+, ghc ? "ghc98"
 , coqPackages ? "coqPackages_8_16"
 , production ? false
 , secp256k1git ? null
@@ -15,7 +15,7 @@ let hp = nixpkgs.haskell.packages.${ghc};
     cp = nixpkgs.${coqPackages};
  in rec
 {
-  haskell = haskellPackages.callPackage ./Simplicity.Haskell.nix { cabal-install = nixpkgs.cabal-install; };
+  haskell = haskellPackages.callPackage ./Simplicity.Haskell.nix {};
 
   haskellPackages = hp.override {
     overrides = self: super: {