diff options
author | Pierre-Etienne Meunier <pierre-etienne.meunier@mu.ie> | 2019-01-15 21:36:36 +0000 |
---|---|---|
committer | Vladyslav M <dywedir@pm.me> | 2019-01-15 23:36:36 +0200 |
commit | 121318a9b47fa6422f0e7e44343a05067c4293c6 (patch) | |
tree | d96f91b2c1eda07a9c1de7de52164d5c805337be | |
parent | fcb4d117577bf52ff81d64a19d8a784469b63819 (diff) |
toml2nix: init at 0.1.1 (#53883)
-rw-r--r-- | pkgs/build-support/rust/crates-io.nix | 73 | ||||
-rw-r--r-- | pkgs/tools/toml2nix/default.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 92 insertions, 1 deletions
diff --git a/pkgs/build-support/rust/crates-io.nix b/pkgs/build-support/rust/crates-io.nix index b03f52d35096..f312cd6e4903 100644 --- a/pkgs/build-support/rust/crates-io.nix +++ b/pkgs/build-support/rust/crates-io.nix @@ -4,7 +4,6 @@ let inherit (lib.lists) fold; inherit (lib.attrsets) recursiveUpdate; in rec { - # aho-corasick-0.6.8 crates.aho_corasick."0.6.8" = deps: { features?(features_.aho_corasick."0.6.8" deps {}) }: buildRustCrate { @@ -1457,6 +1456,38 @@ rec { # end +# serde-1.0.84 + + crates.serde."1.0.84" = deps: { features?(features_.serde."1.0.84" deps {}) }: buildRustCrate { + crateName = "serde"; + version = "1.0.84"; + authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ]; + sha256 = "1x40cvvkbkz592jflwbfbxhim3wxdqp9dy0qxjw13ra7q57b29gy"; + build = "build.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."serde"."1.0.84" or {}); + }; + features_.serde."1.0.84" = deps: f: updateFeatures f (rec { + serde = fold recursiveUpdate {} [ + { "1.0.84".default = (f.serde."1.0.84".default or true); } + { "1.0.84".serde_derive = + (f.serde."1.0.84".serde_derive or false) || + (f.serde."1.0.84".derive or false) || + (serde."1.0.84"."derive" or false); } + { "1.0.84".std = + (f.serde."1.0.84".std or false) || + (f.serde."1.0.84".default or false) || + (serde."1.0.84"."default" or false); } + { "1.0.84".unstable = + (f.serde."1.0.84".unstable or false) || + (f.serde."1.0.84".alloc or false) || + (serde."1.0.84"."alloc" or false); } + ]; + }) []; + + +# end # serde_derive-1.0.80 crates.serde_derive."1.0.80" = deps: { features?(features_.serde_derive."1.0.80" deps {}) }: buildRustCrate { @@ -1745,6 +1776,26 @@ rec { # end +# toml-0.4.10 + + crates.toml."0.4.10" = deps: { features?(features_.toml."0.4.10" deps {}) }: buildRustCrate { + crateName = "toml"; + version = "0.4.10"; + authors = [ "Alex Crichton <alex@alexcrichton.com>" ]; + sha256 = "0fs4kxl86w3kmgwcgcv23nk79zagayz1spg281r83w0ywf88d6f1"; + dependencies = mapFeatures features ([ + (crates."serde"."${deps."toml"."0.4.10"."serde"}" deps) + ]); + }; + features_.toml."0.4.10" = deps: f: updateFeatures f (rec { + serde."${deps.toml."0.4.10".serde}".default = true; + toml."0.4.10".default = (f.toml."0.4.10".default or true); + }) [ + (features_.serde."${deps."toml"."0.4.10"."serde"}" deps) + ]; + + +# end # toml-0.4.8 crates.toml."0.4.8" = deps: { features?(features_.toml."0.4.8" deps {}) }: buildRustCrate { @@ -1765,6 +1816,26 @@ rec { # end +# toml2nix-0.1.1 + + crates.toml2nix."0.1.1" = deps: { features?(features_.toml2nix."0.1.1" deps {}) }: buildRustCrate { + crateName = "toml2nix"; + version = "0.1.1"; + authors = [ "Pierre-Étienne Meunier <pierre-etienne.meunier@inria.fr>" ]; + sha256 = "167qyylp0s76h7r0n99as3jwry5mrn5q1wxh2sdwh51d5qnnw6b2"; + dependencies = mapFeatures features ([ + (crates."toml"."${deps."toml2nix"."0.1.1"."toml"}" deps) + ]); + }; + features_.toml2nix."0.1.1" = deps: f: updateFeatures f (rec { + toml."${deps.toml2nix."0.1.1".toml}".default = true; + toml2nix."0.1.1".default = (f.toml2nix."0.1.1".default or true); + }) [ + (features_.toml."${deps."toml2nix"."0.1.1"."toml"}" deps) + ]; + + +# end # ucd-util-0.1.1 crates.ucd_util."0.1.1" = deps: { features?(features_.ucd_util."0.1.1" deps {}) }: buildRustCrate { diff --git a/pkgs/tools/toml2nix/default.nix b/pkgs/tools/toml2nix/default.nix new file mode 100644 index 000000000000..ac4de4eee144 --- /dev/null +++ b/pkgs/tools/toml2nix/default.nix @@ -0,0 +1,18 @@ +# Generated by carnix 0.9.7: carnix generate-nix +{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }: +with buildRustCrateHelpers; +let inherit (lib.lists) fold; + inherit (lib.attrsets) recursiveUpdate; +in +let crates = cratesIO; in +rec { + toml2nix = crates.crates.toml2nix."0.1.1" deps; + __all = [ (toml2nix {}) ]; + deps.serde."1.0.84" = {}; + deps.toml."0.4.10" = { + serde = "1.0.84"; + }; + deps.toml2nix."0.1.1" = { + toml = "0.4.10"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f5c172cdb73..d57eaa9077bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5815,6 +5815,8 @@ in tokei = callPackage ../development/tools/misc/tokei { }; + toml2nix = (callPackage ../tools/toml2nix { }).toml2nix { }; + tor = callPackage ../tools/security/tor { openssl = openssl_1_1; # remove this, when libevent's openssl is upgraded to 1_1_0 or newer. |