Merge pull request #178 from cspr-rad/bump-casper-node

cspr-rad · Aug 9, 2024 · ff69db9 · ff69db9
2 parents ed0ba18 + 4b0aa0b
commit ff69db9
Show file tree

Hide file tree

Showing 2 changed files with 148 additions and 8 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -28,7 +28,7 @@
     advisory-db.url = "github:rustsec/advisory-db";
     advisory-db.flake = false;
     cctl.url = "github:casper-network/cctl/947c34b991e37476db82ccfa2bd7c0312c1a91d7";
-    csprpkgs.follows = "cctl/csprpkgs";
+    csprpkgs.url = "github:cspr-rad/csprpkgs";
   };
 
   outputs = inputs@{ self, flake-parts, treefmt-nix, ... }:
@@ -47,6 +47,8 @@
           ];
           craneLib = inputs.crane.lib.${system}.overrideToolchain rustToolchain;
 
+          cctl = inputs'.cctl.packages.cctl.override { casper-node = inputs'.csprpkgs.packages.casper-node; };
+
           # TODO reuse in nixos tests
           cctlConfig = {
             chainspec = pkgs.fetchurl {
@@ -174,7 +176,7 @@
               darwin.apple_sdk.frameworks.SystemConfiguration
             ];
             checkInputs = [
-              inputs'.cctl.packages.cctl
+              cctl
               pkgs.postgresql
             ];
 
@@ -228,7 +230,7 @@
               ''
                 mkdir -p $out/bin
                 makeWrapper ${self'.packages.kairos}/bin/cctld $out/bin/cctld \
-                  --set PATH ${pkgs.lib.makeBinPath [inputs'.cctl.packages.cctl ]}
+                  --set PATH ${pkgs.lib.makeBinPath [ cctl ]}
               '';
 
             default = self'.packages.kairos;