From 79496dc54a7be5f5aaf6dea267ed6a706d1e9d48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marijan=20Petri=C4=8Devi=C4=87?= Date: Mon, 2 Sep 2024 16:40:03 +0200 Subject: [PATCH] flake: update to use cctl with casper-node 2.0.0-rc4 --- flake.lock | 157 +++-------------------------------------------------- flake.nix | 8 +-- 2 files changed, 13 insertions(+), 152 deletions(-) diff --git a/flake.lock b/flake.lock index 8d0b322..cbd5c67 100644 --- a/flake.lock +++ b/flake.lock @@ -41,30 +41,6 @@ "type": "github" } }, - "agenix_2": { - "inputs": { - "darwin": "darwin_2", - "home-manager": "home-manager_2", - "nixpkgs": [ - "csprpkgs", - "nixpkgs" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1722339003, - "narHash": "sha256-ZeS51uJI30ehNkcZ4uKqT4ZDARPyqrHADSKAwv5vVCU=", - "owner": "ryantm", - "repo": "agenix", - "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, "cctl": { "inputs": { "csprpkgs": "csprpkgs", @@ -80,17 +56,17 @@ ] }, "locked": { - "lastModified": 1717998887, - "narHash": "sha256-0i3xRAkHI+NPwxGWC3vtJeQyAxfuxr//W7gBT6iuFuk=", + "lastModified": 1724854666, + "narHash": "sha256-MPmPUXMHww3M1NVgUFmC58bYN87Xk7QC3ve+UMBs9Z4=", "owner": "casper-network", "repo": "cctl", - "rev": "947c34b991e37476db82ccfa2bd7c0312c1a91d7", + "rev": "058de6887c691dac0b20284fba1f78bcd39187ef", "type": "github" }, "original": { "owner": "casper-network", "repo": "cctl", - "rev": "947c34b991e37476db82ccfa2bd7c0312c1a91d7", + "rev": "058de6887c691dac0b20284fba1f78bcd39187ef", "type": "github" } }, @@ -134,27 +110,6 @@ "type": "github" } }, - "csprpkgs_2": { - "inputs": { - "agenix": "agenix_2", - "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1724854505, - "narHash": "sha256-ax1Jxgd47kmK6ZY7lm0KheDLm6DyqZRZlGY+3f9XYWU=", - "owner": "cspr-rad", - "repo": "csprpkgs", - "rev": "3bc835d3b73a5d5a5829f3b8506f51a9cd098abd", - "type": "github" - }, - "original": { - "owner": "cspr-rad", - "repo": "csprpkgs", - "rev": "3bc835d3b73a5d5a5829f3b8506f51a9cd098abd", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -179,29 +134,6 @@ "type": "github" } }, - "darwin_2": { - "inputs": { - "nixpkgs": [ - "csprpkgs", - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -264,28 +196,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "csprpkgs", - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1722730825, @@ -315,22 +225,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1722730825, - "narHash": "sha256-X6U+w8qFBuGPCYrZzc9mpN34aRjQ8604MonpBUkj908=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f3834de3782b82bfc666abf664f946d0e7d1f116", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1724015816, "narHash": "sha256-hVESnM7Eiz93+4DeiE0a1TwMeaeph1ytRJ5QtqxYRWg=", @@ -351,10 +245,13 @@ "advisory-db": "advisory-db", "cctl": "cctl", "crane": "crane", - "csprpkgs": "csprpkgs_2", + "csprpkgs": [ + "cctl", + "csprpkgs" + ], "fenix": "fenix", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "treefmt-nix": "treefmt-nix" } }, @@ -397,27 +294,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "csprpkgs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722824458, - "narHash": "sha256-2k3/geD5Yh8JT1nrGaRycje5kB0DkvQA/OUZoel1bIU=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "a8a937c304e62a5098c6276c9cdf65c19a43b1a5", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -433,21 +309,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 743b40e..38851b4 100644 --- a/flake.nix +++ b/flake.nix @@ -27,8 +27,9 @@ crane.inputs.nixpkgs.follows = "nixpkgs"; advisory-db.url = "github:rustsec/advisory-db"; advisory-db.flake = false; - cctl.url = "github:casper-network/cctl/947c34b991e37476db82ccfa2bd7c0312c1a91d7"; - csprpkgs.url = "github:cspr-rad/csprpkgs/3bc835d3b73a5d5a5829f3b8506f51a9cd098abd"; + # with casper-node 2.0.0-rc4 https://github.com/casper-network/cctl/pull/44/commits/058de6887c691dac0b20284fba1f78bcd39187ef + cctl.url = "github:casper-network/cctl/058de6887c691dac0b20284fba1f78bcd39187ef"; + csprpkgs.follows = "cctl/csprpkgs"; }; outputs = inputs@{ flake-parts, treefmt-nix, ... }: @@ -43,8 +44,7 @@ rustToolchain = inputs'.fenix.packages.stable.toolchain; craneLib = (inputs.crane.mkLib pkgs).overrideToolchain rustToolchain; - # revision 3bc835d contains casper-node 1.5.7 - cctl = inputs'.cctl.packages.cctl.override { casper-node = inputs'.csprpkgs.packages.casper-node; }; + cctl = inputs'.cctl.packages.cctl; cctlAttrs = { pname = "cctl-rs";