Update to GHC 9.8.1

eb94d845 · Daniel Firth · d0dc4ddf · eb94d845 · eb94d845 · eb94d845
Commit eb94d845 authored 1 year ago by Daniel Firth
--- a/flake.lock
+++ b/flake.lock
@@ -53,65 +53,125 @@
        "type": "github"
      }
    },
-    "flake-utils": {
+    "flake-parts_3": {
      "inputs": {
-        "systems": "systems"
+        "nixpkgs-lib": "nixpkgs-lib_3"
      },
      "locked": {
-        "lastModified": 1705309234,
+        "lastModified": 1706830856,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
-        "owner": "numtide",
+        "owner": "hercules-ci",
-        "repo": "flake-utils",
+        "repo": "flake-parts",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
        "type": "github"
      },
      "original": {
-        "owner": "numtide",
+        "owner": "hercules-ci",
-        "repo": "flake-utils",
+        "repo": "flake-parts",
        "type": "github"
      }
    },
    "horizon-advance": {
      "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-parts": [
+          "horizon-advance",
+          "horizon-core",
+          "flake-parts"
+        ],
        "horizon-core": "horizon-core",
-        "nixpkgs": "nixpkgs_2"
+        "horizon-hoogle": "horizon-hoogle_2",
+        "nixpkgs": [
+          "horizon-advance",
+          "horizon-core",
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1707655869,
+        "lastModified": 1707655870,
-        "narHash": "sha256-jroBBLoCp+0c2kLdcK+9gHwzzDx1auVsgiS04wV1jcg=",
+        "narHash": "sha256-jyUhRZIi0AMSI2SYpiaKZ+dxQ3i2uraYkhnaNzJVJ2I=",
-        "ref": "lts/ghc-9.6.x",
+        "ref": "refs/heads/master",
-        "rev": "31f4c2145d1d7969aa691834e3556b2a6d27236d",
+        "rev": "41a6e901701a7cc356a891fc6e8dbde835d5a837",
-        "revCount": 158,
+        "revCount": 180,
        "type": "git",
        "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-advance"
      },
      "original": {
-        "ref": "lts/ghc-9.6.x",
        "type": "git",
        "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-advance"
      }
    },
-    "horizon-core": {
+    "horizon-build-packages": {
      "inputs": {
        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs"
+        "horizon-ghc": "horizon-ghc",
+        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1707652184,
+        "lastModified": 1707581157,
-        "narHash": "sha256-0zWgGBjBg4dXZr9f6jXDb1CLspYoIOPSGgNd0TYmnAM=",
+        "narHash": "sha256-YKYM9lbziLlwXd7NEDOEG3W0/AlTS0pTyusl/0LFUi4=",
-        "ref": "lts/ghc-9.6.x",
+        "ref": "lts/ghc-9.8.x",
-        "rev": "690ffd37bb3ea234e87b18ca27071cd793976e29",
+        "rev": "057184845fce557062aedb0019ba826cec95693a",
-        "revCount": 1243,
+        "revCount": 48,
+        "type": "git",
+        "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-build-packages"
+      },
+      "original": {
+        "ref": "lts/ghc-9.8.x",
+        "type": "git",
+        "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-build-packages"
+      }
+    },
+    "horizon-core": {
+      "inputs": {
+        "flake-parts": [
+          "horizon-advance",
+          "horizon-core",
+          "horizon-build-packages",
+          "flake-parts"
+        ],
+        "horizon-build-packages": "horizon-build-packages",
+        "horizon-hoogle": "horizon-hoogle",
+        "nixpkgs": [
+          "horizon-advance",
+          "horizon-core",
+          "horizon-build-packages",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1707652197,
+        "narHash": "sha256-CmgvS8zxZ8KnSF2FWWC56TfbFq39/XljQFU+GioUE70=",
+        "ref": "lts/ghc-9.8.x",
+        "rev": "29413b1fe35d6281ea1b25abc8af59cfabb0ef62",
+        "revCount": 1300,
        "type": "git",
        "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core"
      },
      "original": {
-        "ref": "lts/ghc-9.6.x",
+        "ref": "lts/ghc-9.8.x",
        "type": "git",
        "url": "https://gitlab.horizon-haskell.net/package-sets/horizon-core"
      }
    },
+    "horizon-ghc": {
+      "inputs": {
+        "flake-parts": "flake-parts_3",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1707569094,
+        "narHash": "sha256-HhLAu5EmtEzI8Wauc4bPpPODKbgEd6+6hPM9kn3LESM=",
+        "ref": "refs/heads/master",
+        "rev": "10339966aa1108ee3e2e77ecb8cda0799f92f4e8",
+        "revCount": 66,
+        "type": "git",
+        "url": "https://gitlab.horizon-haskell.net/ghc/horizon-ghc"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://gitlab.horizon-haskell.net/ghc/horizon-ghc"
+      }
+    },
    "horizon-hoogle": {
      "locked": {
        "lastModified": 1701521742,
@@ -127,6 +187,36 @@
        "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
      }
    },
+    "horizon-hoogle_2": {
+      "locked": {
+        "lastModified": 1701521742,
+        "narHash": "sha256-huf/95jYL7mY0AHSziJYXx4m/sP+G+YAbJb+Q5Ph/Jg=",
+        "ref": "refs/heads/master",
+        "rev": "ddf3b08c6458c1a9e0d881f968c050bc828b9b8e",
+        "revCount": 2,
+        "type": "git",
+        "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
+      }
+    },
+    "horizon-hoogle_3": {
+      "locked": {
+        "lastModified": 1701521742,
+        "narHash": "sha256-huf/95jYL7mY0AHSziJYXx4m/sP+G+YAbJb+Q5Ph/Jg=",
+        "ref": "refs/heads/master",
+        "rev": "ddf3b08c6458c1a9e0d881f968c050bc828b9b8e",
+        "revCount": 2,
+        "type": "git",
+        "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://gitlab.horizon-haskell.net/nix/horizon-hoogle"
+      }
+    },
    "iohk-nix": {
      "inputs": {
        "blst": "blst",
@@ -216,13 +306,31 @@
        "type": "github"
      }
    },
+    "nixpkgs-lib_3": {
+      "locked": {
+        "dir": "lib",
+        "lastModified": 1706550542,
+        "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652",
+        "type": "github"
+      },
+      "original": {
+        "dir": "lib",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1707546158,
+        "lastModified": 1707268954,
-        "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=",
+        "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0",
+        "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
        "type": "github"
      },
      "original": {
@@ -268,7 +376,7 @@
      "inputs": {
        "flake-parts": "flake-parts",
        "horizon-advance": "horizon-advance",
-        "horizon-hoogle": "horizon-hoogle",
+        "horizon-hoogle": "horizon-hoogle_3",
        "iohk-nix": "iohk-nix",
        "nixpkgs": "nixpkgs_4",
        "nixpkgs-libR": "nixpkgs-libR"
@@ -307,21 +415,6 @@
        "rev": "dbb48cce5429cb6585c9034f002568964f1ce567",
        "type": "github"
      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
    }
  },
  "root": "root",

--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,7 @@
  inputs = {
    flake-parts.url = "github:hercules-ci/flake-parts";
-    horizon-advance.url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-advance?ref=lts/ghc-9.6.x";
+    horizon-advance.url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-advance";
    horizon-hoogle.url = "git+https://gitlab.horizon-haskell.net/nix/horizon-hoogle";
    iohk-nix.url = "github:input-output-hk/iohk-nix";
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";

--- a/horizon.dhall
+++ b/horizon.dhall
@@ -22,7 +22,7 @@ let packages =
        , cardano-binary = callCHaP "cardano-binary" "1.7.0.1"
        , cardano-binary-test = callCHaP "cardano-binary-test" "1.4.0.2"
        , cardano-crypto = callCHaP "cardano-crypto" "1.1.2"
-        , cardano-crypto-class = callCHaP "cardano-crypto-class" "2.1.2.0"
+        , cardano-crypto-class = callCHaP "cardano-crypto-class" "2.1.4.0"
        , cardano-crypto-praos = callCHaP "cardano-crypto-praos" "2.1.2.0"
        , cardano-crypto-tests = callCHaP "cardano-crypto-tests" "2.1.2.0"
        , cardano-slotting = callCHaP "cardano-slotting" "0.1.1.1"
@@ -46,7 +46,7 @@ let packages =
        , list-t = H.callHackage "list-t" "1.0.5.7"
        , mtl-prelude = H.callHackage "mtl-prelude" "2.0.3.2"
        , multiset = H.callHackage "multiset" "0.3.4.3"
-        , nonempty-vector = H.callHackage "nonempty-vector" "0.2.2.0"
+        , nonempty-vector = H.callHackage "nonempty-vector" "0.2.3"
        , ral = H.callHackage "ral" "0.2.1"
        , size-based = H.callHackage "size-based" "0.1.3.1"
        , testing-type-modifiers =

--- a/horizon.lock
+++ b/horizon.lock
@@ -40,7 +40,7 @@
  }
 , { mapKey = "cardano-crypto-class"
  , mapValue =
-      "23f56993bd51d8142a13f8e534b1f74eba9f8c3548937bd74391b7d9e5ee620c"
+      "f57c5d83f52ae5bbd8ef5719e4d2cdf3d130ca7a77082a819de68482507e8e1f"
  }
 , { mapKey = "cardano-crypto-praos"
  , mapValue =
@@ -132,7 +132,7 @@
  }
 , { mapKey = "nonempty-vector"
  , mapValue =
-      "9d80fc08e3d760d8af9a0f34147125f2a58c615dad1a52596b78a108685cb4b6"
+      "30becdce82f25c786cac01aa42670666f3138c308ae475c7d4edc3a36f22577b"
  }
 , { mapKey = "plutus-core"
  , mapValue =

--- a/pkgs/cardano-crypto-class.nix
+++ b/pkgs/cardano-crypto-class.nix
@@ -6,10 +6,10 @@
 }:
 mkDerivation {
  pname = "cardano-crypto-class";
-  version = "2.1.2.0";
+  version = "2.1.4.0";
  src = fetchzip {
-    url = "https://chap.intersectmbo.org/package/cardano-crypto-class-2.1.2.0.tar.gz";
+    url = "https://chap.intersectmbo.org/package/cardano-crypto-class-2.1.4.0.tar.gz";
-    sha256 = "0248v82hs35976q5czkqvz9k2pdjrjghydgrdly9fzfhw5xlw1sr";
+    sha256 = "11n3v0i13sxyanjyas76cbzz7f72xsxkp7gfianic32bm6dm0sqm";
  };
  isLibrary = true;
  isExecutable = false;

--- a/pkgs/nonempty-vector.nix
+++ b/pkgs/nonempty-vector.nix
@@ -3,8 +3,10 @@
 }:
 mkDerivation {
  pname = "nonempty-vector";
-  version = "0.2.2.0";
+  version = "0.2.3";
-  sha256 = "6fc72cf173486d76e2f9e2bfc5749ed07e070fc26807594906124d99cac5db59";
+  sha256 = "0a3702141421076416928f73d3ee6c66a920533ad02a9a771bc0bfc404d7aca3";
+  revision = "1";
+  editedCabalFile = "0kn1s5ssan9m4xwf10y2ymba4zw2j18j6dvbpr6iral3rrlgngdw";
  isLibrary = true;
  isExecutable = false;
  enableSeparateDataOutput = false;