From 4b0aa0b6e9b208a07a720a8671ca1fe335c74ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marijan=20Petri=C4=8Devi=C4=87?= Date: Wed, 7 Aug 2024 09:33:33 -0400 Subject: [PATCH] flake: update casper-node 1.5.6 -> 1.5.7 --- flake.lock | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++-- flake.nix | 8 +-- 2 files changed, 148 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 20cae6bf..9cd53c6f 100644 --- a/flake.lock +++ b/flake.lock @@ -16,6 +16,30 @@ "type": "github" } }, + "agenix": { + "inputs": { + "darwin": "darwin", + "home-manager": "home-manager", + "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", @@ -84,6 +108,49 @@ "type": "github" } }, + "csprpkgs_2": { + "inputs": { + "agenix": "agenix", + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1722882341, + "narHash": "sha256-WhbUtqJLRhE58YGMhclqBzvrIQ+6j4QIzLsiPKipgCw=", + "owner": "cspr-rad", + "repo": "csprpkgs", + "rev": "b2997304c3b9bef19b4fb10b6a93e8cd3c61e813", + "type": "github" + }, + "original": { + "owner": "cspr-rad", + "repo": "csprpkgs", + "type": "github" + } + }, + "darwin": { + "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": [ @@ -141,6 +208,28 @@ "type": "github" } }, + "home-manager": { + "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": 1712192574, @@ -176,6 +265,22 @@ } }, "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": 1721782431, "narHash": "sha256-UNDpwjYxNXQet/g3mgRLsQ9zxrbm9j2JEvP4ijF3AWs=", @@ -196,13 +301,10 @@ "advisory-db": "advisory-db", "cctl": "cctl", "crane": "crane", - "csprpkgs": [ - "cctl", - "csprpkgs" - ], + "csprpkgs": "csprpkgs_2", "fenix": "fenix", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "treefmt-nix": "treefmt-nix" } }, @@ -246,6 +348,27 @@ "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, @@ -261,6 +384,21 @@ "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 4c0fcead..fade11ee 100644 --- 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;