From fc6228cdd62e504d4cf20665c0c7c47917e5c3e6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jun 2024 00:01:18 +0000 Subject: [PATCH] pkgs: update cosmic (#189) * cosmic-bg: 0-unstable-2024-06-21 -> 0-unstable-2024-06-26 Diff: https://github.com/pop-os/cosmic-bg/compare/3e52868f0f30857fed59b46a54fe480a7ea0d40d...f83d9f4c8e4b47bea3ef16e4894982919fef6b9a * cosmic-comp: 0-unstable-2024-06-24 -> 0-unstable-2024-06-26 Diff: https://github.com/pop-os/cosmic-comp/compare/0f6622d8ee98e5cbe41b59f1c1dbaf9e3791fabd...9cd553e1280b351151b5fd741b1bd14141ccec9d * cosmic-session: 0-unstable-2024-06-24 -> 0-unstable-2024-06-26 Diff: https://github.com/pop-os/cosmic-session/compare/a44e8ddc0a8fe9aa5ffb0468fb9cf50a3418aee6...cb33b70ca67677d556dd6187e7528869e3be0409 * xdg-desktop-portal-cosmic: 0-unstable-2024-06-25 -> 0-unstable-2024-06-26 Diff: https://github.com/pop-os/xdg-desktop-portal-cosmic/compare/a38c9c98cceaa730da4294142508290d83916780...016af6a99714623cd47b95ebe460d92f7b593490 --------- Co-authored-by: github-actions[bot] --- pkgs/cosmic-bg/package.nix | 6 +- pkgs/cosmic-comp/Cargo.lock | 533 ++++++++++++++------- pkgs/cosmic-comp/package.nix | 17 +- pkgs/cosmic-session/package.nix | 6 +- pkgs/xdg-desktop-portal-cosmic/package.nix | 6 +- 5 files changed, 388 insertions(+), 180 deletions(-) diff --git a/pkgs/cosmic-bg/package.nix b/pkgs/cosmic-bg/package.nix index ab64329d..e4fd32ca 100644 --- a/pkgs/cosmic-bg/package.nix +++ b/pkgs/cosmic-bg/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage { pname = "cosmic-bg"; - version = "0-unstable-2024-06-21"; + version = "0-unstable-2024-06-26"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-bg"; - rev = "3e52868f0f30857fed59b46a54fe480a7ea0d40d"; - hash = "sha256-Ah6JpthWE+/Mz+zKOdmEW4Z29xeI0norjXAbQwE5N24="; + rev = "f83d9f4c8e4b47bea3ef16e4894982919fef6b9a"; + hash = "sha256-e195Hp0LD0bvHRi3AQvtQ9vccgWBqYwna6g+4U8rWdI="; }; cargoLock = { diff --git a/pkgs/cosmic-comp/Cargo.lock b/pkgs/cosmic-comp/Cargo.lock index 97d08b21..d731ff47 100644 --- a/pkgs/cosmic-comp/Cargo.lock +++ b/pkgs/cosmic-comp/Cargo.lock @@ -86,9 +86,9 @@ checksum = "3aa2999eb46af81abb65c2d30d446778d7e613b60bbf4e174a027e80f90a3c14" [[package]] name = "android-activity" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", "bitflags 2.5.0", @@ -198,6 +198,15 @@ dependencies = [ "libloading 0.7.4", ] +[[package]] +name = "ash" +version = "0.38.0+1.3.281" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" +dependencies = [ + "libloading 0.8.3", +] + [[package]] name = "async-broadcast" version = "0.5.1" @@ -467,22 +476,12 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys", -] - [[package]] name = "block2" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "block-sys", "objc2", ] @@ -563,7 +562,6 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ - "async-task", "bitflags 2.5.0", "log", "polling 3.7.0", @@ -572,6 +570,20 @@ dependencies = [ "thiserror", ] +[[package]] +name = "calloop" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58a38167d6fba8c67cce63c4a91f2a73ca42cbdaf6fb9ba164f1e07b43ecc10" +dependencies = [ + "async-task", + "bitflags 2.5.0", + "log", + "polling 3.7.0", + "rustix 0.38.34", + "slab", +] + [[package]] name = "calloop-wayland-source" version = "0.2.0" @@ -667,7 +679,7 @@ dependencies = [ [[package]] name = "clipboard_macos" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" dependencies = [ "objc", "objc-foundation", @@ -677,7 +689,7 @@ dependencies = [ [[package]] name = "clipboard_wayland" version = "0.2.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" dependencies = [ "dnd", "mime 0.1.0", @@ -687,7 +699,7 @@ dependencies = [ [[package]] name = "clipboard_x11" version = "0.4.2" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" dependencies = [ "thiserror", "x11rb", @@ -856,7 +868,7 @@ dependencies = [ "anyhow", "bitflags 2.5.0", "bytemuck", - "calloop 0.13.0", + "calloop 0.14.0", "cosmic-comp-config", "cosmic-config", "cosmic-protocols", @@ -880,7 +892,6 @@ dependencies = [ "png", "profiling", "regex", - "renderdoc", "ron", "rust-embed", "rustix 0.38.34", @@ -888,6 +899,7 @@ dependencies = [ "sendfd", "serde", "serde_json", + "smallvec", "smithay", "smithay-egui", "thiserror", @@ -917,10 +929,10 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic/#61760f8e4e33744a451e8e8fe09d581793c9c677" dependencies = [ "atomicwrites", - "calloop 0.13.0", + "calloop 0.14.0", "cosmic-config-derive", "dirs", "iced_futures", @@ -936,7 +948,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic/#61760f8e4e33744a451e8e8fe09d581793c9c677" dependencies = [ "quote", "syn 1.0.109", @@ -957,20 +969,20 @@ dependencies = [ [[package]] name = "cosmic-text" -version = "0.11.2" -source = "git+https://github.com/pop-os/cosmic-text.git#b0a70c70ffba883ac6ff022b535db195712f552f" +version = "0.12.0" +source = "git+https://github.com/pop-os/cosmic-text.git#a03ec6b75f0ea8fd6264d6cd05afcec3c2213f8f" dependencies = [ "bitflags 2.5.0", "fontdb", - "libm", "log", "rangemap", + "rayon", "rustc-hash", - "rustybuzz", + "rustybuzz 0.14.1", "self_cell 1.0.4", "swash", "sys-locale", - "ttf-parser 0.20.0", + "ttf-parser 0.21.1", "unicode-bidi", "unicode-linebreak", "unicode-script", @@ -980,7 +992,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic/#61760f8e4e33744a451e8e8fe09d581793c9c677" dependencies = [ "almost", "cosmic-config", @@ -1262,12 +1274,12 @@ dependencies = [ [[package]] name = "dnd" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" dependencies = [ "bitflags 2.5.0", "mime 0.1.0", "raw-window-handle", - "smithay-client-toolkit 0.18.0", + "smithay-client-toolkit 0.19.1", "smithay-clipboard", ] @@ -1277,6 +1289,12 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "dpi" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" + [[package]] name = "drm" version = "0.11.1" @@ -1694,9 +1712,6 @@ name = "float-cmp" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] [[package]] name = "float_next_after" @@ -2376,7 +2391,7 @@ dependencies = [ [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic/#61760f8e4e33744a451e8e8fe09d581793c9c677" dependencies = [ "dnd", "iced_core", @@ -2392,7 +2407,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic/#61760f8e4e33744a451e8e8fe09d581793c9c677" dependencies = [ "bitflags 2.5.0", "dnd", @@ -2404,7 +2419,7 @@ dependencies = [ "serde", "smol_str", "thiserror", - "web-time", + "web-time 0.2.4", "window_clipboard", "xxhash-rust", ] @@ -2412,7 +2427,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic/#61760f8e4e33744a451e8e8fe09d581793c9c677" dependencies = [ "futures", "iced_core", @@ -2424,7 +2439,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic/#61760f8e4e33744a451e8e8fe09d581793c9c677" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2448,7 +2463,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic/#61760f8e4e33744a451e8e8fe09d581793c9c677" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2460,7 +2475,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic/#61760f8e4e33744a451e8e8fe09d581793c9c677" dependencies = [ "dnd", "iced_core", @@ -2472,7 +2487,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic/#61760f8e4e33744a451e8e8fe09d581793c9c677" dependencies = [ "iced_core", "once_cell", @@ -2482,7 +2497,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic/#61760f8e4e33744a451e8e8fe09d581793c9c677" dependencies = [ "bytemuck", "cosmic-text", @@ -2499,7 +2514,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic/#61760f8e4e33744a451e8e8fe09d581793c9c677" dependencies = [ "bitflags 2.5.0", "bytemuck", @@ -2514,10 +2529,10 @@ dependencies = [ "raw-window-handle", "resvg 0.37.0", "rustix 0.38.34", - "smithay-client-toolkit 0.18.0", + "smithay-client-toolkit 0.19.1", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols 0.32.1", "wayland-sys", "wgpu", ] @@ -2525,7 +2540,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic/#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic/#61760f8e4e33744a451e8e8fe09d581793c9c677" dependencies = [ "dnd", "iced_renderer", @@ -2538,17 +2553,6 @@ dependencies = [ "window_clipboard", ] -[[package]] -name = "icrate" -version = "0.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" -dependencies = [ - "block2", - "dispatch", - "objc2", -] - [[package]] name = "id_tree" version = "1.8.0" @@ -2857,7 +2861,7 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic/#9af083e0c50628366fe4587e16ff9946ea4746fa" +source = "git+https://github.com/pop-os/libcosmic/#61760f8e4e33744a451e8e8fe09d581793c9c677" dependencies = [ "apply", "chrono", @@ -2903,7 +2907,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.5", ] [[package]] @@ -3199,7 +3203,7 @@ dependencies = [ [[package]] name = "mime" version = "0.1.0" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" dependencies = [ "smithay-clipboard", ] @@ -3282,9 +3286,9 @@ dependencies = [ [[package]] name = "ndk" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ "bitflags 2.5.0", "jni-sys", @@ -3303,9 +3307,9 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-sys" -version = "0.5.0+25.2.9519653" +version = "0.6.0+11769913" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" dependencies = [ "jni-sys", ] @@ -3484,7 +3488,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.66", @@ -3528,19 +3532,200 @@ checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys", "objc2-encode", ] +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.5.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2", + "objc2", + "objc2-contacts", + "objc2-foundation", +] + [[package]] name = "objc2-encode" -version = "3.0.0" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.5.0", + "block2", + "dispatch", + "libc", + "objc2", +] + +[[package]] +name = "objc2-link-presentation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" +dependencies = [ + "block2", + "objc2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-symbols" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] [[package]] name = "objc_exception" @@ -3797,6 +3982,26 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "pin-project-lite" version = "0.2.14" @@ -3916,15 +4121,6 @@ dependencies = [ "toml_edit 0.19.15", ] -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit 0.21.1", -] - [[package]] name = "proc-macro-error" version = "1.0.4" @@ -4098,15 +4294,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -4180,21 +4367,6 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" -[[package]] -name = "renderdoc" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "272da9ec1e28b0ef17df4dcefad820b13f098ebe9c82697111fc57ccff621e12" -dependencies = [ - "bitflags 1.3.2", - "float-cmp", - "libloading 0.7.4", - "once_cell", - "renderdoc-sys", - "winapi", - "wio", -] - [[package]] name = "renderdoc-sys" version = "1.1.0" @@ -4365,11 +4537,27 @@ checksum = "f0ae5692c5beaad6a9e22830deeed7874eae8a4e3ba4076fb48e12c56856222c" dependencies = [ "bitflags 2.5.0", "bytemuck", - "libm", "smallvec", "ttf-parser 0.20.0", - "unicode-bidi-mirroring", - "unicode-ccc", + "unicode-bidi-mirroring 0.1.0", + "unicode-ccc 0.1.2", + "unicode-properties", + "unicode-script", +] + +[[package]] +name = "rustybuzz" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" +dependencies = [ + "bitflags 2.5.0", + "bytemuck", + "libm", + "smallvec", + "ttf-parser 0.21.1", + "unicode-bidi-mirroring 0.2.0", + "unicode-ccc 0.2.0", "unicode-properties", "unicode-script", ] @@ -4554,6 +4742,16 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "skrifa" +version = "0.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab45fb68b53576a43d4fc0e9ec8ea64e29a4d2cc7f44506964cb75f288222e9" +dependencies = [ + "bytemuck", + "read-fonts", +] + [[package]] name = "slab" version = "0.4.9" @@ -4581,12 +4779,12 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/smithay//smithay?rev=74e8c4f#74e8c4f6ceef2c1bd9b31db0c7809470e05165dc" +source = "git+https://github.com/smithay//smithay?rev=69b379d#69b379d00af9e1bcc98dac2d452bfd86eafdaf34" dependencies = [ "appendlist", - "ash", + "ash 0.38.0+1.3.281", "bitflags 2.5.0", - "calloop 0.13.0", + "calloop 0.14.0", "cc", "cgmath", "cursor-icon", @@ -4618,6 +4816,8 @@ dependencies = [ "thiserror", "tracing", "udev", + "wayland-client", + "wayland-cursor", "wayland-egl", "wayland-protocols 0.32.1", "wayland-protocols-misc", @@ -4630,18 +4830,17 @@ dependencies = [ [[package]] name = "smithay-client-toolkit" -version = "0.18.0" -source = "git+https://github.com/smithay/client-toolkit?rev=3bed072#3bed072b966022f5f929d12f3aff089b1ace980b" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ "bitflags 2.5.0", - "bytemuck", - "calloop 0.13.0", - "calloop-wayland-source 0.3.0", + "calloop 0.12.4", + "calloop-wayland-source 0.2.0", "cursor-icon", "libc", "log", "memmap2 0.9.4", - "pkg-config", "rustix 0.38.34", "thiserror", "wayland-backend", @@ -4651,43 +4850,45 @@ dependencies = [ "wayland-protocols 0.31.2", "wayland-protocols-wlr 0.2.0", "wayland-scanner", - "xkbcommon", "xkeysym", ] [[package]] name = "smithay-client-toolkit" -version = "0.18.1" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +checksum = "837d3067369e24aeda699a5d9fc5aa14ca14a84dd70aeed7156bfa04a5605b32" dependencies = [ "bitflags 2.5.0", - "calloop 0.12.4", - "calloop-wayland-source 0.2.0", + "bytemuck", + "calloop 0.13.0", + "calloop-wayland-source 0.3.0", "cursor-icon", "libc", "log", "memmap2 0.9.4", + "pkg-config", "rustix 0.38.34", "thiserror", "wayland-backend", "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols 0.31.2", - "wayland-protocols-wlr 0.2.0", + "wayland-protocols 0.32.1", + "wayland-protocols-wlr 0.3.1", "wayland-scanner", + "xkbcommon", "xkeysym", ] [[package]] name = "smithay-clipboard" version = "0.8.0" -source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-4#ab422ddcc95a9a1717df094f9c8fe69e2fdb2a27" +source = "git+https://github.com/pop-os/smithay-clipboard?tag=pop-dnd-5#d099e82a4c1e7d3e88dc34b7333de21928b1b22c" dependencies = [ "libc", "raw-window-handle", - "smithay-client-toolkit 0.18.0", + "smithay-client-toolkit 0.19.1", "wayland-backend", ] @@ -4840,11 +5041,11 @@ dependencies = [ [[package]] name = "swash" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "682a612b50baf09e8a039547ecf49e6c155690dcb751b1bcb19c93cdeb3d42d4" +checksum = "4d7773d67fe3373048cf840bfcc54ec3207cfc1e95c526b287ef2eb5eff9faf6" dependencies = [ - "read-fonts", + "skrifa", "yazi", "zeno", ] @@ -5124,17 +5325,6 @@ dependencies = [ "winnow 0.5.40", ] -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.22.13" @@ -5330,12 +5520,24 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" +[[package]] +name = "unicode-bidi-mirroring" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" + [[package]] name = "unicode-ccc" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" +[[package]] +name = "unicode-ccc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" + [[package]] name = "unicode-ident" version = "1.0.12" @@ -5466,7 +5668,7 @@ dependencies = [ "fontdb", "kurbo 0.9.5", "log", - "rustybuzz", + "rustybuzz 0.12.1", "unicode-bidi", "unicode-script", "unicode-vo", @@ -5687,6 +5889,7 @@ checksum = "83d0f1056570486e26a3773ec633885124d79ae03827de05ba6c85f79904026c" dependencies = [ "bitflags 2.5.0", "wayland-backend", + "wayland-client", "wayland-scanner", "wayland-server", ] @@ -5738,6 +5941,7 @@ checksum = "a7dab47671043d9f5397035975fe1cac639e5bca5cc0b3c32d09f01612e34d24" dependencies = [ "bitflags 2.5.0", "wayland-backend", + "wayland-client", "wayland-protocols 0.32.1", "wayland-scanner", "wayland-server", @@ -5800,6 +6004,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "weezl" version = "0.1.8" @@ -5862,7 +6076,7 @@ source = "git+https://github.com/gfx-rs/wgpu?rev=20fda69#20fda698341efbdc870b802 dependencies = [ "android_system_properties", "arrayvec", - "ash", + "ash 0.37.3+1.3.251", "bit-set", "bitflags 2.5.0", "block", @@ -5948,7 +6162,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" version = "0.4.1" -source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-6#8a816d8f218e290041bb5ef6d3b695c38e0a53b7" +source = "git+https://github.com/pop-os/window_clipboard.git?tag=pop-dnd-8#7c59b07b9172d8e0401f7e06609e1050575309c9" dependencies = [ "clipboard-win", "clipboard_macos", @@ -6215,36 +6429,40 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winit" -version = "0.29.15" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +checksum = "49f45a7b7e2de6af35448d7718dab6d95acec466eb3bb7a56f4d31d1af754004" dependencies = [ "ahash", "android-activity", "atomic-waker", "bitflags 2.5.0", + "block2", "bytemuck", "calloop 0.12.4", - "cfg_aliases 0.1.1", + "cfg_aliases 0.2.1", + "concurrent-queue", "core-foundation", "core-graphics", "cursor-icon", - "icrate", + "dpi", "js-sys", "libc", - "log", "memmap2 0.9.4", "ndk", - "ndk-sys", "objc2", - "once_cell", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", + "pin-project", "raw-window-handle", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "rustix 0.38.34", "smithay-client-toolkit 0.18.1", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", @@ -6253,8 +6471,8 @@ dependencies = [ "wayland-protocols 0.31.2", "wayland-protocols-plasma", "web-sys", - "web-time", - "windows-sys 0.48.0", + "web-time 1.1.0", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -6278,15 +6496,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "wio" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" -dependencies = [ - "winapi", -] - [[package]] name = "x11-dl" version = "2.21.0" @@ -6461,7 +6670,7 @@ version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", "regex", @@ -6535,7 +6744,7 @@ version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", "syn 1.0.109", diff --git a/pkgs/cosmic-comp/package.nix b/pkgs/cosmic-comp/package.nix index 02579504..a0a74d23 100644 --- a/pkgs/cosmic-comp/package.nix +++ b/pkgs/cosmic-comp/package.nix @@ -17,29 +17,28 @@ rustPlatform.buildRustPackage { pname = "cosmic-comp"; - version = "0-unstable-2024-06-24"; + version = "0-unstable-2024-06-26"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-comp"; - rev = "0f6622d8ee98e5cbe41b59f1c1dbaf9e3791fabd"; - hash = "sha256-RvUh27W+2ey7egH4GzQT3x+d8L3JOsYdlapFodPozy0="; + rev = "9cd553e1280b351151b5fd741b1bd14141ccec9d"; + hash = "sha256-M/RxVs2NUKd/377F/JbQBLV6/KRiNAop02efaJyUx/A="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; - "clipboard_macos-0.1.0" = "sha256-temNg+RdvquSLAdkwU5b6dtu9vZkXjnDASS/eJo2rz8="; - "cosmic-config-0.1.0" = "sha256-WvUIt06OXKUTNZT9h6zLnR1KBwxfmMIrsRlKYh/JDSg="; + "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; + "cosmic-config-0.1.0" = "sha256-qH0cAIUWfGfBnbhAxtRSq1AbiAckdFKrZRc6eYAmOl4="; "cosmic-protocols-0.1.0" = "sha256-YLaC59g5VI0R1IohE+T2Drah8eCzGXReOMarY+3m6Ok="; - "cosmic-text-0.11.2" = "sha256-O8l3Auo+7/aqPYvWQXpOdrVHHdjc1fjoU1nFxqdiZ5I="; + "cosmic-text-0.12.0" = "sha256-x7UMzlzYkWySFgSQTO1rRn+pyPG9tXKpJ7gzx/wpm8U="; "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-/Z21LSVbTao8lyZb73MJXoIXOygmJYKGcqG2Pummoqw="; - "smithay-client-toolkit-0.18.0" = "sha256-/7twYMt5/LpzxLXAQKTGNnWcfspUkkZsN5hJu7KaANc="; - "smithay-clipboard-0.8.0" = "sha256-MqzynFCZvzVg9/Ry/zrbH5R6//erlZV+nmQ2St63Wnc="; + "smithay-0.3.0" = "sha256-NbNNByrkFnzOW4NI1We/XvBg+QatjC/usEeNJr+MfVw="; + "smithay-clipboard-0.8.0" = "sha256-pBQZ+UXo9hZ907mfpcZk+a+8pKrIWdczVvPkjT3TS8U="; "smithay-egui-0.1.0" = "sha256-FcSoKCwYk3okwQURiQlDUcfk9m/Ne6pSblGAzHDaVHg="; "softbuffer-0.4.1" = "sha256-a0bUFz6O8CWRweNt/OxTvflnPYwO5nm6vsyc/WcXyNg="; "taffy-0.3.11" = "sha256-SCx9GEIJjWdoNVyq+RZAGn0N71qraKZxf9ZWhvyzLaI="; diff --git a/pkgs/cosmic-session/package.nix b/pkgs/cosmic-session/package.nix index f78ec28c..81bbbed4 100644 --- a/pkgs/cosmic-session/package.nix +++ b/pkgs/cosmic-session/package.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage { pname = "cosmic-session"; - version = "0-unstable-2024-06-24"; + version = "0-unstable-2024-06-26"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-session"; - rev = "a44e8ddc0a8fe9aa5ffb0468fb9cf50a3418aee6"; - sha256 = "sha256-gOZSoVnf07qQlGhuw/ipis6LWWS5/e17ySDP8goEfCs="; + rev = "cb33b70ca67677d556dd6187e7528869e3be0409"; + sha256 = "sha256-47cUiMaDuWVurZcPj4ScL7PV8KKxWS6jm1DQetHpaCU="; }; cargoLock = { diff --git a/pkgs/xdg-desktop-portal-cosmic/package.nix b/pkgs/xdg-desktop-portal-cosmic/package.nix index b7564a89..d099a1bf 100644 --- a/pkgs/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/xdg-desktop-portal-cosmic/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage { pname = "xdg-desktop-portal-cosmic"; - version = "0-unstable-2024-06-25"; + version = "0-unstable-2024-06-26"; src = fetchFromGitHub { owner = "pop-os"; repo = "xdg-desktop-portal-cosmic"; - rev = "a38c9c98cceaa730da4294142508290d83916780"; - hash = "sha256-j8dvQKnNVX6XG/36ynjdmQwSBuczsjqFjlti+9C3Dso="; + rev = "016af6a99714623cd47b95ebe460d92f7b593490"; + hash = "sha256-09yaPeTFNtM6MAwYW9oYBMftmZWgfh3gURAlgpwiPD4="; }; cargoLock = {