diff --git a/Cargo.lock b/Cargo.lock index 94c558c..3634bce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -17,12 +17,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - [[package]] name = "ahash" version = "0.7.6" @@ -36,9 +30,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" dependencies = [ "memchr", ] @@ -73,9 +67,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.62" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1485d4d2cc45e7b201ee3767015c96faa5904387c9d87c6efdd0fb511f12d305" +checksum = "b9a8f622bcf6ff3df478e9deba3e03e4e04b300f8e6a139e192c05fa3490afc7" [[package]] name = "async-broadcast" @@ -204,7 +198,7 @@ checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" [[package]] name = "cairo-rs" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" +source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62" dependencies = [ "bitflags", "cairo-sys-rs", @@ -217,7 +211,7 @@ dependencies = [ [[package]] name = "cairo-sys-rs" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" +source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62" dependencies = [ "glib-sys", "libc", @@ -256,9 +250,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "3.2.17" +version = "3.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b" +checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd" dependencies = [ "atty", "bitflags", @@ -273,9 +267,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.2.17" +version = "3.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa" +checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" dependencies = [ "heck", "proc-macro-error", @@ -323,9 +317,9 @@ checksum = "328b822bdcba4d4e402be8d9adb6eebf269f969f8eadef977a553ff3c4fbcb58" [[package]] name = "cpufeatures" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc948ebb96241bb40ab73effeb80d9f93afaad49359d159a5e61be51619fe813" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ "libc", ] @@ -394,15 +388,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "deflate" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" -dependencies = [ - "adler32", -] - [[package]] name = "digest" version = "0.9.0" @@ -583,9 +568,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab30e97ab6aacfe635fad58f22c2bb06c8b685f7421eb1e064a729e2a5f481fa" +checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c" dependencies = [ "futures-channel", "futures-core", @@ -598,9 +583,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bfc52cbddcfd745bf1740338492bb0bd83d76c67b445f91c5fb29fae29ecaa1" +checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050" dependencies = [ "futures-core", "futures-sink", @@ -608,15 +593,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2acedae88d38235936c3922476b10fced7b2b68136f5e3c03c2d5be348a1115" +checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf" [[package]] name = "futures-executor" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d11aa21b5b587a64682c0094c2bdd4df0076c5324961a40cc3abd7f37930528" +checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab" dependencies = [ "futures-core", "futures-task", @@ -625,15 +610,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93a66fc6d035a26a3ae255a6d2bca35eda63ae4c5512bef54449113f7a1228e5" +checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68" [[package]] name = "futures-macro" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0db9cce532b0eae2ccf2766ab246f114b56b9cf6d445e00c2549fbc100ca045d" +checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17" dependencies = [ "proc-macro2", "quote", @@ -651,21 +636,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca0bae1fe9752cf7fd9b0064c674ae63f97b37bc714d745cbde0afb7ec4e6765" +checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56" [[package]] name = "futures-task" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "842fc63b931f4056a24d59de13fb1272134ce261816e063e634ad0c15cdc5306" +checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1" [[package]] name = "futures-util" -version = "0.3.23" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0828a5471e340229c11c77ca80017937ce3c58cb788a17e5f1c2d5c485a9577" +checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90" dependencies = [ "futures-channel", "futures-core", @@ -682,7 +667,7 @@ dependencies = [ [[package]] name = "gdk-pixbuf" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" +source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62" dependencies = [ "bitflags", "gdk-pixbuf-sys", @@ -694,7 +679,7 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" +source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62" dependencies = [ "gio-sys", "glib-sys", @@ -706,7 +691,7 @@ dependencies = [ [[package]] name = "gdk4" version = "0.5.0" -source = "git+https://github.com/gtk-rs/gtk4-rs#d6139f4e294437491a72f66de9d8363bf7c004d1" +source = "git+https://github.com/gtk-rs/gtk4-rs#1d4d54ba8ed3e9ed5757ab295823f5feef1b0289" dependencies = [ "bitflags", "cairo-rs", @@ -721,7 +706,7 @@ dependencies = [ [[package]] name = "gdk4-sys" version = "0.5.0" -source = "git+https://github.com/gtk-rs/gtk4-rs#d6139f4e294437491a72f66de9d8363bf7c004d1" +source = "git+https://github.com/gtk-rs/gtk4-rs#1d4d54ba8ed3e9ed5757ab295823f5feef1b0289" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -787,7 +772,7 @@ checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" [[package]] name = "gio" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" +source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62" dependencies = [ "bitflags", "futures-channel", @@ -804,7 +789,7 @@ dependencies = [ [[package]] name = "gio-sys" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" +source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62" dependencies = [ "glib-sys", "gobject-sys", @@ -816,7 +801,7 @@ dependencies = [ [[package]] name = "glib" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" +source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62" dependencies = [ "bitflags", "futures-channel", @@ -837,7 +822,7 @@ dependencies = [ [[package]] name = "glib-macros" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" +source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62" dependencies = [ "anyhow", "heck", @@ -851,7 +836,7 @@ dependencies = [ [[package]] name = "glib-sys" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" +source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62" dependencies = [ "libc", "system-deps", @@ -860,7 +845,7 @@ dependencies = [ [[package]] name = "gobject-sys" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" +source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62" dependencies = [ "glib-sys", "libc", @@ -870,7 +855,7 @@ dependencies = [ [[package]] name = "graphene-rs" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" +source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62" dependencies = [ "glib", "graphene-sys", @@ -880,7 +865,7 @@ dependencies = [ [[package]] name = "graphene-sys" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" +source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62" dependencies = [ "glib-sys", "libc", @@ -891,7 +876,7 @@ dependencies = [ [[package]] name = "gsk4" version = "0.5.0" -source = "git+https://github.com/gtk-rs/gtk4-rs#d6139f4e294437491a72f66de9d8363bf7c004d1" +source = "git+https://github.com/gtk-rs/gtk4-rs#1d4d54ba8ed3e9ed5757ab295823f5feef1b0289" dependencies = [ "bitflags", "cairo-rs", @@ -906,7 +891,7 @@ dependencies = [ [[package]] name = "gsk4-sys" version = "0.5.0" -source = "git+https://github.com/gtk-rs/gtk4-rs#d6139f4e294437491a72f66de9d8363bf7c004d1" +source = "git+https://github.com/gtk-rs/gtk4-rs#1d4d54ba8ed3e9ed5757ab295823f5feef1b0289" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -921,7 +906,7 @@ dependencies = [ [[package]] name = "gtk4" version = "0.5.0" -source = "git+https://github.com/gtk-rs/gtk4-rs#d6139f4e294437491a72f66de9d8363bf7c004d1" +source = "git+https://github.com/gtk-rs/gtk4-rs#1d4d54ba8ed3e9ed5757ab295823f5feef1b0289" dependencies = [ "bitflags", "cairo-rs", @@ -943,7 +928,7 @@ dependencies = [ [[package]] name = "gtk4-macros" version = "0.5.0" -source = "git+https://github.com/gtk-rs/gtk4-rs#d6139f4e294437491a72f66de9d8363bf7c004d1" +source = "git+https://github.com/gtk-rs/gtk4-rs#1d4d54ba8ed3e9ed5757ab295823f5feef1b0289" dependencies = [ "anyhow", "proc-macro-crate", @@ -956,7 +941,7 @@ dependencies = [ [[package]] name = "gtk4-sys" version = "0.5.0" -source = "git+https://github.com/gtk-rs/gtk4-rs#d6139f4e294437491a72f66de9d8363bf7c004d1" +source = "git+https://github.com/gtk-rs/gtk4-rs#1d4d54ba8ed3e9ed5757ab295823f5feef1b0289" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1110,9 +1095,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -1272,7 +1257,7 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libadwaita" version = "0.2.0" -source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#01881b0c9f67ed5a351b78fcd9b172fee246fdd4" +source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#f77307028c4d874d9cb87e9489e389aad4151dbf" dependencies = [ "futures-channel", "gdk-pixbuf", @@ -1289,7 +1274,7 @@ dependencies = [ [[package]] name = "libadwaita-sys" version = "0.2.0" -source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#01881b0c9f67ed5a351b78fcd9b172fee246fdd4" +source = "git+https://gitlab.gnome.org/World/Rust/libadwaita-rs#f77307028c4d874d9cb87e9489e389aad4151dbf" dependencies = [ "gdk4-sys", "gio-sys", @@ -1317,9 +1302,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +checksum = "9f80bf5aacaf25cbfc8210d1cfb718f2bf3b11c4c54e5afe36c236853a8ec390" dependencies = [ "autocfg", "scopeguard", @@ -1415,9 +1400,9 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" [[package]] name = "miniz_oxide" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" dependencies = [ "adler", ] @@ -1571,9 +1556,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" +checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0" [[package]] name = "opaque-debug" @@ -1641,7 +1626,7 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "pango" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" +source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62" dependencies = [ "bitflags", "gio", @@ -1654,7 +1639,7 @@ dependencies = [ [[package]] name = "pango-sys" version = "0.16.0" -source = "git+https://github.com/gtk-rs/gtk-rs-core#679b3717abeea7ef0837995180d8a85dc342dadd" +source = "git+https://github.com/gtk-rs/gtk-rs-core#9fe7e5ce970d5e992b5b4f393c52670cb2443a62" dependencies = [ "glib-sys", "gobject-sys", @@ -1817,13 +1802,13 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" [[package]] name = "png" -version = "0.17.5" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc38c0ad57efb786dd57b9864e5b18bae478c00c824dc55a38bbc9da95dde3ba" +checksum = "8f0e7f4c94ec26ff209cee506314212639d6c91b80afb82984819fafce9df01c" dependencies = [ "bitflags", "crc32fast", - "deflate", + "flate2", "miniz_oxide", ] @@ -1901,9 +1886,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-xml" -version = "0.23.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9279fbdacaad3baf559d8cabe0acc3d06e30ea14931af31af79578ac0946decc" +checksum = "678404d55890514fa1c01fe98cf280b674db93944fdcb70310dd3be1d0d63be7" dependencies = [ "memchr", "serde", @@ -2299,9 +2284,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.10" +version = "0.9.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a09f551ccc8210268ef848f0bab37b306e87b85b2e017b899e7fb815f5aed62" +checksum = "89f31df3f50926cdf2855da5fd8812295c34752cb20438dae42a67f79e021ac3" dependencies = [ "indexmap", "itoa", @@ -2393,9 +2378,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10c98bba371b9b22a71a9414e420f92ddeb2369239af08200816169d5e2dd7aa" +checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" dependencies = [ "libc", "winapi", @@ -2588,18 +2573,18 @@ checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "thiserror" -version = "1.0.32" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" +checksum = "8c1b05ca9d106ba7d2e31a9dab4a64e7be2cce415321966ea3132c49a656e252" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.32" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" +checksum = "e8f2591983642de85c921015f3f070c665a197ed69e417af436115e3a1407487" dependencies = [ "proc-macro2", "quote", @@ -2654,9 +2639,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.20.1" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" +checksum = "89797afd69d206ccd11fb0ea560a44bbb87731d020670e79416d442919257d42" dependencies = [ "autocfg", "bytes", @@ -2789,9 +2774,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "ucd-trie" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c" +checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81" [[package]] name = "unicode-bidi" @@ -2828,13 +2813,12 @@ checksum = "931179334a56395bcf64ba5e0ff56781381c1a5832178280c7d7f91d1679aeb0" [[package]] name = "url" -version = "2.2.2" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "22fe195a4f217c25b25cb5058ced57059824a678474874038dc88d211bf508d3" dependencies = [ "form_urlencoded", "idna", - "matches", "percent-encoding", ] diff --git a/Cargo.toml b/Cargo.toml index d31fa2b..0359fb4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ default-run = "nix-software-center" relm4 = { git = "https://github.com/Relm4/Relm4", tag = "v0.5.0-beta.2", features = ["all"] } relm4-components = { package = "relm4-components", git = "https://github.com/Relm4/Relm4", tag = "v0.5.0-beta.2"} adw = { package = "libadwaita", git = "https://gitlab.gnome.org/World/Rust/libadwaita-rs", features = ["v1_2"] } -tokio = { version = "1.20", features = ["rt", "macros", "time", "rt-multi-thread", "sync", "process"] } +tokio = { version = "1.21", features = ["rt", "macros", "time", "rt-multi-thread", "sync", "process"] } sourceview5 = { git = "https://gitlab.gnome.org/World/Rust/sourceview5-rs/", rev = "6082210f7d1fc32b100bd9c714e9521eecacb3f7", features = ["v5_4"] } tracker = "0.1" @@ -24,7 +24,7 @@ brotli = "3.3" log = "0.4" pretty_env_logger = "0.4" flate2 = "1.0" -quick-xml = { version = "0.23", features = ["serialize"] } +quick-xml = { version = "0.24", features = ["serialize"] } rand = "0.8" reqwest = { version = "0.11", features = ["blocking"] } sha256 = "1.0" diff --git a/README.md b/README.md index 3bb4715..082dd9f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@
+ + Nix Software Center === @@ -7,13 +9,72 @@ Nix Software Center [![License: GPLv3][GPLv3 badge]][GPLv3] [![Chat on Matrix][matrix badge]][matrix] -## More info soon... +A graphical app store for Nix built with [libadwaita](https://gitlab.gnome.org/GNOME/libadwaita), [GTK4](https://www.gtk.org/), and [Relm4](https://relm4.org/). Heavily inspired by [GNOME Software](https://gitlab.gnome.org/GNOME/gnome-software).
+## NixOS Installation + +Head of `configuration.nix` + +```nix +{ config, pkgs, lib, ... }: +let + nixos-conf-editor = (import (pkgs.fetchFromGitHub { + owner = "vlinkz"; + repo = "nix-software-center"; + rev = "0.0.1"; + sha256 = "0000000000000000000000000000000000000000000000000000"; + })) {}; +in +``` +Packages: + +```nix +environment.systemPackages = +with pkgs; [ + nix-software-center + # rest of your packages +]; +``` +For any other method of installation, when rebuilding you will be prompted to authenticate twice in a row by `pkexec` + +## 'nix profile' installation +```bash +nix profile install github:vlinkz/nix-software-center +``` + +## 'nix-env' Installation + +```bash +git clone https://github.com/vlinkz/nix-software-center +nix-env -f nix-software-center -i nix-software-center +``` + +## Single run on an flakes enabled system: +```bash +nix run github:vlinkz/nix-software-center +``` + +## Single run on non-flakes enabled system: +```bash +nix --extra-experimental-features "nix-command flakes" run github:vlinkz/nix-software-center +``` + +## Debugging + +```bash +RUST_LOG=nix_software_center=trace nix-software-center +``` + +## Licenses + +Some icons in [data/icons](data/icons/) contains assets from the [NixOS logo](https://github.com/NixOS/nixos-artwork/tree/master/logo) and are licensed under a [CC-BY license](https://creativecommons.org/licenses/by/4.0/). + +Some icons in [data/icons](data/icons/) contains assets from [GNOME Software](https://gitlab.gnome.org/GNOME/gnome-software/-/tree/main/data/icons/hicolor/scalable) and are licensed under [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/). [builtwithnix badge]: https://img.shields.io/badge/Built%20With-Nix-41439A?style=for-the-badge&logo=nixos&logoColor=white [builtwithnix]: https://builtwithnix.org/ diff --git a/data/icons/dev.vlinkz.NixSoftwareCenter.Devel.svg b/data/icons/dev.vlinkz.NixSoftwareCenter.Devel.svg index c434e2b..7caf881 100644 --- a/data/icons/dev.vlinkz.NixSoftwareCenter.Devel.svg +++ b/data/icons/dev.vlinkz.NixSoftwareCenter.Devel.svg @@ -1,22 +1,22 @@ - - - + + + - - - - + + + + - - - + + + - - - + + + @@ -29,19 +29,26 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -60,20 +67,27 @@ + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/data/icons/dev.vlinkz.NixSoftwareCenter.svg b/data/icons/dev.vlinkz.NixSoftwareCenter.svg index 057a0a1..28d47ed 100644 --- a/data/icons/dev.vlinkz.NixSoftwareCenter.svg +++ b/data/icons/dev.vlinkz.NixSoftwareCenter.svg @@ -1,35 +1,42 @@ - - - + + + - - - - + + + + - - - + + + - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/data/icons/dev.vlinkz.NixSoftwareCenter.template.svg b/data/icons/dev.vlinkz.NixSoftwareCenter.template.svg index 28f9421..4c33181 100644 --- a/data/icons/dev.vlinkz.NixSoftwareCenter.template.svg +++ b/data/icons/dev.vlinkz.NixSoftwareCenter.template.svg @@ -10,11 +10,12 @@ id="svg11300" sodipodi:version="0.32" inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)" - sodipodi:docname="template.svg" + sodipodi:docname="dev.vlinkz.NixSoftwareCenter-template.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.0" style="display:inline;enable-background:new" viewBox="0 0 128 128" + xml:space="preserve" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -22,12 +23,9 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" - xmlns:dc="http://purl.org/dc/elements/1.1/"> - Adwaita Icon Template - - Adwaita Icon Template - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - GNOME Design Team - - - - - Adwaita Icon Template - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xmlGNOME Design TeamAdwaita Icon Template - - - - - - - Hicolor - HicolorSymbolic - - Symbolic - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + style="display:inline" /> diff --git a/default.nix b/default.nix index e47e8d5..e0ccb40 100644 --- a/default.nix +++ b/default.nix @@ -4,13 +4,13 @@ }: let libadwaita-git = pkgs.libadwaita.overrideAttrs (oldAttrs: rec { - version = "1.2.beta"; + version = "1.2.rc"; src = pkgs.fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-QBblkeNAgfHi5YQxaV9ceqNDyDIGu8d6pvLcT6apm6o="; + hash = "sha256-p7nsaAqrzQKeUiu7aGlgoKu0AH9KV/sMsVcLLpgl4Lo="; }; }); nixos-appstream-data = (import (pkgs.fetchFromGitHub { @@ -28,7 +28,7 @@ in pkgs.stdenv.mkDerivation rec { cargoDeps = pkgs.rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-EI9zULrlN+GvtDO0PvtAEA1YjJAbK+SDZ8NSRZf+2Rw="; + hash = "sha256-c21JMLq1m5bLhmZihCbOjAr8WShDimaAjYISpai8oXE="; }; nativeBuildInputs = with pkgs; [ @@ -60,10 +60,6 @@ in pkgs.stdenv.mkDerivation rec { nixos-appstream-data ]; - # mesonFlags = [ - # "-Dprofile=development" - # ]; - patchPhase = '' substituteInPlace ./src/lib.rs \ --replace "/usr/share/app-info" "${nixos-appstream-data}/share/app-info" diff --git a/flake.nix b/flake.nix index 838f6f7..c8dd241 100644 --- a/flake.nix +++ b/flake.nix @@ -11,13 +11,13 @@ inherit system; }; libadwaita-git = pkgs.libadwaita.overrideAttrs (oldAttrs: rec { - version = "1.2.beta"; + version = "1.2.rc"; src = pkgs.fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-QBblkeNAgfHi5YQxaV9ceqNDyDIGu8d6pvLcT6apm6o="; + hash = "sha256-p7nsaAqrzQKeUiu7aGlgoKu0AH9KV/sMsVcLLpgl4Lo="; }; }); nixos-appstream-data = pkgs.fetchFromGitHub { diff --git a/src/ui/window.rs b/src/ui/window.rs index 8ec287b..226ea35 100644 --- a/src/ui/window.rs +++ b/src/ui/window.rs @@ -5,7 +5,7 @@ use adw::prelude::*; use edit_distance; use serde_json::Value; use spdx::Expression; -use crate::{parse::{packages::{Package, LicenseEnum, Platform}, cache::{uptodatelegacy, uptodateflake}, config::{NscConfig, getconfig, editconfig}}, ui::{installedpage::InstalledItem, pkgpage::PkgPageTypes}, APPINFO}; +use crate::{parse::{packages::{Package, LicenseEnum, Platform}, cache::{uptodatelegacy, uptodateflake}, config::{NscConfig, getconfig, editconfig}}, ui::{installedpage::InstalledItem, pkgpage::PkgPageTypes}, APPINFO, config}; use super::{ categories::{PkgGroup, PkgCategory}, @@ -102,10 +102,6 @@ pub enum AppMsg { UpdateInstalledPkgs, UpdateUpdatePkgs, UpdateCategoryPkgs, - // AddUserPkg(String), - // RemoveUserPkg(String), - // AddSystemPkg(String), - // RemoveSystemPkg(String), SetSearch(bool), SetVsBar(bool), SetVsChild(String), @@ -116,7 +112,6 @@ pub enum AppMsg { RemoveInstalledBusy(WorkPkg), OpenCategoryPage(PkgCategory), LoadCategory(PkgCategory) - // OpenWithScrnshots(String, Option>), } #[derive(Debug, Clone, PartialEq)] @@ -167,11 +162,13 @@ impl Component for AppModel { set_valign: gtk::Align::Center, set_hexpand: true, set_vexpand: true, - gtk::Spinner { - set_spinning: true, - set_height_request: 80, + set_spacing: 15, + gtk::Image { + set_icon_name: Some(config::APP_ID), + set_pixel_size: 192, }, gtk::Label { + add_css_class: "title-1", set_label: "Loading...", }, }