From c9f7626dd723f075809eadd57047c172094c1ff9 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sat, 13 Jul 2024 14:20:26 -0400 Subject: [PATCH] nix: Update rust-flake (multi-crate support) --- flake.lock | 13 ++++++------- flake.nix | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index a25fafe..d4b29ec 100644 --- a/flake.lock +++ b/flake.lock @@ -23,17 +23,16 @@ ] }, "locked": { - "lastModified": 1707685877, - "narHash": "sha256-XoXRS+5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc=", + "lastModified": 1718474113, + "narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=", "owner": "ipetkov", "repo": "crane", - "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e", + "rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386", "type": "github" }, "original": { "owner": "ipetkov", "repo": "crane", - "rev": "2c653e4478476a52c6aa3ac0495e4dea7449ea0e", "type": "github" } }, @@ -168,11 +167,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1715566055, - "narHash": "sha256-mSPlmQ8rLqtkk210ukUWfvmlSkLgCB6ZFoVQJPXeOGc=", + "lastModified": 1720894631, + "narHash": "sha256-sIBkqjricFA8u5OLyaleDSVLc0cMb6ZjXhbaK0JEMH4=", "owner": "juspay", "repo": "rust-flake", - "rev": "1e60c9fc0024c9705b909040c6e21d15fa64ebe9", + "rev": "3199e539a2209925129af68cf21e64d8a2ae7672", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 77a7e6f..c938ead 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ inputs.cargo-doc-live.flakeModule ]; perSystem = { config, self', pkgs, lib, ... }: { - rust-project.crane.args = { + rust-project.crates."rust-nix-template".crane.args = { buildInputs = lib.optionals pkgs.stdenv.isDarwin ( with pkgs.darwin.apple_sdk.frameworks; [ IOKit @@ -42,7 +42,7 @@ }; devShells.default = pkgs.mkShell { - inputsFrom = [ self'.devShells.rust-nix-template ]; + inputsFrom = [ self'.devShells.rust ]; packages = [ pkgs.cargo-watch config.process-compose.cargo-doc-live.outputs.package