From 9d597c8e398152537c9d3a6b2421cb9c02b8a6d0 Mon Sep 17 00:00:00 2001 From: Avery Winters Date: Mon, 18 Mar 2024 11:39:13 -0500 Subject: [PATCH] Bump deps and use nightly --- Cargo.lock | 24 ++++++++++++------------ calculate/Cargo.toml | 2 +- flake.lock | 39 +++++++++++++++++++++++++++++++++++++++ flake.nix | 16 +++++++++++----- 4 files changed, 63 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6096295..458131e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -70,9 +70,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "bilrow-calculate" @@ -104,9 +104,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.2" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" +checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" dependencies = [ "clap_builder", "clap_derive", @@ -126,9 +126,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.0" +version = "4.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" dependencies = [ "heck", "proc-macro2", @@ -185,9 +185,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "indicatif" @@ -258,9 +258,9 @@ checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -282,9 +282,9 @@ checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "syn" -version = "2.0.52" +version = "2.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" dependencies = [ "proc-macro2", "quote", diff --git a/calculate/Cargo.toml b/calculate/Cargo.toml index a866ba9..b68254d 100644 --- a/calculate/Cargo.toml +++ b/calculate/Cargo.toml @@ -11,4 +11,4 @@ anyhow = "1.0.80" indicatif = "0.17.8" memchr = "2.7.1" memmap2 = "0.9.4" -hashbrown = "0.14.3" +hashbrown = "0.14.3" \ No newline at end of file diff --git a/flake.lock b/flake.lock index 23d5275..97fcc30 100644 --- a/flake.lock +++ b/flake.lock @@ -23,6 +23,27 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1710742993, + "narHash": "sha256-W0PQCe0bW3hKF5lHawXrKynBcdSP18Qa4sb8DcUfOqI=", + "owner": "nix-community", + "repo": "fenix", + "rev": "6f2fec850f569d61562d3a47dc263f19e9c7d825", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": [ @@ -62,11 +83,29 @@ "root": { "inputs": { "devshell": "devshell", + "fenix": "fenix", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "systems": "systems" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1710708100, + "narHash": "sha256-Jd6pmXlwKk5uYcjyO/8BfbUVmx8g31Qfk7auI2IG66A=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "b6d1887bc4f9543b6c6bf098179a62446f34a6c3", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 119bec2..3c7fafd 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,10 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; + fenix = { + url = "github:nix-community/fenix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; flake-utils = { url = "github:numtide/flake-utils"; inputs.systems.follows = "systems"; @@ -18,25 +22,27 @@ }; outputs = { devshell, + fenix, flake-utils, nixpkgs, ... }: (flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; - overlays = [devshell.overlays.default]; + overlays = [ + devshell.overlays.default + fenix.overlays.default + ]; }; in { formatter = pkgs.alejandra; devShells.default = pkgs.devshell.mkShell { commands = [ {package = pkgs.clangStdenv;} - {package = pkgs.cargo;} + {package = pkgs.fenix.default.toolchain; } {package = pkgs.cargo-flamegraph;} {package = pkgs.nil;} - {package = pkgs.rustc;} - {package = pkgs.rustfmt;} - {package = pkgs.rust-analyzer;} + {package = pkgs.rust-analyzer-nightly;} ]; }; }));