Skip to content

Commit 2e332c2

Browse files
authored
chore: update to rust 1.82 (#2432)
1 parent 62473c6 commit 2e332c2

File tree

4 files changed

+73
-62
lines changed

4 files changed

+73
-62
lines changed

Cargo.toml

+12-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ exclude = ["ui/backend"]
77
[workspace.package]
88
version = "18.4.0-beta.3"
99
authors = ["Ellie Huxtable <[email protected]>"]
10-
rust-version = "1.80"
10+
rust-version = "1.82"
1111
license = "MIT"
1212
homepage = "https://atuin.sh"
1313
repository = "https://github.com/atuinsh/atuin"
@@ -18,9 +18,9 @@ async-trait = "0.1.58"
1818
base64 = "0.22"
1919
log = "0.4"
2020
time = { version = "0.3.36", features = [
21-
"serde-human-readable",
22-
"macros",
23-
"local-offset",
21+
"serde-human-readable",
22+
"macros",
23+
"local-offset",
2424
] }
2525
clap = { version = "4.5.7", features = ["derive"] }
2626
config = { version = "0.13", default-features = false, features = ["toml"] }
@@ -67,7 +67,14 @@ ci = "github"
6767
# The installers to generate for each app
6868
installers = ["shell"]
6969
# Target platforms to build apps for (Rust target-triple syntax)
70-
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"]
70+
targets = [
71+
"aarch64-apple-darwin",
72+
"aarch64-unknown-linux-gnu",
73+
"aarch64-unknown-linux-musl",
74+
"x86_64-apple-darwin",
75+
"x86_64-unknown-linux-gnu",
76+
"x86_64-unknown-linux-musl",
77+
]
7178
# Publish jobs to run in CI
7279
pr-run-mode = "plan"
7380
# Whether to install an updater program

flake.lock

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+51-47
Original file line numberDiff line numberDiff line change
@@ -11,58 +11,62 @@
1111
inputs.nixpkgs.follows = "nixpkgs";
1212
};
1313
};
14-
outputs = {
15-
self,
16-
nixpkgs,
17-
flake-utils,
18-
fenix,
19-
...
20-
}:
21-
flake-utils.lib.eachDefaultSystem (system: let
22-
pkgs = nixpkgs.outputs.legacyPackages.${system};
23-
in {
24-
packages.atuin = pkgs.callPackage ./atuin.nix {
25-
inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration AppKit;
26-
rustPlatform = let
27-
toolchain =
28-
fenix.packages.${system}.fromToolchainFile
29-
{
30-
file = ./rust-toolchain.toml;
31-
sha256 = "sha256-3jVIIf5XPnUU1CRaTyAiO0XHVbJl12MSx3eucTXCjtE=";
14+
outputs =
15+
{ self
16+
, nixpkgs
17+
, flake-utils
18+
, fenix
19+
, ...
20+
}:
21+
flake-utils.lib.eachDefaultSystem
22+
(system:
23+
let
24+
pkgs = nixpkgs.outputs.legacyPackages.${system};
25+
in
26+
{
27+
packages.atuin = pkgs.callPackage ./atuin.nix {
28+
inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration AppKit;
29+
rustPlatform =
30+
let
31+
toolchain =
32+
fenix.packages.${system}.fromToolchainFile
33+
{
34+
file = ./rust-toolchain.toml;
35+
sha256 = "sha256-yMuSb5eQPO/bHv+Bcf/US8LVMbf/G/0MSfiPwBhiPpk=";
36+
};
37+
in
38+
pkgs.makeRustPlatform {
39+
cargo = toolchain;
40+
rustc = toolchain;
3241
};
33-
in
34-
pkgs.makeRustPlatform {
35-
cargo = toolchain;
36-
rustc = toolchain;
37-
};
38-
};
39-
packages.default = self.outputs.packages.${system}.atuin;
42+
};
43+
packages.default = self.outputs.packages.${system}.atuin;
4044

41-
devShells.default = self.packages.${system}.default.overrideAttrs (super: {
42-
nativeBuildInputs = with pkgs;
43-
super.nativeBuildInputs
44-
++ [
45-
cargo-edit
46-
clippy
47-
rustfmt
48-
];
49-
RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
45+
devShells.default = self.packages.${system}.default.overrideAttrs (super: {
46+
nativeBuildInputs = with pkgs;
47+
super.nativeBuildInputs
48+
++ [
49+
cargo-edit
50+
clippy
51+
rustfmt
52+
];
53+
RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
5054

51-
shellHook = ''
52-
echo >&2 "Setting development database path"
53-
export ATUIN_DB_PATH="/tmp/atuin_dev.db"
54-
export ATUIN_RECORD_STORE_PATH="/tmp/atuin_records.db"
55+
shellHook = ''
56+
echo >&2 "Setting development database path"
57+
export ATUIN_DB_PATH="/tmp/atuin_dev.db"
58+
export ATUIN_RECORD_STORE_PATH="/tmp/atuin_records.db"
5559
56-
if [ -e "''${ATUIN_DB_PATH}" ]; then
57-
echo >&2 "''${ATUIN_DB_PATH} already exists, you might want to double-check that"
58-
fi
60+
if [ -e "''${ATUIN_DB_PATH}" ]; then
61+
echo >&2 "''${ATUIN_DB_PATH} already exists, you might want to double-check that"
62+
fi
5963
60-
if [ -e "''${ATUIN_RECORD_STORE_PATH}" ]; then
61-
echo >&2 "''${ATUIN_RECORD_STORE_PATH} already exists, you might want to double-check that"
62-
fi
63-
'';
64-
});
65-
})
64+
if [ -e "''${ATUIN_RECORD_STORE_PATH}" ]; then
65+
echo >&2 "''${ATUIN_RECORD_STORE_PATH} already exists, you might want to double-check that"
66+
fi
67+
'';
68+
});
69+
})
6670
// {
6771
overlays.default = final: prev: {
6872
inherit (self.packages.${final.system}) atuin;

rust-toolchain.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[toolchain]
2-
channel = "1.80.1"
2+
channel = "1.82"

0 commit comments

Comments
 (0)