From 0133fdc737286a678fbc46a97810dfb152588c77 Mon Sep 17 00:00:00 2001 From: sterni Date: Fri, 2 Apr 2021 21:59:25 +0200 Subject: chore: move all 3p buildRustCrate derivations to //third_party Profpatsch and me are basically the only users of depot.users.Profpatsch.writers.rustSimple*. To pull in the odd dependency we usually use buildRustCrate which is rather convenient. However we've picked up the bad habit of inlining these in a let somewhere instead of managing them in a more central location although there has been an (unsuccesful) attempt at this in //users/Profpatsch/rust-crates.nix. This CL moves all buildRustCrate based derivations into third_party.rust-crates and deletes any duplicate derivations we have accumulated in the tree. Change-Id: I8f68b95ebd546708e9af07dca36d72dba9ca8c77 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2769 Tested-by: BuildkiteCI Reviewed-by: tazjin Reviewed-by: Profpatsch --- users/sterni/nint/default.nix | 41 +++-------------------------------------- 1 file changed, 3 insertions(+), 38 deletions(-) (limited to 'users/sterni/nint') diff --git a/users/sterni/nint/default.nix b/users/sterni/nint/default.nix index 69ca7283a50f..a7952393c6db 100644 --- a/users/sterni/nint/default.nix +++ b/users/sterni/nint/default.nix @@ -4,46 +4,11 @@ let inherit (depot.users.Profpatsch.writers) rustSimpleBin ; - - inherit (pkgs) - buildRustCrate - ; - - serde = buildRustCrate { - pname = "serde"; - crateName = "serde"; - version = "1.0.123"; - sha256 = "05xl2s1vpf3p7fi2yc9qlzw88d5ap0z3qmhmd7axa6pp9pn1s5xc"; - features = [ "std" ]; - }; - - ryu = buildRustCrate { - pname = "ryu"; - version = "1.0.5"; - crateName = "ryu"; - sha256 = "060y2ln1csix593ingwxr2y3wl236ls0ly1ffkv39h5im7xydhrc"; - }; - - itoa = buildRustCrate { - pname = "itoa"; - version = "0.4.7"; - crateName = "itoa"; - sha256 = "0079jlkcmcaw37wljrvb6r3dqq15nfahkqnl5npvlpdvkg31k11x"; - }; - - serde_json = buildRustCrate { - pname = "serde_json"; - version = "1.0.62"; - crateName = "serde_json"; - sha256 = "0sgc8dycigq0nxr4j613m4q733alfb2i10s6nz80lsbbqgrka21q"; - dependencies = [ serde ryu itoa ]; - features = [ "std" ]; - edition = "2018"; - }; - in rustSimpleBin { name = "nint"; - dependencies = [ serde_json ]; + dependencies = [ + depot.third_party.rust-crates.serde_json + ]; } (builtins.readFile ./nint.rs) -- cgit 1.4.1