From eb41eef6127216543d8b28c9c423ac1be0a4ee24 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 23 Apr 2021 22:04:42 +0200 Subject: chore(nix): move rustSimple from users.Profpatsch.writers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I think it’s solid enough to use in a wider context. Change-Id: If53e8bbb6b90fa88d73fb42730db470e822ea182 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3055 Tested-by: BuildkiteCI Reviewed-by: sterni Reviewed-by: lukegb --- users/Profpatsch/netencode/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'users/Profpatsch/netencode/default.nix') diff --git a/users/Profpatsch/netencode/default.nix b/users/Profpatsch/netencode/default.nix index 33209276f9..6662e622e1 100644 --- a/users/Profpatsch/netencode/default.nix +++ b/users/Profpatsch/netencode/default.nix @@ -1,12 +1,7 @@ { depot, pkgs, lib, ... }: let - imports = { - inherit (depot.users.Profpatsch) - writers; - }; - - netencode-rs = imports.writers.rustSimpleLib { + netencode-rs = depot.nix.writers.rustSimpleLib { name = "netencode"; dependencies = [ depot.third_party.rust-crates.nom @@ -18,14 +13,14 @@ let gen = import ./gen.nix { inherit lib; }; - pretty-rs = imports.writers.rustSimpleLib { + pretty-rs = depot.nix.writers.rustSimpleLib { name = "netencode-pretty"; dependencies = [ netencode-rs ]; } (builtins.readFile ./pretty.rs); - pretty = depot.users.Profpatsch.writers.rustSimple { + pretty = depot.nix.writers.rustSimple { name = "netencode-pretty"; dependencies = [ netencode-rs @@ -48,7 +43,7 @@ let } ''; - netencode-mustache = imports.writers.rustSimple { + netencode-mustache = depot.nix.writers.rustSimple { name = "netencode_mustache"; dependencies = [ depot.users.Profpatsch.arglib.netencode.rust @@ -58,7 +53,7 @@ let } (builtins.readFile ./netencode-mustache.rs); - record-get = imports.writers.rustSimple { + record-get = depot.nix.writers.rustSimple { name = "record-get"; dependencies = [ netencode-rs @@ -87,7 +82,7 @@ let } ''; - record-splice-env = imports.writers.rustSimple { + record-splice-env = depot.nix.writers.rustSimple { name = "record-splice-env"; dependencies = [ netencode-rs @@ -116,7 +111,7 @@ let } ''; - env-splice-record = imports.writers.rustSimple { + env-splice-record = depot.nix.writers.rustSimple { name = "env-splice-record"; dependencies = [ netencode-rs -- cgit 1.4.1