From d6bca7084090b8519d0b881b6d78f2db19afc0d9 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 13 Feb 2021 14:38:01 +0100 Subject: chore(users/Profpatsch/netencode): move nom dependencies to pkgset Change-Id: I7393f60e4b29f24399d681d4546ac35140650d1a Reviewed-on: https://cl.tvl.fyi/c/depot/+/2524 Tested-by: BuildkiteCI Reviewed-by: Profpatsch --- users/Profpatsch/netencode/default.nix | 24 +----------------------- users/Profpatsch/rust-crates.nix | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/users/Profpatsch/netencode/default.nix b/users/Profpatsch/netencode/default.nix index a54a946d6e0a..95d05a6ac7f5 100644 --- a/users/Profpatsch/netencode/default.nix +++ b/users/Profpatsch/netencode/default.nix @@ -6,32 +6,10 @@ let writers; }; - version-check = pkgs.buildRustCrate { - pname = "version-check"; - version = "0.9.2"; - crateName = "version-check"; - sha256 = "1vwvc1mzwv8ana9jv8z933p2xzgj1533qwwl5zr8mi89azyhq21v"; - }; - memchr = pkgs.buildRustCrate { - pname = "memchr"; - version = "2.3.3"; - crateName = "memchr"; - sha256 = "1ivxvlswglk6wd46gadkbbsknr94gwryk6y21v64ja7x4icrpihw"; - }; - nom = pkgs.buildRustCrate { - pname = "nom"; - version = "5.1.1"; - crateName = "nom"; - sha256 = "1gb4r6mjwd645jqh02nhn60i7qkw8cgy3xq1r4clnmvz3cmkv1l0"; - dependencies = [ memchr ]; - buildDependencies = [ version-check ]; - features = [ "std" "alloc" ]; - }; - netencode-rs-common = tests: imports.writers.rustSimpleLib { name = "netencode"; dependencies = [ - nom + depot.users.Profpatsch.rust-crates.nom depot.users.Profpatsch.execline.exec-helpers ]; buildTests = tests; diff --git a/users/Profpatsch/rust-crates.nix b/users/Profpatsch/rust-crates.nix index 96734187eadb..e6a191f70f4b 100644 --- a/users/Profpatsch/rust-crates.nix +++ b/users/Profpatsch/rust-crates.nix @@ -96,4 +96,27 @@ rec { sha256 = "0dggj4s0cq69bn63q9nqzzay5acmwl33nrbhjjsh5xys8sk2x4jw"; }; + version-check = pkgs.buildRustCrate { + pname = "version-check"; + version = "0.9.2"; + crateName = "version-check"; + sha256 = "1vwvc1mzwv8ana9jv8z933p2xzgj1533qwwl5zr8mi89azyhq21v"; + }; + + memchr = pkgs.buildRustCrate { + pname = "memchr"; + version = "2.3.3"; + crateName = "memchr"; + sha256 = "1ivxvlswglk6wd46gadkbbsknr94gwryk6y21v64ja7x4icrpihw"; + }; + nom = pkgs.buildRustCrate { + pname = "nom"; + version = "5.1.1"; + crateName = "nom"; + sha256 = "1gb4r6mjwd645jqh02nhn60i7qkw8cgy3xq1r4clnmvz3cmkv1l0"; + dependencies = [ memchr ]; + buildDependencies = [ version-check ]; + features = [ "std" "alloc" ]; + }; + } -- cgit 1.4.1