diff --git a/Cargo.lock b/Cargo.lock index 2aa06f2..f1f2ffb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -120,12 +120,6 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - [[package]] name = "async-channel" version = "2.1.1" @@ -203,15 +197,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "bare-metal" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3" -dependencies = [ - "rustc_version 0.2.3", -] - [[package]] name = "base64" version = "0.9.3" @@ -255,12 +240,6 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" -[[package]] -name = "bitfield" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719" - [[package]] name = "bitflags" version = "1.3.2" @@ -549,38 +528,6 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" -[[package]] -name = "cortex-m" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ec610d8f49840a5b376c69663b6369e71f4b34484b9b2eb29fb918d92516cb9" -dependencies = [ - "bare-metal", - "bitfield", - "embedded-hal", - "volatile-register", -] - -[[package]] -name = "cortex-m-rt" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee84e813d593101b1723e13ec38b6ab6abbdbaaa4546553f5395ed274079ddb1" -dependencies = [ - "cortex-m-rt-macros", -] - -[[package]] -name = "cortex-m-rt-macros" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f6f3e36f203cfedbc78b357fb28730aa2c6dc1ab060ee5c2405e843988d3c7" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "cpufeatures" version = "0.2.11" @@ -599,15 +546,6 @@ dependencies = [ "crc-catalog", ] -[[package]] -name = "crc-any" -version = "2.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774646b687f63643eb0f4bf13dc263cb581c8c9e57973b6ddf78bda3994d88df" -dependencies = [ - "debug-helper", -] - [[package]] name = "crc-catalog" version = "2.4.0" @@ -623,12 +561,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "critical-section" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" - [[package]] name = "crossbeam-deque" version = "0.8.4" @@ -710,7 +642,7 @@ dependencies = [ "geo-types", "gio", "glib", - "glib-build-tools 0.16.3", + "glib-build-tools 0.18.0", "gtk4", "ifc", "lazy_static", @@ -730,12 +662,6 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" -[[package]] -name = "debug-helper" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" - [[package]] name = "deflate" version = "0.8.6" @@ -828,25 +754,6 @@ dependencies = [ "serde 1.0.193", ] -[[package]] -name = "embedded-dma" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "994f7e5b5cb23521c22304927195f236813053eb9c065dd2226a32ba64695446" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "embedded-hal" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35949884794ad573cf46071e41c9b60efb0cb311e3ca01f7af807af1debc66ff" -dependencies = [ - "nb 0.1.3", - "void", -] - [[package]] name = "emseries" version = "0.6.0" @@ -976,7 +883,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ "memoffset", - "rustc_version 0.4.0", + "rustc_version", ] [[package]] @@ -1140,45 +1047,6 @@ dependencies = [ "percent-encoding 2.3.1", ] -[[package]] -name = "frunk" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a351b59e12f97b4176ee78497dff72e4276fb1ceb13e19056aca7fa0206287" -dependencies = [ - "frunk_core", - "frunk_derives", -] - -[[package]] -name = "frunk_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af2469fab0bd07e64ccf0ad57a1438f63160c69b2e57f04a439653d68eb558d6" - -[[package]] -name = "frunk_derives" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" -dependencies = [ - "frunk_proc_macro_helpers", - "quote", - "syn 2.0.41", -] - -[[package]] -name = "frunk_proc_macro_helpers" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35b54add839292b743aeda6ebedbd8b11e93404f902c56223e51b9ec18a13d2c" -dependencies = [ - "frunk_core", - "proc-macro2", - "quote", - "syn 2.0.41", -] - [[package]] name = "ft-core" version = "0.1.0" @@ -1197,15 +1065,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -[[package]] -name = "fugit" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17186ad64927d5ac8f02c1e77ccefa08ccd9eaa314d5a4772278aa204a22f7e7" -dependencies = [ - "gcd", -] - [[package]] name = "futures" version = "0.3.29" @@ -1306,12 +1165,6 @@ dependencies = [ "slab", ] -[[package]] -name = "gcd" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d53395c0465674841a" - [[package]] name = "gdk-pixbuf" version = "0.18.3" @@ -2077,15 +1930,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.12.0" @@ -2446,21 +2290,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "nb" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "801d31da0513b6ec5214e9bf433a77966320625a37860f910be265be6e18d06f" -dependencies = [ - "nb 1.1.0", -] - -[[package]] -name = "nb" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d5439c4ad607c3c23abf66de8c8bf57ba8adcd1f129e699851a6e43935d339d" - [[package]] name = "nix" version = "0.27.1" @@ -2576,26 +2405,6 @@ dependencies = [ "libc", ] -[[package]] -name = "num_enum" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "object" version = "0.32.1" @@ -2680,12 +2489,6 @@ dependencies = [ "system-deps", ] -[[package]] -name = "panic-halt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de96540e0ebde571dc55c73d60ef407c653844e6f9a1e2fdbd40c07b9252d812" - [[package]] name = "parking" version = "2.2.0" @@ -2828,18 +2631,6 @@ dependencies = [ "siphasher 0.3.11", ] -[[package]] -name = "pico-blink" -version = "0.1.0" -dependencies = [ - "cortex-m", - "cortex-m-rt", - "embedded-hal", - "fugit", - "panic-halt", - "rp-pico", -] - [[package]] name = "pin-project" version = "1.1.3" @@ -2872,17 +2663,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pio" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e09694b50f89f302ed531c1f2a7569f0be5867aee4ab4f8f729bbeec0078e3" -dependencies = [ - "arrayvec", - "num_enum", - "paste", -] - [[package]] name = "pkcs1" version = "0.7.5" @@ -3352,76 +3132,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "rp-pico" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6341771e6f8e5d130b2b3cbc23435b7847761adf198af09f4b2a60407d43bd56" -dependencies = [ - "cortex-m-rt", - "fugit", - "rp2040-boot2", - "rp2040-hal", - "usb-device", -] - -[[package]] -name = "rp2040-boot2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c92f344f63f950ee36cf4080050e4dce850839b9175da38f9d2ffb69b4dbb21" -dependencies = [ - "crc-any", -] - -[[package]] -name = "rp2040-hal" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f21deadb5f29f05be9e665049c9c6d6385c6ed3437574c995658a041f71453" -dependencies = [ - "cortex-m", - "critical-section", - "embedded-dma", - "embedded-hal", - "frunk", - "fugit", - "itertools 0.10.5", - "nb 1.1.0", - "paste", - "pio", - "rand_core 0.6.4", - "rp2040-hal-macros", - "rp2040-pac", - "usb-device", - "vcell", - "void", -] - -[[package]] -name = "rp2040-hal-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86479063e497efe1ae81995ef9071f54fd1c7427e04d6c5b84cde545ff672a5e" -dependencies = [ - "cortex-m-rt", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "rp2040-pac" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12d9d8375815f543f54835d01160d4e47f9e2cae75f17ff8f1ec19ce1da96e4c" -dependencies = [ - "cortex-m", - "cortex-m-rt", - "critical-section", - "vcell", -] - [[package]] name = "rsa" version = "0.9.6" @@ -3454,22 +3164,13 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.20", + "semver", ] [[package]] @@ -3591,27 +3292,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e388332cd64eb80cd595a00941baf513caffae8dce9cfd0467fc9c66397dade6" -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - [[package]] name = "semver" version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" version = "0.9.15" @@ -3797,7 +3483,7 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" dependencies = [ - "itertools 0.12.0", + "itertools", "nom", "unicode_categories", ] @@ -3998,12 +3684,6 @@ dependencies = [ "urlencoding", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] name = "stringprep" version = "0.1.4" @@ -4594,12 +4274,6 @@ version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" -[[package]] -name = "usb-device" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f6cc3adc849b5292b4075fc0d5fdcf2f24866e88e336dd27a8943090a520508" - [[package]] name = "utf-8" version = "0.7.6" @@ -4641,12 +4315,6 @@ dependencies = [ "getrandom", ] -[[package]] -name = "vcell" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002" - [[package]] name = "vcpkg" version = "0.2.15" @@ -4683,21 +4351,6 @@ dependencies = [ "warp", ] -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - -[[package]] -name = "volatile-register" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de437e2a6208b014ab52972a27e59b33fa2920d3e00fe05026167a1c509d19cc" -dependencies = [ - "vcell", -] - [[package]] name = "wait-timeout" version = "0.2.0" diff --git a/Cargo.nix b/Cargo.nix index f0f3a6c..80c4af3 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -235,16 +235,6 @@ rec { # File a bug if you depend on any for non-debug work! debug = internal.debugCrate { inherit packageId; }; }; - "pico-blink" = rec { - packageId = "pico-blink"; - build = internal.buildRustCrateWithFeatures { - packageId = "pico-blink"; - }; - - # Debug support which might change between releases. - # File a bug if you depend on any for non-debug work! - debug = internal.debugCrate { inherit packageId; }; - }; "result-extended" = rec { packageId = "result-extended"; build = internal.buildRustCrateWithFeatures { @@ -625,20 +615,6 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "arrayvec" = rec { - crateName = "arrayvec"; - version = "0.7.4"; - edition = "2018"; - sha256 = "04b7n722jij0v3fnm3qk072d5ysc2q30rl9fz33zpfhzah30mlwn"; - authors = [ - "bluss" - ]; - features = { - "default" = [ "std" ]; - "serde" = [ "dep:serde" ]; - "zeroize" = [ "dep:zeroize" ]; - }; - }; "async-channel" = rec { crateName = "async-channel"; version = "2.1.1"; @@ -876,24 +852,6 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "bare-metal" = rec { - crateName = "bare-metal"; - version = "0.2.5"; - edition = "2015"; - sha256 = "1cy5pbb92fznnri72y6drfpjxj4qdmd62f0rrlgy70dxlppn9ssx"; - authors = [ - "Jorge Aparicio " - ]; - buildDependencies = [ - { - name = "rustc_version"; - packageId = "rustc_version 0.2.3"; - } - ]; - features = { - }; - resolvedDefaultFeatures = [ "const-fn" ]; - }; "base64 0.21.5" = rec { crateName = "base64"; version = "0.21.5"; @@ -989,16 +947,6 @@ rec { "Philipp Oppermann " ]; - }; - "bitfield" = rec { - crateName = "bitfield"; - version = "0.13.2"; - edition = "2015"; - sha256 = "06g7jb5r2b856vnhx76081fg90jvmy61kjqcfjysgmd5hclvvbs6"; - authors = [ - "Loïc Damien " - ]; - }; "bitflags 1.3.2" = rec { crateName = "bitflags"; @@ -1822,87 +1770,6 @@ rec { }; resolvedDefaultFeatures = [ "default" "link" ]; }; - "cortex-m" = rec { - crateName = "cortex-m"; - version = "0.7.7"; - edition = "2018"; - sha256 = "1fbca698v4gv57mv5fc48jrz8wcy6sv675n6fsrsah4qykc11ilf"; - authors = [ - "The Cortex-M Team " - "Jorge Aparicio " - ]; - dependencies = [ - { - name = "bare-metal"; - packageId = "bare-metal"; - features = [ "const-fn" ]; - } - { - name = "bitfield"; - packageId = "bitfield"; - } - { - name = "embedded-hal"; - packageId = "embedded-hal"; - } - { - name = "volatile-register"; - packageId = "volatile-register"; - } - ]; - features = { - "cm7-r0p1" = [ "cm7" ]; - "critical-section" = [ "dep:critical-section" ]; - "critical-section-single-core" = [ "critical-section/restore-state-bool" ]; - "serde" = [ "dep:serde" ]; - }; - }; - "cortex-m-rt" = rec { - crateName = "cortex-m-rt"; - version = "0.7.3"; - edition = "2021"; - sha256 = "1cfxg502gvcmaczmaij5maxbvaxnda5w6gp14cbin44ksl9yi17f"; - authors = [ - "The Cortex-M Team " - "Jorge Aparicio " - "Hideki Sekine " - ]; - dependencies = [ - { - name = "cortex-m-rt-macros"; - packageId = "cortex-m-rt-macros"; - } - ]; - features = { - }; - resolvedDefaultFeatures = [ "device" ]; - }; - "cortex-m-rt-macros" = rec { - crateName = "cortex-m-rt-macros"; - version = "0.7.0"; - edition = "2018"; - sha256 = "1iyki0wq8pj0qbjhw1mbq5njraihhyr7ydcbqzdzwg10dziz7xph"; - procMacro = true; - authors = [ - "Jorge Aparicio " - ]; - dependencies = [ - { - name = "proc-macro2"; - packageId = "proc-macro2"; - } - { - name = "quote"; - packageId = "quote"; - } - { - name = "syn"; - packageId = "syn 1.0.109"; - features = [ "extra-traits" "full" ]; - } - ]; - - }; "cpufeatures" = rec { crateName = "cpufeatures"; version = "0.2.11"; @@ -1952,30 +1819,6 @@ rec { ]; }; - "crc-any" = rec { - crateName = "crc-any"; - version = "2.4.3"; - edition = "2021"; - sha256 = "1pw89ncs7gbqvxnkp5spks61qn6bcg13vwab1zml6dpnhyv4cikp"; - authors = [ - "Magic Len " - ]; - dependencies = [ - { - name = "debug-helper"; - packageId = "debug-helper"; - optional = true; - } - ]; - features = { - "alloc" = [ "debug-helper" ]; - "debug-helper" = [ "dep:debug-helper" ]; - "default" = [ "alloc" ]; - "development" = [ "std" ]; - "heapless" = [ "dep:heapless" ]; - }; - resolvedDefaultFeatures = [ "alloc" "debug-helper" "default" ]; - }; "crc-catalog" = rec { crateName = "crc-catalog"; version = "2.4.0"; @@ -2006,16 +1849,6 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "critical-section" = rec { - crateName = "critical-section"; - version = "1.1.2"; - edition = "2018"; - sha256 = "05pj0pvkdyc9r30xxabam4n8zxdbzxcddr0gdypajcbqjgwgynbh"; - features = { - "std" = [ "restore-state-bool" ]; - }; - resolvedDefaultFeatures = [ "restore-state-u8" ]; - }; "crossbeam-deque" = rec { crateName = "crossbeam-deque"; version = "0.8.4"; @@ -2199,7 +2032,7 @@ rec { }; "dashboard" = rec { crateName = "dashboard"; - version = "0.1.1"; + version = "0.1.2"; edition = "2018"; crateBin = [ { @@ -2305,7 +2138,7 @@ rec { buildDependencies = [ { name = "glib-build-tools"; - packageId = "glib-build-tools 0.16.3"; + packageId = "glib-build-tools 0.18.0"; } ]; @@ -2324,16 +2157,6 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "default" "std" ]; }; - "debug-helper" = rec { - crateName = "debug-helper"; - version = "0.3.13"; - edition = "2021"; - sha256 = "0bhnpzpgmg8dkdr27g2b49slf6ca79m4idcb01z2krs0qkifhy7m"; - authors = [ - "Magic Len " - ]; - - }; "deflate" = rec { crateName = "deflate"; version = "0.8.6"; @@ -2621,50 +2444,6 @@ rec { }; resolvedDefaultFeatures = [ "default" "serde" "use_std" ]; }; - "embedded-dma" = rec { - crateName = "embedded-dma"; - version = "0.2.0"; - edition = "2018"; - sha256 = "0ijld5jblcka4b95s1lwxd9k109nyaap34h44g122ddjbidpwkwr"; - authors = [ - "Jan Teske " - "Thales Fragoso " - ]; - dependencies = [ - { - name = "stable_deref_trait"; - packageId = "stable_deref_trait"; - usesDefaultFeatures = false; - } - ]; - - }; - "embedded-hal" = rec { - crateName = "embedded-hal"; - version = "0.2.7"; - edition = "2015"; - sha256 = "1zv6pkgg2yl0mzvh3jp326rhryqfnv4l27h78v7p7maag629i51m"; - authors = [ - "The Embedded HAL Team " - "Jorge Aparicio " - "Jonathan 'theJPster' Pallant " - ]; - dependencies = [ - { - name = "nb"; - packageId = "nb 0.1.3"; - } - { - name = "void"; - packageId = "void"; - usesDefaultFeatures = false; - } - ]; - features = { - "unproven" = [ "nb/unstable" ]; - }; - resolvedDefaultFeatures = [ "unproven" ]; - }; "emseries" = rec { crateName = "emseries"; version = "0.6.0"; @@ -3025,7 +2804,7 @@ rec { buildDependencies = [ { name = "rustc_version"; - packageId = "rustc_version 0.4.0"; + packageId = "rustc_version"; } ]; @@ -3174,7 +2953,7 @@ rec { }; "fitnesstrax" = rec { crateName = "fitnesstrax"; - version = "0.1.0"; + version = "0.3.0"; edition = "2021"; crateBin = [ { @@ -3234,6 +3013,10 @@ rec { rename = "adw"; features = [ "v1_4" ]; } + { + name = "thiserror"; + packageId = "thiserror"; + } { name = "tokio"; packageId = "tokio"; @@ -3552,103 +3335,6 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "default" "std" ]; }; - "frunk" = rec { - crateName = "frunk"; - version = "0.4.2"; - edition = "2021"; - sha256 = "11v242h7zjka0lckxcffn5pjgr3jzxyljy7ffr0ppy8jkssm38qi"; - authors = [ - "Lloyd " - ]; - dependencies = [ - { - name = "frunk_core"; - packageId = "frunk_core"; - usesDefaultFeatures = false; - } - { - name = "frunk_derives"; - packageId = "frunk_derives"; - usesDefaultFeatures = false; - } - ]; - features = { - "default" = [ "validated" "proc-macros" ]; - "frunk_proc_macros" = [ "dep:frunk_proc_macros" ]; - "proc-macros" = [ "frunk_proc_macros" ]; - "serde" = [ "dep:serde" ]; - "std" = [ "frunk_core/std" ]; - "validated" = [ "std" ]; - }; - }; - "frunk_core" = rec { - crateName = "frunk_core"; - version = "0.4.2"; - edition = "2021"; - sha256 = "1mjqnn7dclwn8d5g0mrfkg360cgn70a7mm8arx6fc1xxn3x6j95g"; - authors = [ - "Lloyd " - ]; - features = { - "default" = [ "std" ]; - "serde" = [ "dep:serde" ]; - }; - }; - "frunk_derives" = rec { - crateName = "frunk_derives"; - version = "0.4.2"; - edition = "2021"; - sha256 = "0blsy6aq6rbvxcc0337g15083w24s8539fmv8rwp1qan2qprkymh"; - procMacro = true; - authors = [ - "Lloyd " - ]; - dependencies = [ - { - name = "frunk_proc_macro_helpers"; - packageId = "frunk_proc_macro_helpers"; - usesDefaultFeatures = false; - } - { - name = "quote"; - packageId = "quote"; - } - { - name = "syn"; - packageId = "syn 2.0.41"; - } - ]; - - }; - "frunk_proc_macro_helpers" = rec { - crateName = "frunk_proc_macro_helpers"; - version = "0.1.2"; - edition = "2021"; - sha256 = "0b1xl4cfrfai7qi5cb4h9x0967miv3dvwvnsmr1vg4ljhgflmd9m"; - authors = [ - "Lloyd " - ]; - dependencies = [ - { - name = "frunk_core"; - packageId = "frunk_core"; - usesDefaultFeatures = false; - } - { - name = "proc-macro2"; - packageId = "proc-macro2"; - } - { - name = "quote"; - packageId = "quote"; - } - { - name = "syn"; - packageId = "syn 2.0.41"; - } - ]; - - }; "ft-core" = rec { crateName = "ft-core"; version = "0.1.0"; @@ -3700,24 +3386,6 @@ rec { ]; }; - "fugit" = rec { - crateName = "fugit"; - version = "0.3.7"; - edition = "2021"; - sha256 = "1rzp49521akq49vs9m8llgmdkk08zb77rry10a7srm9797b6l60p"; - authors = [ - "Emil Fresk " - ]; - dependencies = [ - { - name = "gcd"; - packageId = "gcd"; - } - ]; - features = { - "defmt" = [ "dep:defmt" ]; - }; - }; "futures" = rec { crateName = "futures"; version = "0.3.29"; @@ -4021,16 +3689,6 @@ rec { }; resolvedDefaultFeatures = [ "alloc" "async-await" "async-await-macro" "channel" "default" "futures-channel" "futures-io" "futures-macro" "futures-sink" "io" "memchr" "sink" "slab" "std" ]; }; - "gcd" = rec { - crateName = "gcd"; - version = "2.3.0"; - edition = "2021"; - sha256 = "06l4fib4dh4m6gazdrzzzinhvcpcfh05r4i4gzscl03vnjhqnx8x"; - authors = [ - "Corey Farwell " - ]; - - }; "gdk-pixbuf" = rec { crateName = "gdk-pixbuf"; version = "0.18.3"; @@ -6479,27 +6137,7 @@ rec { ]; }; - "itertools 0.10.5" = rec { - crateName = "itertools"; - version = "0.10.5"; - edition = "2018"; - sha256 = "0ww45h7nxx5kj6z2y6chlskxd1igvs4j507anr6dzg99x1h25zdh"; - authors = [ - "bluss" - ]; - dependencies = [ - { - name = "either"; - packageId = "either"; - usesDefaultFeatures = false; - } - ]; - features = { - "default" = [ "use_std" ]; - "use_std" = [ "use_alloc" "either/use_std" ]; - }; - }; - "itertools 0.12.0" = rec { + "itertools" = rec { crateName = "itertools"; version = "0.12.0"; edition = "2018"; @@ -7573,36 +7211,6 @@ rec { "vendored" = [ "openssl/vendored" ]; }; }; - "nb 0.1.3" = rec { - crateName = "nb"; - version = "0.1.3"; - edition = "2015"; - sha256 = "0vyh31pbwrg21f8hz1ipb9i20qwnfwx47gz92i9frdhk0pd327c0"; - authors = [ - "Jorge Aparicio " - ]; - dependencies = [ - { - name = "nb"; - packageId = "nb 1.1.0"; - } - ]; - features = { - }; - resolvedDefaultFeatures = [ "unstable" ]; - }; - "nb 1.1.0" = rec { - crateName = "nb"; - version = "1.1.0"; - edition = "2018"; - sha256 = "179kbn9l6vhshncycagis7f8mfjppz4fhvgnmcikqz30mp23jm4d"; - authors = [ - "Jorge Aparicio " - ]; - features = { - "defmt-0-3" = [ "dep:defmt" ]; - }; - }; "nix" = rec { crateName = "nix"; version = "0.27.1"; @@ -7968,62 +7576,6 @@ rec { ]; }; - "num_enum" = rec { - crateName = "num_enum"; - version = "0.5.11"; - edition = "2018"; - sha256 = "1japmqhcxwn1d3k7q8jw58y7xfby51s16nzd6dkj483cj2pnqr0z"; - authors = [ - "Daniel Wagner-Hall " - "Daniel Henry-Mantilla " - "Vincent Esche " - ]; - dependencies = [ - { - name = "num_enum_derive"; - packageId = "num_enum_derive"; - usesDefaultFeatures = false; - } - ]; - features = { - "complex-expressions" = [ "num_enum_derive/complex-expressions" ]; - "default" = [ "std" ]; - "std" = [ "num_enum_derive/std" ]; - }; - }; - "num_enum_derive" = rec { - crateName = "num_enum_derive"; - version = "0.5.11"; - edition = "2018"; - sha256 = "16f7r4jila0ckcgdnfgqyhhb90w9m2pdbwayyqmwcci0j6ygkgyw"; - procMacro = true; - authors = [ - "Daniel Wagner-Hall " - "Daniel Henry-Mantilla " - "Vincent Esche " - ]; - dependencies = [ - { - name = "proc-macro2"; - packageId = "proc-macro2"; - } - { - name = "quote"; - packageId = "quote"; - } - { - name = "syn"; - packageId = "syn 1.0.109"; - features = [ "parsing" ]; - } - ]; - features = { - "complex-expressions" = [ "syn/full" ]; - "default" = [ "std" ]; - "proc-macro-crate" = [ "dep:proc-macro-crate" ]; - "std" = [ "proc-macro-crate" ]; - }; - }; "object" = rec { crateName = "object"; version = "0.32.1"; @@ -8273,16 +7825,6 @@ rec { }; resolvedDefaultFeatures = [ "v1_42" "v1_44" "v1_46" "v1_48" "v1_50" ]; }; - "panic-halt" = rec { - crateName = "panic-halt"; - version = "0.2.0"; - edition = "2015"; - sha256 = "04nqaa97ph20ppyy58grwr23hrbw83pn0gf7apf73rdx1q7595ny"; - authors = [ - "Emil Fresk " - ]; - - }; "parking" = rec { crateName = "parking"; version = "2.2.0"; @@ -8615,50 +8157,6 @@ rec { }; resolvedDefaultFeatures = [ "unicase" ]; }; - "pico-blink" = rec { - crateName = "pico-blink"; - version = "0.1.0"; - edition = "2021"; - crateBin = [ - { - name = "pico-blink"; - path = "src/main.rs"; - requiredFeatures = [ ]; - } - ]; - # We can't filter paths with references in Nix 2.4 - # See https://github.com/NixOS/nix/issues/5410 - src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion )) - then lib.cleanSourceWith { filter = sourceFilter; src = ./pico-blink; } - else ./pico-blink; - dependencies = [ - { - name = "cortex-m"; - packageId = "cortex-m"; - } - { - name = "cortex-m-rt"; - packageId = "cortex-m-rt"; - } - { - name = "embedded-hal"; - packageId = "embedded-hal"; - } - { - name = "fugit"; - packageId = "fugit"; - } - { - name = "panic-halt"; - packageId = "panic-halt"; - } - { - name = "rp-pico"; - packageId = "rp-pico"; - } - ]; - - }; "pin-project" = rec { crateName = "pin-project"; version = "1.1.3"; @@ -8711,33 +8209,6 @@ rec { "Josef Brandl " ]; - }; - "pio" = rec { - crateName = "pio"; - version = "0.2.1"; - edition = "2018"; - sha256 = "1qvq03nbx6vjix7spr5fcxcbxw39flm1y72kxl1g728gnna9dq3n"; - authors = [ - "snek" - "The rp-rs developers" - ]; - dependencies = [ - { - name = "arrayvec"; - packageId = "arrayvec"; - usesDefaultFeatures = false; - } - { - name = "num_enum"; - packageId = "num_enum"; - usesDefaultFeatures = false; - } - { - name = "paste"; - packageId = "paste"; - } - ]; - }; "pkcs1" = rec { crateName = "pkcs1"; @@ -10197,228 +9668,6 @@ rec { ]; }; - "rp-pico" = rec { - crateName = "rp-pico"; - version = "0.8.0"; - edition = "2018"; - sha256 = "0mmx8dyl0q1a9fgz12hrvwd7civqbd1j7g1w5c5i6pcfdwg7fhb3"; - authors = [ - "evan " - "The rp-rs Developers" - ]; - dependencies = [ - { - name = "cortex-m-rt"; - packageId = "cortex-m-rt"; - optional = true; - } - { - name = "fugit"; - packageId = "fugit"; - } - { - name = "rp2040-boot2"; - packageId = "rp2040-boot2"; - optional = true; - } - { - name = "rp2040-hal"; - packageId = "rp2040-hal"; - } - { - name = "usb-device"; - packageId = "usb-device"; - } - ]; - devDependencies = [ - { - name = "rp2040-hal"; - packageId = "rp2040-hal"; - features = [ "defmt" ]; - } - ]; - features = { - "boot2" = [ "rp2040-boot2" ]; - "cortex-m-rt" = [ "dep:cortex-m-rt" ]; - "critical-section-impl" = [ "rp2040-hal/critical-section-impl" ]; - "default" = [ "boot2" "rt" "critical-section-impl" "rom-func-cache" ]; - "disable-intrinsics" = [ "rp2040-hal/disable-intrinsics" ]; - "rom-func-cache" = [ "rp2040-hal/rom-func-cache" ]; - "rom-v2-intrinsics" = [ "rp2040-hal/rom-v2-intrinsics" ]; - "rp2040-boot2" = [ "dep:rp2040-boot2" ]; - "rp2040-e5" = [ "rp2040-hal/rp2040-e5" ]; - "rt" = [ "cortex-m-rt" "rp2040-hal/rt" ]; - }; - resolvedDefaultFeatures = [ "boot2" "cortex-m-rt" "critical-section-impl" "default" "rom-func-cache" "rp2040-boot2" "rt" ]; - }; - "rp2040-boot2" = rec { - crateName = "rp2040-boot2"; - version = "0.3.0"; - edition = "2018"; - sha256 = "08dv9ndvdzyjz4wdlxcikf1m1s6wwi80027ldkihx59zyr2g74kw"; - authors = [ - "The rp-rs Team" - ]; - buildDependencies = [ - { - name = "crc-any"; - packageId = "crc-any"; - } - ]; - features = { - }; - }; - "rp2040-hal" = rec { - crateName = "rp2040-hal"; - version = "0.9.1"; - edition = "2021"; - sha256 = "0lqlyx0s0n2nk565fdrlxp38aqvdkjf08rg6x5dz0aazvgm1vwh8"; - authors = [ - "The rp-rs Developers" - ]; - dependencies = [ - { - name = "cortex-m"; - packageId = "cortex-m"; - } - { - name = "critical-section"; - packageId = "critical-section"; - } - { - name = "embedded-dma"; - packageId = "embedded-dma"; - } - { - name = "embedded-hal"; - packageId = "embedded-hal"; - features = [ "unproven" ]; - } - { - name = "frunk"; - packageId = "frunk"; - usesDefaultFeatures = false; - } - { - name = "fugit"; - packageId = "fugit"; - } - { - name = "itertools"; - packageId = "itertools 0.10.5"; - usesDefaultFeatures = false; - } - { - name = "nb"; - packageId = "nb 1.1.0"; - } - { - name = "paste"; - packageId = "paste"; - } - { - name = "pio"; - packageId = "pio"; - } - { - name = "rand_core"; - packageId = "rand_core 0.6.4"; - } - { - name = "rp2040-hal-macros"; - packageId = "rp2040-hal-macros"; - } - { - name = "rp2040-pac"; - packageId = "rp2040-pac"; - features = [ "critical-section" ]; - } - { - name = "usb-device"; - packageId = "usb-device"; - } - { - name = "vcell"; - packageId = "vcell"; - } - { - name = "void"; - packageId = "void"; - usesDefaultFeatures = false; - } - ]; - features = { - "chrono" = [ "dep:chrono" ]; - "critical-section-impl" = [ "critical-section/restore-state-u8" ]; - "defmt" = [ "dep:defmt" ]; - "eh1_0_alpha" = [ "dep:eh1_0_alpha" "dep:eh_nb_1_0_alpha" ]; - "rt" = [ "rp2040-pac/rt" ]; - "rtic-monotonic" = [ "dep:rtic-monotonic" ]; - }; - resolvedDefaultFeatures = [ "critical-section-impl" "rom-func-cache" "rt" ]; - }; - "rp2040-hal-macros" = rec { - crateName = "rp2040-hal-macros"; - version = "0.1.0"; - edition = "2021"; - sha256 = "0piaczzlbrfdhidnqkg04xs1rzal3w3zjplrh6pf3vwpwiir0iw6"; - procMacro = true; - dependencies = [ - { - name = "cortex-m-rt"; - packageId = "cortex-m-rt"; - } - { - name = "proc-macro2"; - packageId = "proc-macro2"; - } - { - name = "quote"; - packageId = "quote"; - } - { - name = "syn"; - packageId = "syn 1.0.109"; - features = [ "extra-traits" "full" ]; - } - ]; - - }; - "rp2040-pac" = rec { - crateName = "rp2040-pac"; - version = "0.5.0"; - edition = "2018"; - sha256 = "0k3fm4fww6gcy7w7zwbmmqn9wzz4sih13l1m93sl7x8mb0vxin8j"; - authors = [ - "The RP-RS team" - ]; - dependencies = [ - { - name = "cortex-m"; - packageId = "cortex-m"; - } - { - name = "cortex-m-rt"; - packageId = "cortex-m-rt"; - optional = true; - } - { - name = "critical-section"; - packageId = "critical-section"; - optional = true; - } - { - name = "vcell"; - packageId = "vcell"; - } - ]; - features = { - "cortex-m-rt" = [ "dep:cortex-m-rt" ]; - "critical-section" = [ "dep:critical-section" ]; - "rt" = [ "cortex-m-rt/device" ]; - }; - resolvedDefaultFeatures = [ "cortex-m-rt" "critical-section" "rt" ]; - }; "rsa" = rec { crateName = "rsa"; version = "0.9.6"; @@ -10546,23 +9795,7 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "rustc_version 0.2.3" = rec { - crateName = "rustc_version"; - version = "0.2.3"; - edition = "2015"; - sha256 = "02h3x57lcr8l2pm0a645s9whdh33pn5cnrwvn5cb57vcrc53x3hk"; - authors = [ - "Marvin Löbel " - ]; - dependencies = [ - { - name = "semver"; - packageId = "semver 0.9.0"; - } - ]; - - }; - "rustc_version 0.4.0" = rec { + "rustc_version" = rec { crateName = "rustc_version"; version = "0.4.0"; edition = "2018"; @@ -10574,7 +9807,7 @@ rec { dependencies = [ { name = "semver"; - packageId = "semver 1.0.20"; + packageId = "semver"; } ]; @@ -10948,28 +10181,7 @@ rec { "rustversion" = [ "dep:rustversion" ]; }; }; - "semver 0.9.0" = rec { - crateName = "semver"; - version = "0.9.0"; - edition = "2015"; - sha256 = "00q4lkcj0rrgbhviv9sd4p6qmdsipkwkbra7rh11jrhq5kpvjzhx"; - authors = [ - "Steve Klabnik " - "The Rust Project Developers" - ]; - dependencies = [ - { - name = "semver-parser"; - packageId = "semver-parser"; - } - ]; - features = { - "ci" = [ "serde" ]; - "serde" = [ "dep:serde" ]; - }; - resolvedDefaultFeatures = [ "default" ]; - }; - "semver 1.0.20" = rec { + "semver" = rec { crateName = "semver"; version = "1.0.20"; edition = "2018"; @@ -10983,16 +10195,6 @@ rec { }; resolvedDefaultFeatures = [ "default" "std" ]; }; - "semver-parser" = rec { - crateName = "semver-parser"; - version = "0.7.0"; - edition = "2015"; - sha256 = "18vhypw6zgccnrlm5ps1pwa0khz7ry927iznpr88b87cagr1v2iq"; - authors = [ - "Steve Klabnik " - ]; - - }; "serde 0.9.15" = rec { crateName = "serde"; version = "0.9.15"; @@ -11521,7 +10723,7 @@ rec { dependencies = [ { name = "itertools"; - packageId = "itertools 0.12.0"; + packageId = "itertools"; } { name = "nom"; @@ -12465,19 +11667,6 @@ rec { }; resolvedDefaultFeatures = [ "any" "json" "migrate" "offline" "serde" ]; }; - "stable_deref_trait" = rec { - crateName = "stable_deref_trait"; - version = "1.2.0"; - edition = "2015"; - sha256 = "1lxjr8q2n534b2lhkxd6l6wcddzjvnksi58zv11f9y0jjmr15wd8"; - authors = [ - "Robert Grosse " - ]; - features = { - "default" = [ "std" ]; - "std" = [ "alloc" ]; - }; - }; "stringprep" = rec { crateName = "stringprep"; version = "0.1.4"; @@ -14127,18 +13316,6 @@ rec { ]; }; - "usb-device" = rec { - crateName = "usb-device"; - version = "0.2.9"; - edition = "2018"; - sha256 = "0205a850jhw9gb96scwfx1k4iwpjvighvz3m80mjkda9r2nw6v0z"; - authors = [ - "Matti Virkkunen " - ]; - features = { - "defmt" = [ "dep:defmt" ]; - }; - }; "utf-8" = rec { crateName = "utf-8"; version = "0.7.6"; @@ -14283,17 +13460,6 @@ rec { }; resolvedDefaultFeatures = [ "default" "getrandom" "rng" "std" "v4" ]; }; - "vcell" = rec { - crateName = "vcell"; - version = "0.1.3"; - edition = "2015"; - sha256 = "00n0ss2z3rh0ihig6d4w7xp72g58f7g1m6s5v4h3nc6jacdrqhvp"; - authors = [ - "Jorge Aparicio " - ]; - features = { - }; - }; "vcpkg" = rec { crateName = "vcpkg"; version = "0.2.15"; @@ -14378,35 +13544,6 @@ rec { } ]; - }; - "void" = rec { - crateName = "void"; - version = "1.0.2"; - edition = "2015"; - sha256 = "0zc8f0ksxvmhvgx4fdg0zyn6vdnbxd2xv9hfx4nhzg6kbs4f80ka"; - authors = [ - "Jonathan Reem " - ]; - features = { - "default" = [ "std" ]; - }; - }; - "volatile-register" = rec { - crateName = "volatile-register"; - version = "0.2.2"; - edition = "2015"; - sha256 = "1k0rkm81qyhn4r8f03z0sch2kyikkgjjfalpaami9c08c8m7whyy"; - authors = [ - "Jorge Aparicio " - "Jonathan 'theJPster' Pallant " - ]; - dependencies = [ - { - name = "vcell"; - packageId = "vcell"; - } - ]; - }; "wait-timeout" = rec { crateName = "wait-timeout"; diff --git a/Cargo.toml b/Cargo.toml index af6549d..bf860b2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,6 @@ members = [ "kifu/gtk", "memorycache", "nom-training", - "pico-blink", "result-extended", "screenplay", "sgf", diff --git a/dashboard/Cargo.toml b/dashboard/Cargo.toml index fcb0958..217e756 100644 --- a/dashboard/Cargo.toml +++ b/dashboard/Cargo.toml @@ -28,5 +28,5 @@ tokio = { version = "1", features = ["full"] } unic-langid = { version = "0.9" } [build-dependencies] -glib-build-tools = "0.16" +glib-build-tools = "0.18" diff --git a/dashboard/build.rs b/dashboard/build.rs index 2f8c7ae..1d1aa2b 100644 --- a/dashboard/build.rs +++ b/dashboard/build.rs @@ -1,7 +1,7 @@ fn main() { glib_build_tools::compile_resources( - "resources", - "resources/gresources.xml", + &["resources"], + "gresources.xml", "com.luminescent-dreams.dashboard.gresource", ); } diff --git a/dashboard/resources/gresources.xml b/dashboard/gresources.xml similarity index 100% rename from dashboard/resources/gresources.xml rename to dashboard/gresources.xml diff --git a/fitnesstrax/app/build.rs b/fitnesstrax/app/build.rs index 6943702..fdfde32 100644 --- a/fitnesstrax/app/build.rs +++ b/fitnesstrax/app/build.rs @@ -1,7 +1,7 @@ fn main() { glib_build_tools::compile_resources( &["resources"], - "resources/gresources.xml", + "gresources.xml", "com.luminescent-dreams.fitnesstrax.gresource", ); } diff --git a/fitnesstrax/app/resources/gresources.xml b/fitnesstrax/app/gresources.xml similarity index 100% rename from fitnesstrax/app/resources/gresources.xml rename to fitnesstrax/app/gresources.xml diff --git a/flake.lock b/flake.lock index 6edcaf2..48c239e 100644 --- a/flake.lock +++ b/flake.lock @@ -1,37 +1,6 @@ { "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { - "locked": { - "lastModified": 1653893745, - "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -51,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703200384, - "narHash": "sha256-q5j06XOsy0qHOarsYPfZYJPWbTbc8sryRxianlEPJN0=", + "lastModified": 1704732714, + "narHash": "sha256-ABqK/HggMYA/jMUXgYyqVAcQ8QjeMyr1jcXfTpSHmps=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b3d618173114c64ab666f557504d6982665d328", + "rev": "6723fa4e4f1a30d42a633bef5eb01caeb281adc3", "type": "github" }, "original": { @@ -65,22 +34,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1654275867, - "narHash": "sha256-pt14ZE4jVPGvfB2NynGsl34pgXfOqum5YJNpDK4+b9E=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "7a20c208aacf4964c19186dcad51f89165dc7ed0", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1681303793, "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", @@ -95,60 +48,13 @@ "type": "indirect" } }, - "pkgs-cargo2nix": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1682891040, - "narHash": "sha256-hjajsi7lq24uYitUh4o04UJi1g0Qe6ruPL0s5DgPQMY=", - "owner": "cargo2nix", - "repo": "cargo2nix", - "rev": "0167b39f198d72acdf009265634504fd6f5ace15", - "type": "github" - }, - "original": { - "owner": "cargo2nix", - "repo": "cargo2nix", - "type": "github" - } - }, "root": { "inputs": { "nixpkgs": "nixpkgs", - "pkgs-cargo2nix": "pkgs-cargo2nix", "typeshare": "typeshare", "unstable": "unstable" } }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "pkgs-cargo2nix", - "flake-utils" - ], - "nixpkgs": [ - "pkgs-cargo2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1653878966, - "narHash": "sha256-T51Gck/vrJZi1m+uTbhEFTRgZmE59sydVONadADv358=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "8526d618af012a923ca116be9603e818b502a8db", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -166,15 +72,15 @@ }, "typeshare": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1690502632, - "narHash": "sha256-+k81RrxfphDUD5kekWbQ4xuZIHBEAQf67uivaQ34Afs=", + "lastModified": 1698205128, + "narHash": "sha256-jP+81TkldLtda8bzmsBWahETGsyFkoDOCT244YkA+S4=", "owner": "1Password", "repo": "typeshare", - "rev": "9f74772af53759aee2f53e64478523e53083719e", + "rev": "c3ee2ad8f27774c45db7af4f2ba746c4ae11de21", "type": "github" }, "original": { @@ -185,11 +91,11 @@ }, "unstable": { "locked": { - "lastModified": 1690367991, - "narHash": "sha256-2VwOn1l8y6+cu7zjNE8MgeGJNNz1eat1HwHrINeogFA=", + "lastModified": 1704722960, + "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9cf0708f00fbe553319258e48ca89ff9a413703", + "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0854e20..91bc76d 100644 --- a/flake.nix +++ b/flake.nix @@ -4,11 +4,10 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-23.11"; unstable.url = "nixpkgs/nixos-unstable"; - pkgs-cargo2nix.url = "github:cargo2nix/cargo2nix"; typeshare.url = "github:1Password/typeshare"; }; - outputs = { self, nixpkgs, unstable, pkgs-cargo2nix, typeshare, ... }: + outputs = { self, nixpkgs, unstable, typeshare, ... }: let version = builtins.string 0 8 self.lastModifiedDate; supportedSystems = [ "x86_64-linux" ]; @@ -18,7 +17,6 @@ let pkgs = import nixpkgs { system = "x86_64-linux"; }; pkgs-unstable = import unstable { system = "x86_64-linux"; }; - cargo2nix = pkgs-cargo2nix.packages."x86_64-linux"; in pkgs.mkShell { name = "ld-tools-devshell"; @@ -26,8 +24,6 @@ pkgs.cargo-nextest pkgs.clang pkgs.crate2nix - pkgs.entr - pkgs.glade pkgs.glib pkgs.gst_all_1.gst-plugins-bad pkgs.gst_all_1.gst-plugins-base @@ -42,6 +38,8 @@ pkgs.pkg-config pkgs.rustup pkgs.sqlite + pkgs.cargo-nextest + pkgs.wasm-pack pkgs.sqlx-cli pkgs.udev pkgs.wasm-pack @@ -50,5 +48,51 @@ LIBCLANG_PATH="${pkgs.llvmPackages.libclang.lib}/lib"; ENV = "dev"; }; + + packages."x86_64-linux" = + let + pkgs = import nixpkgs { system = "x86_64-linux"; }; + + gtkNativeInputs = [ + pkgs.pkg-config + pkgs.gtk4 + pkgs.libadwaita + ]; + + cargoOverrides = pkgs: pkgs.buildRustCrate.override { + defaultCrateOverrides = pkgs.defaultCrateOverrides // { + gobject-sys = attrs: { nativeBuildInputs = gtkNativeInputs; }; + gio-sys = attrs: { nativeBuildInputs = gtkNativeInputs; }; + gdk-pixbuf-sys = attrs: { nativeBuildInputs = gtkNativeInputs; }; + libadwaita-sys = attrs: { nativeBuildInputs = gtkNativeInputs; }; + + dashboard = attrs: { nativeBuildInputs = gtkNativeInputs; }; + fitnesstrax = attrs: { nativeBuildInputs = gtkNativeInputs; }; + }; + }; + + cargo_nix = pkgs.callPackage ./Cargo.nix { + nixpkgs = nixpkgs; + buildRustCrateForPkgs = cargoOverrides; + }; + + in rec { + cyberpunk-splash = cargo_nix.workspaceMembers.cyberpunk-splash.build; + dashboard = cargo_nix.workspaceMembers.dashboard.build; + file-service = cargo_nix.workspaceMembers.file-service.build; + fitnesstrax = cargo_nix.workspaceMembers.fitnesstrax.build; + + all = pkgs.symlinkJoin { + name = "all"; + paths = [ + cyberpunk-splash + dashboard + file-service + fitnesstrax + ]; + }; + + default = all; + }; }; }