extern/atuin
1
0
Fork 0
mirror of https://github.com/atuinsh/atuin.git synced 2024-11-21 15:53:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: update to rust 1.82 (#2432)

Browse Source
This commit is contained in:
Ellie Huxtable 2024-10-22 16:58:25 -07:00 committed by GitHub
parent 62473c603c
commit 2e332c247d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 73 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Cargo.toml
View File

@ -7,7 +7,7 @@ exclude = ["ui/backend"]
[workspace.package] [workspace.package]
version = "18.4.0-beta.3" version = "18.4.0-beta.3"
authors = ["Ellie Huxtable <ellie@atuin.sh>"] authors = ["Ellie Huxtable <ellie@atuin.sh>"]
rust-version = "1.80" rust-version = "1.82"
license = "MIT" license = "MIT"
homepage = "https://atuin.sh" homepage = "https://atuin.sh"
repository = "https://github.com/atuinsh/atuin" repository = "https://github.com/atuinsh/atuin"
@ -18,9 +18,9 @@ async-trait = "0.1.58"
base64 = "0.22" base64 = "0.22"
log = "0.4" log = "0.4"
time = { version = "0.3.36", features = [ time = { version = "0.3.36", features = [
"serde-human-readable", "serde-human-readable",
"macros", "macros",
"local-offset", "local-offset",
] } ] }
clap = { version = "4.5.7", features = ["derive"] } clap = { version = "4.5.7", features = ["derive"] }
config = { version = "0.13", default-features = false, features = ["toml"] } config = { version = "0.13", default-features = false, features = ["toml"] }
@ -67,7 +67,14 @@ ci = "github"
# The installers to generate for each app # The installers to generate for each app
installers = ["shell"] installers = ["shell"]
# Target platforms to build apps for (Rust target-triple syntax) # 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 # Publish jobs to run in CI
pr-run-mode = "plan" pr-run-mode = "plan"
# Whether to install an updater program # Whether to install an updater program

18
flake.lock
View File

@ -8,11 +8,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1727678104, "lastModified": 1729578683,
"narHash": "sha256-jZr+8ZwMLlNab3qwfhsuAZyT9DfQ3d+18Sg9wXWXPIU=", "narHash": "sha256-h0Wmvrkadbyi3IJXFLPi+QyYjCAKDr2xQ6dLxlQ8cXY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "db7af3238117cb215b7096bd4cf1e9970e9a405b", "rev": "d66cda53e8193a878742dcadb5bb75f4df7c3c0a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -57,11 +57,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1727686113, "lastModified": 1729428082,
"narHash": "sha256-RG+429Uv2W+X5vdZ8mAngtfC1ppzu28rCWw5R7JC3k0=", "narHash": "sha256-xb4/Y+Y7ZlkQaA5rXnrXplDzdt2Jfgdmar3+qkb56UA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ef7226d68ba45b2de3e428e5d4bb4532caffec7b", "rev": "ca30f584e18024baf39c395001262ed936f27ebd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -82,11 +82,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1727641226, "lastModified": 1729533545,
"narHash": "sha256-iJTCG7vtECll27sxDElL4SuIY/kRhamJf0DDYCW6fb4=", "narHash": "sha256-A/AuEWcGwwjpfBCZqWDNNg5GwYrJduzLvlMe+A7xG5U=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "822644d97d7f64e1bdff25b1d636e366a29facc4", "rev": "de2ff17bc513807412d7bbaba1d995a774938583",
"type": "github" "type": "github"
}, },
"original": { "original": {

98
flake.nix
View File

@ -11,58 +11,62 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { outputs =
self, { self
nixpkgs, , nixpkgs
flake-utils, , flake-utils
fenix, , fenix
... , ...
}: }:
flake-utils.lib.eachDefaultSystem (system: let flake-utils.lib.eachDefaultSystem
pkgs = nixpkgs.outputs.legacyPackages.${system}; (system:
in { let
packages.atuin = pkgs.callPackage ./atuin.nix { pkgs = nixpkgs.outputs.legacyPackages.${system};
inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration AppKit; in
rustPlatform = let {
toolchain = packages.atuin = pkgs.callPackage ./atuin.nix {
fenix.packages.${system}.fromToolchainFile inherit (pkgs.darwin.apple_sdk.frameworks) Security SystemConfiguration AppKit;
{ rustPlatform =
file = ./rust-toolchain.toml; let
sha256 = "sha256-3jVIIf5XPnUU1CRaTyAiO0XHVbJl12MSx3eucTXCjtE="; 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 { packages.default = self.outputs.packages.${system}.atuin;
cargo = toolchain;
rustc = toolchain;
};
};
packages.default = self.outputs.packages.${system}.atuin;
devShells.default = self.packages.${system}.default.overrideAttrs (super: { devShells.default = self.packages.${system}.default.overrideAttrs (super: {
nativeBuildInputs = with pkgs; nativeBuildInputs = with pkgs;
super.nativeBuildInputs super.nativeBuildInputs
++ [ ++ [
cargo-edit cargo-edit
clippy clippy
rustfmt rustfmt
]; ];
RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}"; RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
shellHook = '' shellHook = ''
echo >&2 "Setting development database path" echo >&2 "Setting development database path"
export ATUIN_DB_PATH="/tmp/atuin_dev.db" export ATUIN_DB_PATH="/tmp/atuin_dev.db"
export ATUIN_RECORD_STORE_PATH="/tmp/atuin_records.db" export ATUIN_RECORD_STORE_PATH="/tmp/atuin_records.db"
if [ -e "''${ATUIN_DB_PATH}" ]; then if [ -e "''${ATUIN_DB_PATH}" ]; then
echo >&2 "''${ATUIN_DB_PATH} already exists, you might want to double-check that" echo >&2 "''${ATUIN_DB_PATH} already exists, you might want to double-check that"
fi fi
if [ -e "''${ATUIN_RECORD_STORE_PATH}" ]; then if [ -e "''${ATUIN_RECORD_STORE_PATH}" ]; then
echo >&2 "''${ATUIN_RECORD_STORE_PATH} already exists, you might want to double-check that" echo >&2 "''${ATUIN_RECORD_STORE_PATH} already exists, you might want to double-check that"
fi fi
''; '';
}); });
}) })
// { // {
overlays.default = final: prev: { overlays.default = final: prev: {
inherit (self.packages.${final.system}) atuin; inherit (self.packages.${final.system}) atuin;

2
rust-toolchain.toml
View File

@ -1,2 +1,2 @@
[toolchain] [toolchain]
channel = "1.80.1" channel = "1.82"