From 28c5d7194c0a1a65c41119cef22061dac5e0f645 Mon Sep 17 00:00:00 2001 From: Jens Krause <47693+sectore@users.noreply.github.com> Date: Sun, 13 Apr 2025 21:37:47 +0200 Subject: [PATCH] Rust 1.86.0 (#73) --- CHANGELOG.md | 7 ++++--- Cargo.toml | 2 +- flake.lock | 24 ++++++++++++------------ flake.nix | 2 +- rust-toolchain.toml | 2 +- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88cdd5e..52e5b87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,14 @@ ### Fixes -- (countdown) Reset `Mission Elapsed Time (MET)` if `countdown` is set by _local time_ [#72](https://github.com/sectore/timr-tui/pull/72) - (countdown) Reset `Mission Elapsed Time (MET)` if `countdown` is set by _cli arguments_ [#71](https://github.com/sectore/timr-tui/pull/71) +- (countdown) Reset `Mission Elapsed Time (MET)` while setting `countdown` by _local time_ [#72](https://github.com/sectore/timr-tui/pull/72) ### Misc. -(cargo) Exclude files for packaging [e7a5a1b](https://github.com/sectore/timr-tui/commit/e7a5a1b2da7a7967f2602a0b92f391ac768ca638) -(just) `group` commands [#70](https://github.com/sectore/timr-tui/pull/70) +- (deps) Use latest `Rust 1.86` [#73](https://github.com/sectore/timr-tui/pull/73) +- (cargo) Exclude files for packaging [e7a5a1b](https://github.com/sectore/timr-tui/commit/e7a5a1b2da7a7967f2602a0b92f391ac768ca638) +- (just) `group` commands [#70](https://github.com/sectore/timr-tui/pull/70) ## v1.2.0 - 2025-02-26 diff --git a/Cargo.toml b/Cargo.toml index 05d3a07..2bc895a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ version = "1.2.0" description = "TUI to organize your time: Pomodoro, Countdown, Timer." edition = "2024" # Reminder: Always keep `channel` in `rust-toolchain.toml` in sync with `rust-version`. -rust-version = "1.85.0" +rust-version = "1.86.0" homepage = "https://github.com/sectore/timr-tui" repository = "https://github.com/sectore/timr-tui" readme = "README.md" diff --git a/flake.lock b/flake.lock index 6834ce2..d117a7a 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1739936662, - "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=", + "lastModified": 1744386647, + "narHash": "sha256-DXwQEJllxpYeVOiSlBhQuGjfvkoGHTtILLYO2FvcyzQ=", "owner": "ipetkov", "repo": "crane", - "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7", + "rev": "d02c1cdd7ec539699aa44e6ff912e15535969803", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1740378829, - "narHash": "sha256-cwmm7F73aQFJY6YN1roNibNKwxT6FlfXkG3MEbpSp7Q=", + "lastModified": 1744231114, + "narHash": "sha256-60gLl2rJFt6SRwqWimsTAeHgfsIE1iV0zChdJFOvx8w=", "owner": "nix-community", "repo": "fenix", - "rev": "92823f1b0c919d7e2d806956aaf98e90f3761ab7", + "rev": "0ccfe532b1433da8e5a23cd513ff6847e0f6a8c2", "type": "github" }, "original": { @@ -56,11 +56,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740367490, - "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -81,11 +81,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1740329432, - "narHash": "sha256-eKQ7aBkNvF5AhUpyJ1cW450jxomZ4gTIaYir5qsNl7Y=", + "lastModified": 1742296961, + "narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "6d68c475c7aaf7534251182662456a4bf4216dfe", + "rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0e67c40..2983d2c 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ { file = ./rust-toolchain.toml; # sha256 = nixpkgs.lib.fakeSha256; - sha256 = "sha256-AJ6LX/Q/Er9kS15bn9iflkUwcgYqRQxiOIL2ToVAXaU="; + sha256 = "sha256-X/4ZBHO3iW0fOenQ3foEvscgAPJYl2abspaBThDOukI="; }; craneLib = (crane.mkLib pkgs).overrideToolchain toolchain; diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 19e1540..1ade5d1 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,6 +1,6 @@ [toolchain] # Reminder: Always keep `rust-version` in `Cargo.toml` in sync with `channel`. -channel = "1.85.0" +channel = "1.86.0" components = ["clippy", "rustfmt", "rust-src", "rust-analyzer"] targets = ["x86_64-pc-windows-gnu", "x86_64-unknown-linux-musl"] profile = "minimal"