Update CHaP and haskell.nix

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

flake.nix

@@ -1,7 +1,6 @@
 {
   inputs = {
     nixpkgs.follows = "haskellNix/nixpkgs";
-    nixpkgsLatest.url = "github:NixOS/nixpkgs/nixos-24.05";
     haskellNix.url = "github:input-output-hk/haskell.nix";
     hydra-spec.url = "github:cardano-scaling/hydra-formal-specification";
     iohk-nix.url = "github:input-output-hk/iohk-nix";
@@ -28,8 +27,6 @@
     { self
     , flake-parts
     , nixpkgs
-      # TODO remove when haskellNix updated to newer nixpkgs
-    , nixpkgsLatest
     , cardano-node
     , ...
     } @ inputs:
@@ -49,9 +46,6 @@
 
           # nixpkgs enhanced with haskell.nix and crypto libs as used by iohk
 
-          pkgsLatest = import nixpkgsLatest {
-            inherit system;
-          };
           pkgs = import nixpkgs {
             inherit system;
             overlays = [
@@ -136,7 +130,7 @@
           process-compose."demo" = import ./nix/hydra/demo.nix {
             inherit system pkgs inputs self;
             demoDir = ./demo;
-            inherit (pkgsLatest) process-compose;
+            inherit (pkgs) process-compose;
             inherit (pkgs) cardano-node cardano-cli;
             inherit (hydraPackages) hydra-node hydra-tui;
           };
@@ -168,7 +162,7 @@
           ]);
 
           devShells = import ./nix/hydra/shell.nix {
-            inherit inputs pkgs hsPkgs system compiler pkgsLatest;
+            inherit inputs pkgs hsPkgs system compiler;
           };
         };
     };

nix/hydra/shell.nix

@@ -7,7 +7,6 @@
 , system
 , pkgs
 , compiler
-, pkgsLatest
 }:
 let
 
@@ -35,6 +34,7 @@ let
     pkgs.haskellPackages.ghcid
     # Generate a graph of the module dependencies in the "dot" format
     pkgs.haskellPackages.graphmod
+    pkgs.jq
     # To interact with mithril and integration tests
     pkgs.mithril-client-cli
     pkgs.nixpkgs-fmt
@@ -47,8 +47,6 @@ let
     pkgs.websocat
     pkgs.yarn
     pkgs.yq
-    # Use latest jq in all shells, to avoid 1.6 bug with large integers.
-    pkgsLatest.jq
   ];
 
   libs = [
@@ -142,7 +140,7 @@ let
       pkgs.plantuml
       # Note: jq 1.6 has a bug that means it fails to read large integers
       # correctly, so we require 1.7+ at least.
-      pkgsLatest.jq
+      pkgs.jq
     ];
   };