diff --git a/Cargo.lock b/Cargo.lock index 194d36d..a82a01b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -246,7 +246,7 @@ checksum = "5cc8d9aa793480744cd9a0524fef1a2e197d9eaa0f739cde19d16aba530dcb95" dependencies = [ "bitflags", "cairo-sys-rs", - "glib 0.22.7", + "glib", "libc", ] @@ -256,7 +256,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8b4985713047f5faee02b8db6a6ef32bbb50269ff53c1aee716d1d195b76d54" dependencies = [ - "glib-sys 0.22.6", + "glib-sys", "libc", "system-deps", ] @@ -570,7 +570,7 @@ checksum = "25f420376dbee041b2db374ce4573892a36222bb3f6c0c43e24f0d67eae9b646" dependencies = [ "gdk-pixbuf-sys", "gio", - "glib 0.22.7", + "glib", "libc", ] @@ -580,9 +580,9 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48f31b37b1fc4b48b54f6b91b7ef04c18e00b4585d98359dd7b998774bbd91fb" dependencies = [ - "gio-sys 0.22.0", - "glib-sys 0.22.6", - "gobject-sys 0.22.6", + "gio-sys", + "glib-sys", + "gobject-sys", "libc", "system-deps", ] @@ -597,7 +597,7 @@ dependencies = [ "gdk-pixbuf", "gdk4-sys", "gio", - "glib 0.22.7", + "glib", "libc", "pango", ] @@ -610,9 +610,9 @@ checksum = "9d974ac4f15e67472c3a9728daf612590b4a5762a4b33f0edd298df0b80d043c" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", - "gio-sys 0.22.0", - "glib-sys 0.22.6", - "gobject-sys 0.22.6", + "gio-sys", + "glib-sys", + "gobject-sys", "libc", "pango-sys", "pkg-config", @@ -653,60 +653,26 @@ dependencies = [ "futures-core", "futures-io", "futures-util", - "gio-sys 0.22.0", - "glib 0.22.7", + "gio-sys", + "glib", "libc", "pin-project-lite", "smallvec", ] -[[package]] -name = "gio-sys" -version = "0.21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0071fe88dba8e40086c8ff9bbb62622999f49628344b1d1bf490a48a29d80f22" -dependencies = [ - "glib-sys 0.21.5", - "gobject-sys 0.21.5", - "libc", - "system-deps", - "windows-sys", -] - [[package]] name = "gio-sys" version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64729ba2772c080448f9f966dba8f4456beeb100d8c28a865ef8a0f2ef4987e1" dependencies = [ - "glib-sys 0.22.6", - "gobject-sys 0.22.6", + "glib-sys", + "gobject-sys", "libc", "system-deps", "windows-sys", ] -[[package]] -name = "glib" -version = "0.21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16de123c2e6c90ce3b573b7330de19be649080ec612033d397d72da265f1bd8b" -dependencies = [ - "bitflags", - "futures-channel", - "futures-core", - "futures-executor", - "futures-task", - "futures-util", - "gio-sys 0.21.5", - "glib-macros 0.21.5", - "glib-sys 0.21.5", - "gobject-sys 0.21.5", - "libc", - "memchr", - "smallvec", -] - [[package]] name = "glib" version = "0.22.7" @@ -719,28 +685,15 @@ dependencies = [ "futures-executor", "futures-task", "futures-util", - "gio-sys 0.22.0", - "glib-macros 0.22.6", - "glib-sys 0.22.6", - "gobject-sys 0.22.6", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", "libc", "memchr", "smallvec", ] -[[package]] -name = "glib-macros" -version = "0.21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf59b675301228a696fe01c3073974643365080a76cc3ed5bc2cbc466ad87f17" -dependencies = [ - "heck", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "glib-macros" version = "0.22.6" @@ -753,16 +706,6 @@ dependencies = [ "syn", ] -[[package]] -name = "glib-sys" -version = "0.21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d95e1a3a19ae464a7286e14af9a90683c64d70c02532d88d87ce95056af3e6c" -dependencies = [ - "libc", - "system-deps", -] - [[package]] name = "glib-sys" version = "0.22.6" @@ -773,24 +716,13 @@ dependencies = [ "system-deps", ] -[[package]] -name = "gobject-sys" -version = "0.21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dca35da0d19a18f4575f3cb99fe1c9e029a2941af5662f326f738a21edaf294" -dependencies = [ - "glib-sys 0.21.5", - "libc", - "system-deps", -] - [[package]] name = "gobject-sys" version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22a861859b887a79cf461359c192c97a57d8fb0229dd291232e57aa11f6fa72c" dependencies = [ - "glib-sys 0.22.6", + "glib-sys", "libc", "system-deps", ] @@ -801,7 +733,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7d1b7881f96869f49808b6adfe906a93a57a34204952253444d68c3208d71f1" dependencies = [ - "glib 0.22.7", + "glib", "graphene-sys", "libc", ] @@ -812,7 +744,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "517f062f3fd6b7fd3e57a3f038a74b3c23ca32f51199ff028aa704609943f79c" dependencies = [ - "glib-sys 0.22.6", + "glib-sys", "libc", "pkg-config", "system-deps", @@ -826,7 +758,7 @@ checksum = "53c912dfcbd28acace5fc99c40bb9f25e1dcb73efb1f2608327f66a99acdcb62" dependencies = [ "cairo-rs", "gdk4", - "glib 0.22.7", + "glib", "graphene-rs", "gsk4-sys", "libc", @@ -841,8 +773,8 @@ checksum = "d7d54bbc7a9d8b6ffe4f0c95eede15ccfb365c8bf521275abe6bcfb57b18fb8a" dependencies = [ "cairo-sys-rs", "gdk4-sys", - "glib-sys 0.22.6", - "gobject-sys 0.22.6", + "glib-sys", + "gobject-sys", "graphene-sys", "libc", "pango-sys", @@ -861,7 +793,7 @@ dependencies = [ "gdk-pixbuf", "gdk4", "gio", - "glib 0.22.7", + "glib", "graphene-rs", "gsk4", "gtk4-macros", @@ -891,9 +823,9 @@ dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gdk4-sys", - "gio-sys 0.22.0", - "glib-sys 0.22.6", - "gobject-sys 0.22.6", + "gio-sys", + "glib-sys", + "gobject-sys", "graphene-sys", "gsk4-sys", "libc", @@ -1063,7 +995,7 @@ dependencies = [ "clap", "dirs", "fs2", - "glib 0.21.5", + "glib", "gtk4", "log", "nmrs", @@ -1106,7 +1038,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "251bdc6e6487b811be0e406a21e301e07e45c0aa8fa39e00c0c8e12a91752438" dependencies = [ "gio", - "glib 0.22.7", + "glib", "libc", "pango-sys", ] @@ -1117,8 +1049,8 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd111a20ca90fedf03e09c59783c679c00900f1d8491cca5399f5e33609d5d6" dependencies = [ - "glib-sys 0.22.6", - "gobject-sys 0.22.6", + "glib-sys", + "gobject-sys", "libc", "system-deps", ] diff --git a/Cargo.toml b/Cargo.toml index 56500e8..a89c34d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ type_complexity = "allow" [workspace.dependencies] nmrs = "3.0" gtk = { version = "0.11.0", package = "gtk4" } -glib = "0.21" +glib = "0.22" dirs = "6.0.0" fs2 = "0.4.3" anyhow = "1.0.102" diff --git a/package.nix b/package.nix index cb7ef9e..23c342e 100644 --- a/package.nix +++ b/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage { src = ./.; - cargoHash = "sha256-ffHzEAaEYSWut7FSZikY0hn3CRmsNa4uR9+9ZFwO754="; + cargoHash = "sha256-8Un1ebRx8GcfqwLO3SLZQeBE0FvaBSSUNSnyFMCM8y4="; nativeBuildInputs = [ pkg-config