diff --git a/pkgs/cosmic-comp/package.nix b/pkgs/cosmic-comp/package.nix index b20cc3a7..0f76549c 100644 --- a/pkgs/cosmic-comp/package.nix +++ b/pkgs/cosmic-comp/package.nix @@ -24,8 +24,8 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-comp"; - rev = "ea2215ec3f5ae6c00fe723746f43179e06143d38"; - hash = "sha256-6da8RJrAjAfy6IdVYHNTEyCtZ2PIj4LpZj7EtlEx+7U="; + rev = "a4d875e35ef09eb9d82270a00e43d622f194b6dc"; + hash = "sha256-xD5cqFj3YvgfKJKvc4yq8INJl6RwuwklslCHYlO/ZdM="; }; cargoLock = { diff --git a/pkgs/cosmic-edit/Cargo.lock b/pkgs/cosmic-edit/Cargo.lock index 1dc38149..7fa37adf 100644 --- a/pkgs/cosmic-edit/Cargo.lock +++ b/pkgs/cosmic-edit/Cargo.lock @@ -1269,7 +1269,7 @@ dependencies = [ [[package]] name = "cosmic-files" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-files.git#c3d09c3885ce7b506c0bbb7753384e2d819ca650" +source = "git+https://github.com/pop-os/cosmic-files.git#2b4a14dfe2403f1adfeb0423870216ee9a48cd06" dependencies = [ "chrono", "dirs", diff --git a/pkgs/cosmic-edit/package.nix b/pkgs/cosmic-edit/package.nix index f6ebc62a..8ef35d04 100644 --- a/pkgs/cosmic-edit/package.nix +++ b/pkgs/cosmic-edit/package.nix @@ -21,8 +21,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-edit"; - rev = "9be376c8afe9bcf7a7e93b58f8643be3dcc92773"; - hash = "sha256-6XiCMlHFlrX/tIRmBqnDPVdx+yc07CaV+VqlS1gf00s="; + rev = "5be715bdd05db7ddecfcddb78257d249602aecae"; + hash = "sha256-0YEtW4rl5cdWhN47AfhhyhcxvUyK+g0hFCwm7CsA5cg="; }; cargoLock = { @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; "cosmic-config-0.1.0" = "sha256-XXT92zsdwkzx9dajSYlK6p/XPp6ajq9xJT504T1L4qU="; - "cosmic-files-0.1.0" = "sha256-vnMGNRLygGPaSM1n+h5Mbij0m1LDW8N/N7zR4ooOwIY="; + "cosmic-files-0.1.0" = "sha256-eP6uLHxXpx+nNkEcROlqi0t3qRtU8vYITyt4JXtd7vw="; "cosmic-syntax-theme-0.1.0" = "sha256-BNb9wrryD5FJImboD3TTdPRIfiBqPpItqwGdT1ZiNng="; "cosmic-text-0.12.1" = "sha256-u2Tw+XhpIKeFg8Wgru/sjGw6GUZ2m50ZDmRBJ1IM66w="; "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; diff --git a/pkgs/cosmic-files/package.nix b/pkgs/cosmic-files/package.nix index dde17ef1..dcf3b976 100644 --- a/pkgs/cosmic-files/package.nix +++ b/pkgs/cosmic-files/package.nix @@ -16,8 +16,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-files"; - rev = "705c780721d4830de3a8034ac461cfff3601d851"; - hash = "sha256-coOvo8f6r7uoVo8fpnc7dqdyRUx+g8lEOujjA1Z9IUw="; + rev = "2b4a14dfe2403f1adfeb0423870216ee9a48cd06"; + hash = "sha256-eP6uLHxXpx+nNkEcROlqi0t3qRtU8vYITyt4JXtd7vw="; }; cargoLock = { diff --git a/pkgs/cosmic-settings/Cargo.lock b/pkgs/cosmic-settings/Cargo.lock index a69f2795..d7cba3cf 100644 --- a/pkgs/cosmic-settings/Cargo.lock +++ b/pkgs/cosmic-settings/Cargo.lock @@ -1699,11 +1699,14 @@ dependencies = [ "cosmic-config", "cosmic-randr-shell", "dirs", + "eyre", + "fast_image_resize", "freedesktop-icons", "futures-lite 2.3.0", "futures-util", "image 0.25.2", "infer", + "jxl-oxide", "tokio", "tracing", ] @@ -2096,6 +2099,15 @@ dependencies = [ "smithay-clipboard", ] +[[package]] +name = "document-features" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +dependencies = [ + "litrs", +] + [[package]] name = "downcast-rs" version = "1.2.1" @@ -2296,6 +2308,20 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" +[[package]] +name = "fast_image_resize" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a66a61fbfc84ef99a839499cf9e5a7c2951d2da874ea00f29ee938bc50d1b396" +dependencies = [ + "bytemuck", + "cfg-if", + "document-features", + "image 0.25.2", + "num-traits", + "thiserror", +] + [[package]] name = "fastrand" version = "1.9.0" @@ -4018,6 +4044,147 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "jxl-bitstream" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5855ff16398ffbcf81fee52c41ca65326499c8764b21bb9952c367ace98995fb" +dependencies = [ + "tracing", +] + +[[package]] +name = "jxl-coding" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da5b5093904e940bc11ef50e872c7bdf7b6e88653f012b925f8479daf212b5c9" +dependencies = [ + "jxl-bitstream", + "tracing", +] + +[[package]] +name = "jxl-color" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97f0dd548fabf9c094f9f2304059c86764f606b9040c0bfcfac55f155f423b55" +dependencies = [ + "jxl-bitstream", + "jxl-coding", + "jxl-grid", + "jxl-threadpool", + "tracing", +] + +[[package]] +name = "jxl-frame" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4719f285ebfff5e64f352d0ef149a5244aef4f8e6b5aa666ba6241e90b50632f" +dependencies = [ + "jxl-bitstream", + "jxl-coding", + "jxl-grid", + "jxl-image", + "jxl-modular", + "jxl-threadpool", + "jxl-vardct", + "tracing", +] + +[[package]] +name = "jxl-grid" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e941628e8de1dc6ba1d2bba8ebc68a69f8ff50cc7ddce5bc821658d1f4ea6e59" +dependencies = [ + "tracing", +] + +[[package]] +name = "jxl-image" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3824c81613c05c19a9e4329d569145d3f460c0fcadb3965bd8418162d43f7f4" +dependencies = [ + "jxl-bitstream", + "jxl-color", + "jxl-grid", + "tracing", +] + +[[package]] +name = "jxl-modular" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f48a5d003627f380004c29d35e51672da06ae343a2e6fe8d9c84295b9a3e843" +dependencies = [ + "jxl-bitstream", + "jxl-coding", + "jxl-grid", + "jxl-threadpool", + "tracing", +] + +[[package]] +name = "jxl-oxide" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c209f66ef0fe72df77b44ee6aae98eb87bc2dd236d6981e44e143cc37f33f6e" +dependencies = [ + "jxl-bitstream", + "jxl-color", + "jxl-frame", + "jxl-grid", + "jxl-image", + "jxl-render", + "jxl-threadpool", + "tracing", +] + +[[package]] +name = "jxl-render" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aec53c004c9171e89f15ad1f029d6b638cbd70d3a70276746bb8c75f9393bb64" +dependencies = [ + "jxl-bitstream", + "jxl-coding", + "jxl-color", + "jxl-frame", + "jxl-grid", + "jxl-image", + "jxl-modular", + "jxl-threadpool", + "jxl-vardct", + "tracing", +] + +[[package]] +name = "jxl-threadpool" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d2860c68899a3c6266044fc26c6a0041e9f27145f58cc69b6eedc1b77f5ee13" +dependencies = [ + "rayon", + "rayon-core", + "tracing", +] + +[[package]] +name = "jxl-vardct" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15da4b49b832b3d8a67329f47e2a1732e0847667938bb9b4a37d99a4668775c2" +dependencies = [ + "jxl-bitstream", + "jxl-coding", + "jxl-grid", + "jxl-modular", + "jxl-threadpool", + "tracing", +] + [[package]] name = "kamadak-exif" version = "0.5.5" @@ -4307,6 +4474,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +[[package]] +name = "litrs" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5" + [[package]] name = "locale_config" version = "0.3.0" diff --git a/pkgs/cosmic-settings/package.nix b/pkgs/cosmic-settings/package.nix index 9d216ac7..569ea296 100644 --- a/pkgs/cosmic-settings/package.nix +++ b/pkgs/cosmic-settings/package.nix @@ -33,8 +33,8 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings"; - rev = "6a753f5c12f0a83bae7565146e08ce9e28686f90"; - hash = "sha256-r1lzCl3B/mrkV56oroaiKd15D7ubYHr4+P31BGmzlZw="; + rev = "1b5e9aa31783d38826a624da8b74cde624790e89"; + hash = "sha256-+ku1ReAnk+Wu4yoDd4uZ1LhVgtIU5qdftlXST5Wh24o="; }; cargoLock = { diff --git a/pkgs/cosmic-term/Cargo.lock b/pkgs/cosmic-term/Cargo.lock index 1cbfc15a..f1e22091 100644 --- a/pkgs/cosmic-term/Cargo.lock +++ b/pkgs/cosmic-term/Cargo.lock @@ -1245,7 +1245,7 @@ dependencies = [ [[package]] name = "cosmic-files" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-files.git#c3d09c3885ce7b506c0bbb7753384e2d819ca650" +source = "git+https://github.com/pop-os/cosmic-files.git#2b4a14dfe2403f1adfeb0423870216ee9a48cd06" dependencies = [ "chrono", "dirs", diff --git a/pkgs/cosmic-term/package.nix b/pkgs/cosmic-term/package.nix index 1b834ed6..6329a442 100644 --- a/pkgs/cosmic-term/package.nix +++ b/pkgs/cosmic-term/package.nix @@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-term"; - rev = "2462e8d61a901324a429a7ac376b143e5663f91d"; - hash = "sha256-HvRdIdInKfHj7RvuY8J0ieDzeDyuFpokagsC1DidsR0="; + rev = "3303f51bfe59c9f1b02807b17a7c285b68ec8a01"; + hash = "sha256-82wKOJ+pDelIIb/0SZbw1th4j5JK0awG2y+SxMNJOqI="; }; cargoLock = { @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { "atomicwrites-0.4.2" = "sha256-QZSuGPrJXh+svMeFWqAXoqZQxLq/WfIiamqvjJNVhxA="; "clipboard_macos-0.1.0" = "sha256-cG5vnkiyDlQnbEfV2sPbmBYKv1hd3pjJrymfZb8ziKk="; "cosmic-config-0.1.0" = "sha256-XXT92zsdwkzx9dajSYlK6p/XPp6ajq9xJT504T1L4qU="; - "cosmic-files-0.1.0" = "sha256-vnMGNRLygGPaSM1n+h5Mbij0m1LDW8N/N7zR4ooOwIY="; + "cosmic-files-0.1.0" = "sha256-eP6uLHxXpx+nNkEcROlqi0t3qRtU8vYITyt4JXtd7vw="; "cosmic-text-0.12.1" = "sha256-u2Tw+XhpIKeFg8Wgru/sjGw6GUZ2m50ZDmRBJ1IM66w="; "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4="; "filetime-0.2.24" = "sha256-lU7dPotdnmyleS2B75SmDab7qJfEzmJnHPF18CN/Y98="; diff --git a/pkgs/xdg-desktop-portal-cosmic/Cargo.lock b/pkgs/xdg-desktop-portal-cosmic/Cargo.lock index 7a0ccba1..4cfe8b70 100644 --- a/pkgs/xdg-desktop-portal-cosmic/Cargo.lock +++ b/pkgs/xdg-desktop-portal-cosmic/Cargo.lock @@ -1443,7 +1443,7 @@ dependencies = [ [[package]] name = "cosmic-files" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-files#c3d09c3885ce7b506c0bbb7753384e2d819ca650" +source = "git+https://github.com/pop-os/cosmic-files#2b4a14dfe2403f1adfeb0423870216ee9a48cd06" dependencies = [ "chrono", "dirs 5.0.1", @@ -2624,9 +2624,9 @@ dependencies = [ [[package]] name = "gettext-rs" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a6716b8a0db461a2720b850ba1623e5b69e4b1aa0224cf5e1fb23a0fe49e65c" +checksum = "a44e92f7dc08430aca7ed55de161253a22276dfd69c5526e5c5e95d1f7cf338a" dependencies = [ "gettext-sys", "locale_config", @@ -2634,9 +2634,9 @@ dependencies = [ [[package]] name = "gettext-sys" -version = "0.21.4" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b8797f28f2dabfbe2caadb6db4f7fd739e251b5ede0a2ba49e506071edcf67" +checksum = "bb45773f5b8945f12aecd04558f545964f943dacda1b1155b3d738f5469ef661" dependencies = [ "cc", "temp-dir", diff --git a/pkgs/xdg-desktop-portal-cosmic/package.nix b/pkgs/xdg-desktop-portal-cosmic/package.nix index 635fcc2e..5533732b 100644 --- a/pkgs/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/xdg-desktop-portal-cosmic/package.nix @@ -17,8 +17,8 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "pop-os"; repo = "xdg-desktop-portal-cosmic"; - rev = "e815ae59bd7914d63bc3af4e5f1ffe4b299d607b"; - hash = "sha256-9c+cxepCIwmcm9FfwZY+4YVA//z3dxtJc/YkQCiTRik="; + rev = "7c8313898bffce9e44e0549782316c57597216d1"; + hash = "sha256-IlMcgzhli61QWjdovj5BpOxOebV3RytBeHPhxzWNXqg="; }; cargoLock = { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { "cosmic-bg-config-0.1.0" = "sha256-bmcMZIURozlptsR4si62NTmexqaCX1Yj5bYj49GDehQ="; "cosmic-client-toolkit-0.1.0" = "sha256-1XtyEvednEMN4MApxTQid4eed19dEN5ZBDt/XRjuda0="; "cosmic-config-0.1.0" = "sha256-XXT92zsdwkzx9dajSYlK6p/XPp6ajq9xJT504T1L4qU="; - "cosmic-files-0.1.0" = "sha256-vnMGNRLygGPaSM1n+h5Mbij0m1LDW8N/N7zR4ooOwIY="; + "cosmic-files-0.1.0" = "sha256-eP6uLHxXpx+nNkEcROlqi0t3qRtU8vYITyt4JXtd7vw="; "cosmic-settings-daemon-0.1.0" = "sha256-mklNPKVMO6iFrxki2DwiL5K78KiWpGxksisYldaASIE="; "cosmic-text-0.12.1" = "sha256-u2Tw+XhpIKeFg8Wgru/sjGw6GUZ2m50ZDmRBJ1IM66w="; "d3d12-0.19.0" = "sha256-usrxQXWLGJDjmIdw1LBXtBvX+CchZDvE8fHC0LjvhD4=";