diff options
| -rw-r--r-- | Cargo.lock | 8 | ||||
| -rw-r--r-- | Cargo.toml | 3 | ||||
| -rw-r--r-- | default.nix | 30 |
3 files changed, 34 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock index 4c8f6159bd98..f0cbad458c09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -303,6 +303,7 @@ dependencies = [ "hyper 0.11.25 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "md5 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "pulldown-cmark 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "r2d2 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -659,6 +660,11 @@ version = "0.3.54" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] +name = "getopts" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] name = "glob" version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1163,6 +1169,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2153,6 +2160,7 @@ dependencies = [ "checksum futures 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "1a70b146671de62ec8c8ed572219ca5d594d9b06c0b364d5e67b722fc559b48c" "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" "checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb" +"checksum getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "b900c08c1939860ce8b54dc6a89e26e00c04c380fd0e09796799bd7f12861e05" "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" "checksum h2 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "065fb096fc65bbfb9c765d48c9f3f1a21cdb25ba0d3f82105b38f30ddffa2f7e" "checksum hostname 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "58fab6e177434b0bb4cd344a4dabaa5bd6d7a8d792b1885aebcae7af1091d1cb" diff --git a/Cargo.toml b/Cargo.toml index e46808e5f16a..de71231ca0e9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,3 +27,6 @@ comrak = "0.2" md5 = "0.3.7" tokio = "0.1" tokio-timer = "0.2" + +[build-dependencies] +pulldown-cmark = "0.1" diff --git a/default.nix b/default.nix index 33794d1d573a..903ddb523e13 100644 --- a/default.nix +++ b/default.nix @@ -1,6 +1,7 @@ -# Generated by carnix 0.6.7: carnix --standalone -o carnix.nix Cargo.lock -with import <nixpkgs> {}; -let kernel = buildPlatform.parsed.kernel.name; +# Generated by carnix 0.6.7: carnix --standalone -o default.nix Cargo.lock +{ pkgs ? import <nixpkgs> {} }: + +with pkgs; let kernel = buildPlatform.parsed.kernel.name; abi = buildPlatform.parsed.abi.name; include = includedFiles: src: # The comments assume the `include` field of the Cargo.toml like: @@ -559,6 +560,13 @@ rec { sha256 = "07a5i47r8achc6gxsba3ga17h9gnh4b9a2cak8vjg4hx62aajkr4"; inherit dependencies buildDependencies features; }; + getopts_0_2_17_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { + crateName = "getopts"; + version = "0.2.17"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1rifkxn7njr2w1dsa29hrm26ywgcg8gv1ms00g3vs5mjiabxk0jv"; + inherit dependencies buildDependencies features; + }; glob_0_2_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate { crateName = "glob"; version = "0.2.11"; @@ -2342,6 +2350,7 @@ rec { }) [ clap_2_31_2_features entities_1_0_1_features lazy_static_1_0_0_features pest_1_0_6_features pest_derive_1_0_7_features regex_0_2_10_features twoway_0_1_8_features typed_arena_1_3_0_features unicode_categories_0_1_1_features ]; converse_0_1_0 = { features?(converse_0_1_0_features {}) }: converse_0_1_0_ { dependencies = mapFeatures features ([ actix_0_5_6 actix_web_0_5_4 chrono_0_4_2 comrak_0_2_9 diesel_1_2_2 env_logger_0_5_9 failure_0_1_1 futures_0_1_21 hyper_0_11_25 log_0_4_1 md5_0_3_7 r2d2_0_8_2 rand_0_4_2 reqwest_0_8_5 serde_1_0_43 serde_derive_1_0_43 serde_json_1_0_16 tera_0_11_6 tokio_0_1_5 tokio_timer_0_2_1 url_1_7_0 url_serde_0_2_0 ]); + buildDependencies = mapFeatures features ([ pulldown_cmark_0_1_2 ]); }; converse_0_1_0_features = f: updateFeatures f (rec { actix_0_5_6.default = true; @@ -2360,6 +2369,7 @@ rec { hyper_0_11_25.default = true; log_0_4_1.default = true; md5_0_3_7.default = true; + pulldown_cmark_0_1_2.default = true; r2d2_0_8_2.default = true; rand_0_4_2.default = true; reqwest_0_8_5.default = true; @@ -2371,7 +2381,7 @@ rec { tokio_timer_0_2_1.default = true; url_1_7_0.default = true; url_serde_0_2_0.default = true; - }) [ actix_0_5_6_features actix_web_0_5_4_features chrono_0_4_2_features comrak_0_2_9_features diesel_1_2_2_features env_logger_0_5_9_features failure_0_1_1_features futures_0_1_21_features hyper_0_11_25_features log_0_4_1_features md5_0_3_7_features r2d2_0_8_2_features rand_0_4_2_features reqwest_0_8_5_features serde_1_0_43_features serde_derive_1_0_43_features serde_json_1_0_16_features tera_0_11_6_features tokio_0_1_5_features tokio_timer_0_2_1_features url_1_7_0_features url_serde_0_2_0_features ]; + }) [ actix_0_5_6_features actix_web_0_5_4_features chrono_0_4_2_features comrak_0_2_9_features diesel_1_2_2_features env_logger_0_5_9_features failure_0_1_1_features futures_0_1_21_features hyper_0_11_25_features log_0_4_1_features md5_0_3_7_features r2d2_0_8_2_features rand_0_4_2_features reqwest_0_8_5_features serde_1_0_43_features serde_derive_1_0_43_features serde_json_1_0_16_features tera_0_11_6_features tokio_0_1_5_features tokio_timer_0_2_1_features url_1_7_0_features url_serde_0_2_0_features pulldown_cmark_0_1_2_features ]; cookie_0_10_1 = { features?(cookie_0_10_1_features {}) }: cookie_0_10_1_ { dependencies = mapFeatures features ([ time_0_1_39 ] ++ (if features.cookie_0_10_1.base64 or false then [ base64_0_6_0 ] else []) @@ -3004,6 +3014,10 @@ rec { (f.gcc_0_3_54.parallel or false) || (gcc_0_3_54.parallel or false); }) []; + getopts_0_2_17 = { features?(getopts_0_2_17_features {}) }: getopts_0_2_17_ {}; + getopts_0_2_17_features = f: updateFeatures f (rec { + getopts_0_2_17.default = (f.getopts_0_2_17.default or true); + }) []; glob_0_2_11 = { features?(glob_0_2_11_features {}) }: glob_0_2_11_ {}; glob_0_2_11_features = f: updateFeatures f (rec { glob_0_2_11.default = (f.glob_0_2_11.default or true); @@ -3764,17 +3778,19 @@ rec { unicode_xid_0_1_0.default = true; }) [ unicode_xid_0_1_0_features ]; pulldown_cmark_0_1_2 = { features?(pulldown_cmark_0_1_2_features {}) }: pulldown_cmark_0_1_2_ { - dependencies = mapFeatures features ([ bitflags_0_9_1 ]); + dependencies = mapFeatures features ([ bitflags_0_9_1 ] + ++ (if features.pulldown_cmark_0_1_2.getopts or false then [ getopts_0_2_17 ] else [])); features = mkFeatures (features.pulldown_cmark_0_1_2 or {}); }; pulldown_cmark_0_1_2_features = f: updateFeatures f (rec { bitflags_0_9_1.default = true; + getopts_0_2_17.default = true; pulldown_cmark_0_1_2.default = (f.pulldown_cmark_0_1_2.default or true); pulldown_cmark_0_1_2.getopts = (f.pulldown_cmark_0_1_2.getopts or false) || (f.pulldown_cmark_0_1_2.default or false) || (pulldown_cmark_0_1_2.default or false); - }) [ bitflags_0_9_1_features ]; + }) [ bitflags_0_9_1_features getopts_0_2_17_features ]; quick_error_1_2_1 = { features?(quick_error_1_2_1_features {}) }: quick_error_1_2_1_ {}; quick_error_1_2_1_features = f: updateFeatures f (rec { quick_error_1_2_1.default = (f.quick_error_1_2_1.default or true); @@ -5156,4 +5172,4 @@ rec { winapi_build_0_1_1.default = true; ws2_32_sys_0_2_1.default = (f.ws2_32_sys_0_2_1.default or true); }) [ winapi_0_2_8_features winapi_build_0_1_1_features ]; -}.converse_0_1_0 {} +} |