From 6e22fe82fcc9853f4591dbab38e0c5666a990f15 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 04:19:33 +0000 Subject: [PATCH] pkgs: update cosmic (#51) * cosmic-applets: 0-unstable-2024-03-28 -> 0-unstable-2024-04-02 Diff: https://github.com/pop-os/cosmic-applets/compare/71cb9e64ec2dff53229688aea32d22f65653b5be...ed335b256a8461d7a26dff56b5e2713d73ee8e52 * cosmic-comp: 0-unstable-2024-03-28 -> 0-unstable-2024-04-02 Diff: https://github.com/pop-os/cosmic-comp/compare/3da08ed22dd4ae7607b5c9fc0bed7bf80d7b48d7...fa7926f7c1a1f7cbffb04d52ac021c9a216d61e7 * cosmic-launcher: 0-unstable-2024-04-01 -> 0-unstable-2024-04-02 Diff: https://github.com/pop-os/cosmic-launcher/compare/a8c094a06cb9d6ffa8b3e86d2f1e136486cc51ac...f6b9df7ad95a554d51c4ca5cbd573a79813fa4b8 * cosmic-osd: 0-unstable-2024-03-28 -> 0-unstable-2024-04-02 Diff: https://github.com/pop-os/cosmic-osd/compare/929a7410be50e18411254e585f3b28b8799654f6...789698e6d074d96fc502a5ee8bffba679dbca8a8 * cosmic-settings: 0-unstable-2024-04-01 -> 0-unstable-2024-04-02 Diff: https://github.com/pop-os/cosmic-settings/compare/3fa30c0efe15c6bcabd9a5295f1d738ce413b728...dd16b92161bfa4dd41d4c94a0b5700c189fd29ea --------- Co-authored-by: github-actions[bot] --- pkgs/cosmic-applets/Cargo.lock | 4 ++++ pkgs/cosmic-applets/package.nix | 6 +++--- pkgs/cosmic-comp/Cargo.lock | 2 +- pkgs/cosmic-comp/package.nix | 8 ++++---- pkgs/cosmic-launcher/Cargo.lock | 11 +++++++++++ pkgs/cosmic-launcher/package.nix | 6 +++--- pkgs/cosmic-osd/package.nix | 6 +++--- pkgs/cosmic-settings/Cargo.lock | 23 +++++++++++++++++++++++ pkgs/cosmic-settings/package.nix | 6 +++--- 9 files changed, 55 insertions(+), 17 deletions(-) diff --git a/pkgs/cosmic-applets/Cargo.lock b/pkgs/cosmic-applets/Cargo.lock index e358e3ca..fb3c5aee 100644 --- a/pkgs/cosmic-applets/Cargo.lock +++ b/pkgs/cosmic-applets/Cargo.lock @@ -873,16 +873,20 @@ dependencies = [ name = "cosmic-app-list" version = "0.1.0" dependencies = [ + "anyhow", "cosmic-client-toolkit", "cosmic-protocols", "futures", "i18n-embed", "i18n-embed-fl", + "image 0.25.0", "itertools", "libcosmic", + "memmap2 0.9.4", "once_cell", "rand", "rust-embed", + "rustix 0.38.32", "serde", "switcheroo-control", "tokio", diff --git a/pkgs/cosmic-applets/package.nix b/pkgs/cosmic-applets/package.nix index 9c467a72..76c75504 100644 --- a/pkgs/cosmic-applets/package.nix +++ b/pkgs/cosmic-applets/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage { pname = "cosmic-applets"; - version = "0-unstable-2024-03-28"; + version = "0-unstable-2024-04-02"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applets"; - rev = "71cb9e64ec2dff53229688aea32d22f65653b5be"; - hash = "sha256-TWyI9pb7jh+OTwYa/2BK+udJFV2nkApmfW38KzEE4gY="; + rev = "ed335b256a8461d7a26dff56b5e2713d73ee8e52"; + hash = "sha256-z7onVJ3rVnFdMn6aSzctBEMciviexnTQAKJbx8heboc="; }; cargoLock = { diff --git a/pkgs/cosmic-comp/Cargo.lock b/pkgs/cosmic-comp/Cargo.lock index 162d9e69..24d1eff2 100644 --- a/pkgs/cosmic-comp/Cargo.lock +++ b/pkgs/cosmic-comp/Cargo.lock @@ -4505,7 +4505,7 @@ checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/smithay//smithay?rev=e5f0068#e5f006818df7ebb92d206985f45e713ba1e9c1c9" +source = "git+https://github.com/smithay//smithay?rev=f133e418#f133e418a25b1dfa4520000e08d3c6f548f4f58a" dependencies = [ "appendlist", "ash", diff --git a/pkgs/cosmic-comp/package.nix b/pkgs/cosmic-comp/package.nix index e47b8b67..32cdbca5 100644 --- a/pkgs/cosmic-comp/package.nix +++ b/pkgs/cosmic-comp/package.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage { pname = "cosmic-comp"; - version = "0-unstable-2024-03-28"; + version = "0-unstable-2024-04-02"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-comp"; - rev = "3da08ed22dd4ae7607b5c9fc0bed7bf80d7b48d7"; - hash = "sha256-TBImp3IpZHI+RqCgj/ey/uoLWIG56XBPIk5+LYKdAvc="; + rev = "fa7926f7c1a1f7cbffb04d52ac021c9a216d61e7"; + hash = "sha256-Af2bDpCy9BjSjmh1AHts4RSjx3sdZ8khF9dxoQe+Uvg="; }; cargoLock = { @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage { "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; "glyphon-0.5.0" = "sha256-j1HrbEpUBqazWqNfJhpyjWuxYAxkvbXzRKeSouUoPWg="; "id_tree-1.8.0" = "sha256-uKdKHRfPGt3vagOjhnri3aYY5ar7O3rp2/ivTfM2jT0="; - "smithay-0.3.0" = "sha256-bWan2DCyMvEC8ZQPwM+XpuOGkOZ/RdDV+LmRCN8UAuc="; + "smithay-0.3.0" = "sha256-/Tktg2Z3bKRBu33tyQKchHHtQsz1xGZwwE7B+hVubkI="; "smithay-clipboard-0.8.0" = "sha256-OZOGbdzkgRIeDFrAENXE7g62eQTs60Je6lYVr0WudlE="; "smithay-egui-0.1.0" = "sha256-FcSoKCwYk3okwQURiQlDUcfk9m/Ne6pSblGAzHDaVHg="; "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; diff --git a/pkgs/cosmic-launcher/Cargo.lock b/pkgs/cosmic-launcher/Cargo.lock index c1864094..f736882e 100644 --- a/pkgs/cosmic-launcher/Cargo.lock +++ b/pkgs/cosmic-launcher/Cargo.lock @@ -1142,6 +1142,8 @@ dependencies = [ "switcheroo-control", "tokio", "tracing", + "unicode-truncate", + "unicode-width", "xdg", "zbus", ] @@ -5490,6 +5492,15 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +[[package]] +name = "unicode-truncate" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a04be5ca5f7a4a7270ffea82bc41c59b87c611ed04f20e77c338e8d3c2348e42" +dependencies = [ + "unicode-width", +] + [[package]] name = "unicode-vo" version = "0.1.0" diff --git a/pkgs/cosmic-launcher/package.nix b/pkgs/cosmic-launcher/package.nix index aca04429..f7b8ef42 100644 --- a/pkgs/cosmic-launcher/package.nix +++ b/pkgs/cosmic-launcher/package.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage { pname = "cosmic-launcher"; - version = "0-unstable-2024-04-01"; + version = "0-unstable-2024-04-02"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-launcher"; - rev = "a8c094a06cb9d6ffa8b3e86d2f1e136486cc51ac"; - sha256 = "sha256-E+bK9Aw/nyakIUYk54fYi7X8nzi9CK/359m//BZz2Qs="; + rev = "f6b9df7ad95a554d51c4ca5cbd573a79813fa4b8"; + sha256 = "sha256-eIbYICsqp2RLJs0cHyWADIZWXFOR0iH4IeE7y7j9Yk4="; }; cargoLock = { diff --git a/pkgs/cosmic-osd/package.nix b/pkgs/cosmic-osd/package.nix index c174760f..18a3f7ee 100644 --- a/pkgs/cosmic-osd/package.nix +++ b/pkgs/cosmic-osd/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage { pname = "cosmic-osd"; - version = "0-unstable-2024-03-28"; + version = "0-unstable-2024-04-02"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-osd"; - rev = "929a7410be50e18411254e585f3b28b8799654f6"; - hash = "sha256-3Dx/kd+ezBtDlByoifefGLFURMb41Emd/UQpqcb3ffU="; + rev = "789698e6d074d96fc502a5ee8bffba679dbca8a8"; + hash = "sha256-L8REXEU28SXrKdMi0UHNW3dFGs/pKzOyvF5x4jw3sVo="; }; cargoLock = { diff --git a/pkgs/cosmic-settings/Cargo.lock b/pkgs/cosmic-settings/Cargo.lock index 35571561..dd538f02 100644 --- a/pkgs/cosmic-settings/Cargo.lock +++ b/pkgs/cosmic-settings/Cargo.lock @@ -1330,6 +1330,7 @@ dependencies = [ "tracing", "tracing-subscriber", "url", + "xkb-data", ] [[package]] @@ -4894,6 +4895,18 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-xml-rs" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782" +dependencies = [ + "log", + "serde", + "thiserror", + "xml-rs", +] + [[package]] name = "serde_derive" version = "1.0.197" @@ -6585,6 +6598,16 @@ dependencies = [ "wayland-protocols-wlr", ] +[[package]] +name = "xkb-data" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "294a599fc9e6a43c9f44f5d6c560b89fd751be413717442b31c17fa367d3c764" +dependencies = [ + "serde", + "serde-xml-rs", +] + [[package]] name = "xkbcommon" version = "0.7.0" diff --git a/pkgs/cosmic-settings/package.nix b/pkgs/cosmic-settings/package.nix index 1578604c..c6ad090d 100644 --- a/pkgs/cosmic-settings/package.nix +++ b/pkgs/cosmic-settings/package.nix @@ -21,13 +21,13 @@ in rustPlatform.buildRustPackage { pname = "cosmic-settings"; - version = "0-unstable-2024-04-01"; + version = "0-unstable-2024-04-02"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings"; - rev = "3fa30c0efe15c6bcabd9a5295f1d738ce413b728"; - hash = "sha256-/l/zJ/gUPsMKALHw7J4IfccFrpWeIXD7ILsMiO2zv7o="; + rev = "dd16b92161bfa4dd41d4c94a0b5700c189fd29ea"; + hash = "sha256-JUrS9FbWrs0rgUncdbzqm6DKSXLeIGCt2ejqxEbItUU="; }; cargoLock = {