Merge pull request #3854 from input-output-hk/jasagredo/node-8.7.0

Integration work for node 8.7.0
IntersectMBO · Nov 14, 2023 · 1faa5d1 · 1faa5d1
2 parents 219e724 + f85ec6f
commit 1faa5d1
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 40 deletions.
diff --git a/cabal.project b/cabal.project
@@ -18,9 +18,9 @@ source-repository-package
 
 index-state:
   -- Bump this if you need newer packages from Hackage
-  , hackage.haskell.org 2023-09-29T00:20:27Z
+  , hackage.haskell.org 2023-11-09T23:50:15Z
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2023-10-30T04:08:41Z
+  , cardano-haskell-packages 2023-11-08T10:13:53Z
 
 packages:
   eras/allegra/impl
@@ -66,6 +66,11 @@ packages:
   libs/plutus-preprocessor
   libs/ledger-state
 
+constraints:
+  -- Plutus is incompatible with 0.1.5 because of the Identity instance, once
+  -- they fix that we shall remove this constraint.
+  nothunks == 0.1.4
+
 program-options
   ghc-options: -Werror
 
@@ -90,14 +95,3 @@ benchmarks: true
 
 -- The only sensible test display option
 test-show-details: streaming
-
-if impl(ghc >= 9.6)
-  allow-newer:
-    , *:base
-    , *:ghc-prim
-    , *:template-haskell
-    , *:vector
-
-  constraints:
-      -- Earlier versions have a slightly different set of type constraints.
-      persistent >= 2.14
diff --git a/eras/allegra/impl/cardano-ledger-allegra.cabal b/eras/allegra/impl/cardano-ledger-allegra.cabal
@@ -13,8 +13,8 @@ category:           Network
 build-type:         Simple
 data-files:
     cddl-files/allegra.cddl
-    cddl-files/real/crypto.cddl
-    cddl-files/mock/extras.cddl
+    cddl-files/crypto.cddl
+    cddl-files/extras.cddl
 
 extra-source-files: CHANGELOG.md
 

diff --git a/eras/alonzo/impl/cardano-ledger-alonzo.cabal b/eras/alonzo/impl/cardano-ledger-alonzo.cabal
@@ -14,8 +14,8 @@ category:           Network
 build-type:         Simple
 data-files:
     cddl-files/alonzo.cddl
-    cddl-files/real/crypto.cddl
-    cddl-files/mock/extras.cddl
+    cddl-files/crypto.cddl
+    cddl-files/extras.cddl
 
 extra-source-files: CHANGELOG.md
 

diff --git a/eras/babbage/impl/cardano-ledger-babbage.cabal b/eras/babbage/impl/cardano-ledger-babbage.cabal
@@ -16,8 +16,8 @@ category:           Network
 build-type:         Simple
 data-files:
     cddl-files/babbage.cddl
-    cddl-files/real/crypto.cddl
-    cddl-files/mock/extras.cddl
+    cddl-files/crypto.cddl
+    cddl-files/extras.cddl
 
 extra-source-files: CHANGELOG.md
 

diff --git a/eras/byron/ledger/impl/CHANGELOG.md b/eras/byron/ledger/impl/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Revision history for `cardano-ledger-byron`
 
+## 1.0.0.3
+
+* Update `streaming-binary` dependency to 0.4.
+
 ## 1.0.0.1
 
 * Make it build with `ghc-9.6`.

diff --git a/eras/byron/ledger/impl/cardano-ledger-byron.cabal b/eras/byron/ledger/impl/cardano-ledger-byron.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.0
 name:               cardano-ledger-byron
-version:            1.0.0.2
+version:            1.0.0.3
 license:            Apache-2.0
 maintainer:         operations@iohk.io
 author:             IOHK
@@ -252,7 +252,7 @@ library
         quiet,
         resourcet,
         streaming,
-        streaming-binary >=0.2 && <0.3,
+        streaming-binary >=0.2 && <0.4,
         streaming-bytestring,
         text,
         time,

diff --git a/eras/conway/impl/cardano-ledger-conway.cabal b/eras/conway/impl/cardano-ledger-conway.cabal
@@ -14,6 +14,7 @@ build-type:         Simple
 data-files:
     test/data/*.json
     cddl-files/conway.cddl
+    cddl-files/crypto.cddl
     cddl-files/extra.cddl
 
 extra-source-files: CHANGELOG.md

diff --git a/eras/mary/impl/cardano-ledger-mary.cabal b/eras/mary/impl/cardano-ledger-mary.cabal
@@ -14,8 +14,8 @@ category:           Network
 build-type:         Simple
 data-files:
     cddl-files/mary.cddl
-    cddl-files/real/crypto.cddl
-    cddl-files/mock/extras.cddl
+    cddl-files/crypto.cddl
+    cddl-files/extras.cddl
 
 extra-source-files: CHANGELOG.md
 

diff --git a/eras/shelley/impl/cardano-ledger-shelley.cabal b/eras/shelley/impl/cardano-ledger-shelley.cabal
@@ -8,8 +8,8 @@ synopsis:           Shelley Ledger Executable Model
 build-type:         Simple
 data-files:
     cddl-files/shelley.cddl
-    cddl-files/real/crypto.cddl
-    cddl-files/mock/extras.cddl
+    cddl-files/crypto.cddl
+    cddl-files/extras.cddl
 
 extra-source-files: CHANGELOG.md
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -157,15 +157,15 @@
             ({pkgs, ...}:
               lib.mkIf pkgs.stdenv.hostPlatform.isWindows {
                 packages.set-algebra.components.tests.tests.buildable = lib.mkForce false;
-                packages.plutus-preprocessor.package.buildable = lib.mkForce false;
-                packages.cardano-ledger-test.package.buildable = lib.mkForce false;
-                packages.cardano-ledger-shelley.package.buildable = lib.mkForce false;
-                packages.cardano-ledger-allegra.package.buildable = lib.mkForce false;
-                packages.cardano-ledger-mary.package.buildable = lib.mkForce false;
-                packages.cardano-ledger-alonzo.package.buildable = lib.mkForce false;
-                packages.cardano-ledger-babbage.package.buildable = lib.mkForce false;
-                packages.cardano-ledger-conway.package.buildable = lib.mkForce false;
-                packages.cardano-protocol-tpraos.package.buildable = lib.mkForce false;
+                packages.plutus-preprocessor.buildable = lib.mkForce false;
+                packages.cardano-ledger-test.buildable = lib.mkForce false;
+                packages.cardano-ledger-shelley.buildable = lib.mkForce false;
+                packages.cardano-ledger-allegra.buildable = lib.mkForce false;
+                packages.cardano-ledger-mary.buildable = lib.mkForce false;
+                packages.cardano-ledger-alonzo.buildable = lib.mkForce false;
+                packages.cardano-ledger-babbage.buildable = lib.mkForce false;
+                packages.cardano-ledger-conway.buildable = lib.mkForce false;
+                packages.cardano-protocol-tpraos.buildable = lib.mkForce false;
               })
           ];
         });