diff --git a/contrib/nix/flake.lock b/contrib/nix/flake.lock index 2a1995f03b..8cb7bfe5b9 100644 --- a/contrib/nix/flake.lock +++ b/contrib/nix/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1751562746, - "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=", + "lastModified": 1759691647, + "narHash": "sha256-OnyPw3KaXL909I+FNyD6jfkAP/gdL/K0iitMHxo7ieM=", "owner": "ipetkov", "repo": "crane", - "rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd", + "rev": "1e7905b1eb1b551aade75169940557b6c51ed920", "type": "github" }, "original": { @@ -37,11 +37,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751949589, - "narHash": "sha256-mgFxAPLWw0Kq+C8P3dRrZrOYEQXOtKuYVlo9xvPntt8=", + "lastModified": 1759632233, + "narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b008d60392981ad674e04016d25619281550a9d", + "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10", "type": "github" }, "original": { @@ -67,11 +67,11 @@ ] }, "locked": { - "lastModified": 1752028888, - "narHash": "sha256-LRj3/PUpII6taWOrX1w/OeI6f1ncND02PP/kEHvPCqU=", + "lastModified": 1759804383, + "narHash": "sha256-jPz0K8xsT2eNSratkw8bfPwSlTuOXGeUvz+bd9wq/vY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a0f1c656e053463b47639234b151a05e4441bb19", + "rev": "dec08d5dfeca099b0058f0cc61264b04f33db42c", "type": "github" }, "original": { diff --git a/contrib/nix/flake.nix b/contrib/nix/flake.nix index d2505fee96..b8eff4ae68 100644 --- a/contrib/nix/flake.nix +++ b/contrib/nix/flake.nix @@ -96,6 +96,9 @@ (craneLib.fileset.commonCargoSources ../../stacks-node) (craneLib.fileset.commonCargoSources ../tools/config-docs-generator) + (craneLib.fileset.commonCargoSources ../../contrib/stacks-inspect) + (craneLib.fileset.commonCargoSources ../../contrib/stacks-cli) + (craneLib.fileset.commonCargoSources ../../stacks-signer) ]; }; @@ -118,6 +121,20 @@ src = fileSetForCrate ../..; }); + stacks-inspect = craneLib.buildPackage (individualCrateArgs // rec { + inherit version; + pname = "stacks-inspect"; + cargoExtraArgs = "-p ${pname}"; + src = fileSetForCrate ../../contrib/stacks-inspect; + }); + + stacks-cli = craneLib.buildPackage (individualCrateArgs // rec { + inherit version; + pname = "stacks-cli"; + cargoExtraArgs = "-p ${pname}"; + src = fileSetForCrate ../../contrib/stacks-cli; + }); + stacks-node-app = { type = "app"; program = "${stacks-core}/bin/stacks-node"; @@ -141,7 +158,7 @@ }; in with pkgs; { packages = { - inherit stacks-signer stacks-core; + inherit stacks-signer stacks-core stacks-cli stacks-inspect; default = stacks-core; }; @@ -175,7 +192,7 @@ set +x ''; - packages = [ rust-analyzer bitcoind ] + packages = [ rust-analyzer bitcoind cargo-nextest ] ++ lib.optionals pkgs.stdenv.isDarwin [ ]; }; });