From 2e332c247d69719a3fd7182f6fdb7dbc117be1d5 Mon Sep 17 00:00:00 2001 From: Ellie Huxtable Date: Tue, 22 Oct 2024 16:58:25 -0700 Subject: [PATCH] chore: update to rust 1.82 (#2432) --- Cargo.toml | 17 +++++--- flake.lock | 18 ++++----- flake.nix | 98 +++++++++++++++++++++++---------------------- rust-toolchain.toml | 2 +- 4 files changed, 73 insertions(+), 62 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a0fffdcae6e..87d9b7e4dcf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ exclude = ["ui/backend"] [workspace.package] version = "18.4.0-beta.3" authors = ["Ellie Huxtable "] -rust-version = "1.80" +rust-version = "1.82" license = "MIT" homepage = "https://atuin.sh" repository = "https://github.com/atuinsh/atuin" @@ -18,9 +18,9 @@ async-trait = "0.1.58" base64 = "0.22" log = "0.4" time = { version = "0.3.36", features = [ - "serde-human-readable", - "macros", - "local-offset", + "serde-human-readable", + "macros", + "local-offset", ] } clap = { version = "4.5.7", features = ["derive"] } config = { version = "0.13", default-features = false, features = ["toml"] } @@ -67,7 +67,14 @@ ci = "github" # The installers to generate for each app installers = ["shell"] # Target platforms to build apps for (Rust target-triple syntax) -targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "aarch64-unknown-linux-musl", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl"] +targets = [ + "aarch64-apple-darwin", + "aarch64-unknown-linux-gnu", + "aarch64-unknown-linux-musl", + "x86_64-apple-darwin", + "x86_64-unknown-linux-gnu", + "x86_64-unknown-linux-musl", +] # Publish jobs to run in CI pr-run-mode = "plan" # Whether to install an updater program diff --git a/flake.lock b/flake.lock index 969636367f8..b6438d9948b 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1727678104, - "narHash": "sha256-jZr+8ZwMLlNab3qwfhsuAZyT9DfQ3d+18Sg9wXWXPIU=", + "lastModified": 1729578683, + "narHash": "sha256-h0Wmvrkadbyi3IJXFLPi+QyYjCAKDr2xQ6dLxlQ8cXY=", "owner": "nix-community", "repo": "fenix", - "rev": "db7af3238117cb215b7096bd4cf1e9970e9a405b", + "rev": "d66cda53e8193a878742dcadb5bb75f4df7c3c0a", "type": "github" }, "original": { @@ -57,11 +57,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727686113, - "narHash": "sha256-RG+429Uv2W+X5vdZ8mAngtfC1ppzu28rCWw5R7JC3k0=", + "lastModified": 1729428082, + "narHash": "sha256-xb4/Y+Y7ZlkQaA5rXnrXplDzdt2Jfgdmar3+qkb56UA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef7226d68ba45b2de3e428e5d4bb4532caffec7b", + "rev": "ca30f584e18024baf39c395001262ed936f27ebd", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1727641226, - "narHash": "sha256-iJTCG7vtECll27sxDElL4SuIY/kRhamJf0DDYCW6fb4=", + "lastModified": 1729533545, + "narHash": "sha256-A/AuEWcGwwjpfBCZqWDNNg5GwYrJduzLvlMe+A7xG5U=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "822644d97d7f64e1bdff25b1d636e366a29facc4", + "rev": "de2ff17bc513807412d7bbaba1d995a774938583", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 19a8034a9a1..4c9383f0082 100644 --- a/flake.nix +++ b/flake.nix @@ -11,58 +11,62 @@ inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { - self, - nixpkgs, - flake-utils, - fenix, - ... - }: - flake-utils.lib.eachDefaultSystem (system: let - pkgs = nixpkgs.outputs.legacyPackages.${system}; - in { - packages.atuin = pkgs.callPackage ./atuin.nix { - inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration AppKit; - rustPlatform = let - toolchain = - fenix.packages.${system}.fromToolchainFile - { - file = ./rust-toolchain.toml; - sha256 = "sha256-3jVIIf5XPnUU1CRaTyAiO0XHVbJl12MSx3eucTXCjtE="; + outputs = + { self + , nixpkgs + , flake-utils + , fenix + , ... + }: + flake-utils.lib.eachDefaultSystem + (system: + let + pkgs = nixpkgs.outputs.legacyPackages.${system}; + in + { + packages.atuin = pkgs.callPackage ./atuin.nix { + inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration AppKit; + rustPlatform = + let + toolchain = + fenix.packages.${system}.fromToolchainFile + { + file = ./rust-toolchain.toml; + sha256 = "sha256-yMuSb5eQPO/bHv+Bcf/US8LVMbf/G/0MSfiPwBhiPpk="; + }; + in + pkgs.makeRustPlatform { + cargo = toolchain; + rustc = toolchain; }; - in - pkgs.makeRustPlatform { - cargo = toolchain; - rustc = toolchain; - }; - }; - packages.default = self.outputs.packages.${system}.atuin; + }; + packages.default = self.outputs.packages.${system}.atuin; - devShells.default = self.packages.${system}.default.overrideAttrs (super: { - nativeBuildInputs = with pkgs; - super.nativeBuildInputs - ++ [ - cargo-edit - clippy - rustfmt - ]; - RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}"; + devShells.default = self.packages.${system}.default.overrideAttrs (super: { + nativeBuildInputs = with pkgs; + super.nativeBuildInputs + ++ [ + cargo-edit + clippy + rustfmt + ]; + RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}"; - shellHook = '' - echo >&2 "Setting development database path" - export ATUIN_DB_PATH="/tmp/atuin_dev.db" - export ATUIN_RECORD_STORE_PATH="/tmp/atuin_records.db" + shellHook = '' + echo >&2 "Setting development database path" + export ATUIN_DB_PATH="/tmp/atuin_dev.db" + export ATUIN_RECORD_STORE_PATH="/tmp/atuin_records.db" - if [ -e "''${ATUIN_DB_PATH}" ]; then - echo >&2 "''${ATUIN_DB_PATH} already exists, you might want to double-check that" - fi + if [ -e "''${ATUIN_DB_PATH}" ]; then + echo >&2 "''${ATUIN_DB_PATH} already exists, you might want to double-check that" + fi - if [ -e "''${ATUIN_RECORD_STORE_PATH}" ]; then - echo >&2 "''${ATUIN_RECORD_STORE_PATH} already exists, you might want to double-check that" - fi - ''; - }); - }) + if [ -e "''${ATUIN_RECORD_STORE_PATH}" ]; then + echo >&2 "''${ATUIN_RECORD_STORE_PATH} already exists, you might want to double-check that" + fi + ''; + }); + }) // { overlays.default = final: prev: { inherit (self.packages.${final.system}) atuin; diff --git a/rust-toolchain.toml b/rust-toolchain.toml index a56a283d2ab..76fcadb5b32 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.80.1" +channel = "1.82"