diff --git a/home-manager/packages/rust-scripts/Cargo.lock b/home-manager/packages/rust-scripts/Cargo.lock index 4cc2f7f4..607af9ed 100644 --- a/home-manager/packages/rust-scripts/Cargo.lock +++ b/home-manager/packages/rust-scripts/Cargo.lock @@ -109,30 +109,11 @@ name = "fuchsia-zircon-sys" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "iso8601" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "itoa" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "kairos" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "chrono 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "iso8601 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "kernel32-sys" version = "0.2.2" @@ -165,14 +146,6 @@ dependencies = [ "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "memchr" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "nix" version = "0.5.1" @@ -182,14 +155,6 @@ dependencies = [ "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "nom" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "num-integer" version = "0.1.38" @@ -246,7 +211,6 @@ dependencies = [ "chrono 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "dialog 0.1.0", "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "kairos 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)", @@ -446,17 +410,13 @@ dependencies = [ "checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3" "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" -"checksum iso8601 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "83e03bd24a535789afdce1c8274f2f5dc1a265c39e937884426ecd5322285d1e" "checksum itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c069bbec61e1ca5a596166e55dfe4773ff745c3d16b700013bcaff9a6df2c682" -"checksum kairos 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f24b8cc4224806c5952ed784bb76ba52c3b36950fcdd182b6e299b9a8029cb7c" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e6412c5e2ad9584b0b8e979393122026cdd6d2a80b933f890dcd694ddbe73739" "checksum libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)" = "b685088df2b950fccadf07a7187c8ef846a959c142338a48f9dc0b94517eb5f1" "checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e" "checksum log 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6fddaa003a65722a7fb9e26b0ce95921fe4ba590542ced664d8ce2fa26f9f3ac" -"checksum memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a" "checksum nix 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bfb3ddedaa14746434a02041940495bf11325c22f6d36125d3bdd56090d50a79" -"checksum nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05aec50c70fd288702bcd93284a8444607f3292dbdf2a30de5ea5dcdbe72287b" "checksum num-integer 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "6ac0ea58d64a89d9d6b7688031b3be9358d6c919badcf7fbb0527ccfd891ee45" "checksum num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "775393e285254d2f5004596d69bb8bc1149754570dcc08cf30cabeba67955e28" "checksum proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "effdb53b25cdad54f8f48843d67398f7ef2e14f12c1b4cb4effc549a6462a4d6" diff --git a/home-manager/packages/rust-scripts/Cargo.nix b/home-manager/packages/rust-scripts/Cargo.nix index 0e526129..0c6fd03e 100644 --- a/home-manager/packages/rust-scripts/Cargo.nix +++ b/home-manager/packages/rust-scripts/Cargo.nix @@ -128,13 +128,6 @@ rec { sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; inherit dependencies buildDependencies features; }; - iso8601_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "iso8601"; - version = "0.2.0"; - authors = [ "Jan-Erik Rediger " "Hendrik Sollich " ]; - sha256 = "18zm5pnc26q1q8l65r702bcnvkdzzbdmsq96gxcwa00lxja7l2d4"; - inherit dependencies buildDependencies features; - }; itoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "itoa"; version = "0.4.1"; @@ -142,13 +135,6 @@ rec { sha256 = "1jyrsmrm5q4r2ipmq5hvvkqg0mgnlbk44lm7gr0v9ymvbrh2gbij"; inherit dependencies buildDependencies features; }; - kairos_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "kairos"; - version = "0.1.1"; - authors = [ "Matthias Beyer " ]; - sha256 = "15i75h698zsbb8m5q8ffia5q6r039r0gmxm9pyfmw9pn2gfxzgg9"; - inherit dependencies buildDependencies features; - }; kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "kernel32-sys"; version = "0.2.2"; @@ -186,13 +172,6 @@ rec { sha256 = "10f8wyygpff3i5j4v4bcmsy637vzsaah7qx615y74vibn3f8fbyd"; inherit dependencies buildDependencies features; }; - memchr_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "memchr"; - version = "1.0.2"; - authors = [ "Andrew Gallant " "bluss" ]; - sha256 = "0dfb8ifl9nrc9kzgd5z91q6qg87sh285q1ih7xgrsglmqfav9lg7"; - inherit dependencies buildDependencies features; - }; nix_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "nix"; version = "0.5.1"; @@ -200,13 +179,6 @@ rec { sha256 = "17dp0x440bl6a4dc3rxqnj7p2sx46isg2hhvdqpjkdlca84qd7b2"; inherit dependencies buildDependencies features; }; - nom_3_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { - crateName = "nom"; - version = "3.2.1"; - authors = [ "contact@geoffroycouprie.com" ]; - sha256 = "1vcllxrz9hdw6j25kn020ka3psz1vkaqh1hm3yfak2240zrxgi07"; - inherit dependencies buildDependencies features; - }; num_integer_0_1_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "num-integer"; version = "0.1.38"; @@ -655,13 +627,6 @@ rec { fuchsia_zircon_sys_0_3_3_features = f: updateFeatures f (rec { fuchsia_zircon_sys_0_3_3.default = (f.fuchsia_zircon_sys_0_3_3.default or true); }) []; - iso8601_0_2_0 = { features?(iso8601_0_2_0_features {}) }: iso8601_0_2_0_ { - dependencies = mapFeatures features ([ nom_3_2_1 ]); - }; - iso8601_0_2_0_features = f: updateFeatures f (rec { - iso8601_0_2_0.default = (f.iso8601_0_2_0.default or true); - nom_3_2_1.default = true; - }) [ nom_3_2_1_features ]; itoa_0_4_1 = { features?(itoa_0_4_1_features {}) }: itoa_0_4_1_ { features = mkFeatures (features.itoa_0_4_1 or {}); }; @@ -672,21 +637,6 @@ rec { (f.itoa_0_4_1.default or false) || (itoa_0_4_1.default or false); }) []; - kairos_0_1_1 = { features?(kairos_0_1_1_features {}) }: kairos_0_1_1_ { - dependencies = mapFeatures features ([ chrono_0_4_2 error_chain_0_11_0 iso8601_0_2_0 nom_3_2_1 ]); - features = mkFeatures (features.kairos_0_1_1 or {}); - }; - kairos_0_1_1_features = f: updateFeatures f (rec { - chrono_0_4_2.default = true; - error_chain_0_11_0.default = true; - iso8601_0_2_0.default = true; - kairos_0_1_1.default = (f.kairos_0_1_1.default or true); - kairos_0_1_1.filters = - (f.kairos_0_1_1.filters or false) || - (f.kairos_0_1_1.with-filters or false) || - (kairos_0_1_1.with-filters or false); - nom_3_2_1.default = true; - }) [ chrono_0_4_2_features error_chain_0_11_0_features iso8601_0_2_0_features nom_3_2_1_features ]; kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ { dependencies = mapFeatures features ([ winapi_0_2_8 ]); buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]); @@ -748,29 +698,6 @@ rec { cfg_if_0_1_3.default = true; log_0_4_2.default = (f.log_0_4_2.default or true); }) [ cfg_if_0_1_3_features ]; - memchr_1_0_2 = { features?(memchr_1_0_2_features {}) }: memchr_1_0_2_ { - dependencies = mapFeatures features ([ ] - ++ (if features.memchr_1_0_2.libc or false then [ libc_0_2_42 ] else [])); - features = mkFeatures (features.memchr_1_0_2 or {}); - }; - memchr_1_0_2_features = f: updateFeatures f (rec { - libc_0_2_42.default = (f.libc_0_2_42.default or false); - libc_0_2_42.use_std = - (f.libc_0_2_42.use_std or false) || - (memchr_1_0_2.use_std or false) || - (f.memchr_1_0_2.use_std or false); - memchr_1_0_2.default = (f.memchr_1_0_2.default or true); - memchr_1_0_2.libc = - (f.memchr_1_0_2.libc or false) || - (f.memchr_1_0_2.default or false) || - (memchr_1_0_2.default or false) || - (f.memchr_1_0_2.use_std or false) || - (memchr_1_0_2.use_std or false); - memchr_1_0_2.use_std = - (f.memchr_1_0_2.use_std or false) || - (f.memchr_1_0_2.default or false) || - (memchr_1_0_2.default or false); - }) [ libc_0_2_42_features ]; nix_0_5_1 = { features?(nix_0_5_1_features {}) }: nix_0_5_1_ { dependencies = mapFeatures features ([ bitflags_0_4_0 libc_0_2_42 ]); features = mkFeatures (features.nix_0_5_1 or {}); @@ -780,42 +707,6 @@ rec { libc_0_2_42.default = true; nix_0_5_1.default = (f.nix_0_5_1.default or true); }) [ bitflags_0_4_0_features libc_0_2_42_features ]; - nom_3_2_1 = { features?(nom_3_2_1_features {}) }: nom_3_2_1_ { - dependencies = mapFeatures features ([ memchr_1_0_2 ]); - features = mkFeatures (features.nom_3_2_1 or {}); - }; - nom_3_2_1_features = f: updateFeatures f (rec { - memchr_1_0_2.default = (f.memchr_1_0_2.default or false); - memchr_1_0_2.use_std = - (f.memchr_1_0_2.use_std or false) || - (nom_3_2_1.std or false) || - (f.nom_3_2_1.std or false); - nom_3_2_1.compiler_error = - (f.nom_3_2_1.compiler_error or false) || - (f.nom_3_2_1.nightly or false) || - (nom_3_2_1.nightly or false); - nom_3_2_1.default = (f.nom_3_2_1.default or true); - nom_3_2_1.lazy_static = - (f.nom_3_2_1.lazy_static or false) || - (f.nom_3_2_1.regexp_macros or false) || - (nom_3_2_1.regexp_macros or false); - nom_3_2_1.regex = - (f.nom_3_2_1.regex or false) || - (f.nom_3_2_1.regexp or false) || - (nom_3_2_1.regexp or false); - nom_3_2_1.regexp = - (f.nom_3_2_1.regexp or false) || - (f.nom_3_2_1.regexp_macros or false) || - (nom_3_2_1.regexp_macros or false); - nom_3_2_1.std = - (f.nom_3_2_1.std or false) || - (f.nom_3_2_1.default or false) || - (nom_3_2_1.default or false); - nom_3_2_1.stream = - (f.nom_3_2_1.stream or false) || - (f.nom_3_2_1.default or false) || - (nom_3_2_1.default or false); - }) [ memchr_1_0_2_features ]; num_integer_0_1_38 = { features?(num_integer_0_1_38_features {}) }: num_integer_0_1_38_ { dependencies = mapFeatures features ([ num_traits_0_2_4 ]); features = mkFeatures (features.num_integer_0_1_38 or {}); @@ -914,13 +805,12 @@ rec { redox_syscall_0_1_40.default = (f.redox_syscall_0_1_40.default or true); }) []; rust_scripts_0_1_0 = { features?(rust_scripts_0_1_0_features {}) }: rust_scripts_0_1_0_ { - dependencies = mapFeatures features ([ chrono_0_4_2 dialog_0_1_0 error_chain_0_11_0 kairos_0_1_1 lazy_static_1_0_1 serde_1_0_66 serde_derive_1_0_66 serde_yaml_0_7_4 task_hookrs_0_5_0 uuid_0_6_5 ]); + dependencies = mapFeatures features ([ chrono_0_4_2 dialog_0_1_0 error_chain_0_11_0 lazy_static_1_0_1 serde_1_0_66 serde_derive_1_0_66 serde_yaml_0_7_4 task_hookrs_0_5_0 uuid_0_6_5 ]); }; rust_scripts_0_1_0_features = f: updateFeatures f (rec { chrono_0_4_2.default = true; dialog_0_1_0.default = true; error_chain_0_11_0.default = true; - kairos_0_1_1.default = true; lazy_static_1_0_1.default = true; rust_scripts_0_1_0.default = (f.rust_scripts_0_1_0.default or true); serde_1_0_66.default = true; @@ -928,7 +818,7 @@ rec { serde_yaml_0_7_4.default = true; task_hookrs_0_5_0.default = true; uuid_0_6_5.default = true; - }) [ chrono_0_4_2_features dialog_0_1_0_features error_chain_0_11_0_features kairos_0_1_1_features lazy_static_1_0_1_features serde_1_0_66_features serde_derive_1_0_66_features serde_yaml_0_7_4_features task_hookrs_0_5_0_features uuid_0_6_5_features ]; + }) [ chrono_0_4_2_features dialog_0_1_0_features error_chain_0_11_0_features lazy_static_1_0_1_features serde_1_0_66_features serde_derive_1_0_66_features serde_yaml_0_7_4_features task_hookrs_0_5_0_features uuid_0_6_5_features ]; rustc_demangle_0_1_8 = { features?(rustc_demangle_0_1_8_features {}) }: rustc_demangle_0_1_8_ {}; rustc_demangle_0_1_8_features = f: updateFeatures f (rec { rustc_demangle_0_1_8.default = (f.rustc_demangle_0_1_8.default or true); diff --git a/home-manager/packages/rust-scripts/Cargo.toml b/home-manager/packages/rust-scripts/Cargo.toml index e1f5912e..b01d5002 100644 --- a/home-manager/packages/rust-scripts/Cargo.toml +++ b/home-manager/packages/rust-scripts/Cargo.toml @@ -9,7 +9,6 @@ task-hookrs = { path = "/home/maralorn/code/task-hookrs"} dialog = { path = "/home/maralorn/code/dialog-rs" } lazy_static = "1.0.0" uuid = "0.6" -kairos = "0.1.0" chrono = "0.4.2" error-chain = "0.11.0" serde_derive = "1.0"