From 8b14399f5e10211f569b3b8321988c1fb7c7ba2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Sat, 10 Aug 2024 02:14:17 -0400 Subject: [PATCH] eww: 0.6.0-unstable-2024-04-26 -> 0.6.0-unstable-2024-07-05 --- pkgs/by-name/ew/eww/lockfile.patch | 37 ++++++++++++++++++++++++++++++ pkgs/by-name/ew/eww/package.nix | 10 ++++---- 2 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/ew/eww/lockfile.patch diff --git a/pkgs/by-name/ew/eww/lockfile.patch b/pkgs/by-name/ew/eww/lockfile.patch new file mode 100644 index 000000000000..1edc62c66a45 --- /dev/null +++ b/pkgs/by-name/ew/eww/lockfile.patch @@ -0,0 +1,37 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 5d94bd4..acd2c8d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1676,7 +1676,7 @@ dependencies = [ + "libm", + "log", + "regex", +- "time 0.3.34", ++ "time 0.3.36", + "urlencoding", + ] + +@@ -2893,9 +2893,9 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.34" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", +@@ -2914,9 +2914,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.17" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ + "num-conv", + "time-core", diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index 621203979928..f3cc565cab42 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { pname = "eww"; - version = "0.6.0-unstable-2024-04-26"; + version = "0.6.0-unstable-2024-07-05"; src = fetchFromGitHub { owner = "elkowar"; @@ -22,11 +22,13 @@ rustPlatform.buildRustPackage rec { # FIXME: change to a release tag once a new release is available # https://github.com/elkowar/eww/pull/1084 # using the revision to fix string truncation issue in eww config - rev = "2c8811512460ce6cc75e021d8d081813647699dc"; - hash = "sha256-eDOg5Ink3iWT/B1WpD9po5/UxS4DEaVO4NPIRyjSheM="; + rev = "4d55e9ad63d1fae887726dffcd25a32def23d34f"; + hash = "sha256-LTSFlW/46hl1u9SzqnvbtNxswCW05bhwOY6CzVEJC5o="; }; - cargoHash = "sha256-ClnIW7HxbQcC85OyoMhBLFjVtdEUCOARuimfS4uRi+E="; + # needed to fix build errors with rust 1.80 due to outdated time crate + cargoPatches = [ ./lockfile.patch ]; + cargoHash = "sha256-55lmQl5pJwrEj5RlSG8b0PqtZVrASxTmX4Qdk090DZo="; nativeBuildInputs = [ pkg-config