Bump CHaP and haskell.nix

cardano-scaling · Sep 27, 2024 · 0398385 · 0398385
1 parent 47410de
commit 0398385
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 36 deletions.
diff --git a/cabal.project b/cabal.project
@@ -12,8 +12,8 @@ repository cardano-haskell-packages
 
 -- See CONTRIBUTING.md for information about when and how to update these.
 index-state:
-  , hackage.haskell.org 2024-07-19T19:07:04Z
-  , cardano-haskell-packages 2024-07-19T19:04:02Z
+  , hackage.haskell.org 2024-09-23T15:45:50Z
+  , cardano-haskell-packages 2024-09-20T19:39:13Z
 
 packages:
   hydra-prelude

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -149,7 +149,7 @@
                 pkgs.nixpkgs-fmt
                 pkgs.fourmolu
               ];
-              treefmt = pkgs.treefmt;
+              treefmt = pkgsLatest.treefmt;
             };
           } // lib.attrsets.mergeAttrsList (map (x: componentsToWerrors x hsPkgs.${x}) [
             "hydra-cardano-api"
@@ -167,7 +167,8 @@
           ]);
 
           devShells = import ./nix/hydra/shell.nix {
-            inherit inputs pkgs hsPkgs system compiler pkgsLatest;
+            inherit inputs pkgs hsPkgs system pkgsLatest;
+            ghc = pkgs.buildPackages.haskell-nix.compiler.${compiler};
           };
         };
     };

diff --git a/hydra-plutus/hydra-plutus.cabal b/hydra-plutus/hydra-plutus.cabal
@@ -71,10 +71,10 @@ library
     , hydra-cardano-api
     , hydra-plutus-extras
     , hydra-prelude
-    , plutus-core          >=1.21
-    , plutus-ledger-api    >=1.21
-    , plutus-tx            >=1.21
-    , plutus-tx-plugin     >=1.21
+    , plutus-core          ^>=1.30
+    , plutus-ledger-api    ^>=1.30
+    , plutus-tx            ^>=1.30
+    , plutus-tx-plugin     ^>=1.30
     , QuickCheck
     , serialise
     , template-haskell

diff --git a/nix/hydra/shell.nix b/nix/hydra/shell.nix
@@ -6,7 +6,7 @@
 , inputs
 , system
 , pkgs
-, compiler
+, ghc
 , pkgsLatest
 }:
 let
@@ -90,7 +90,7 @@ let
     name = "hydra-node-cabal-shell";
 
     buildInputs = libs ++ [
-      hsPkgs.ghc
+      ghc
       pkgs.cabal-install
       pkgs.pkg-config
     ] ++ buildInputs;