feat(users/Profpatsch/writers): make testing default for rustSimple r/2434

This way we don’t have to explicitely wrap the rust crate with a
`testRustSimple`, but it will be done automatically, unless `doCheck`
is set to `false`.

Change-Id: I32a81821eeff620e7da57332b0873495bb85a843
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2841
Tested-by: BuildkiteCI
Reviewed-by: Profpatsch <mail@profpatsch.de>
Reviewed-by: sterni <sternenseemann@systemli.org>

1 files changed, 10 insertions, 5 deletions

diff --git a/users/Profpatsch/writers/default.nix b/users/Profpatsch/writers/default.nix
index ee3ac7bda782..3cb105b5ed1f 100644
--- a/users/Profpatsch/writers/default.nix
+++ b/users/Profpatsch/writers/default.nix
@@ -78,8 +78,11 @@ let
   rustSimpleBin = {
     name,
     dependencies ? [],
+    doCheck ? true,
     ...
-  }@args: src: pkgs.buildRustCrate ({
+  }@args: src:
+    (if doCheck then testRustSimple else pkgs.lib.id)
+    (pkgs.buildRustCrate ({
       pname = name;
       version = "1.0.0";
       crateName = name;
@@ -93,13 +96,16 @@ let
         cp "$srcPath" $out/src/bin/${name}.rs
         find $out
       '';
-    } // args);
+    } // args));
 
   rustSimpleLib = {
     name,
     dependencies ? [],
+    doCheck ? true,
     ...
-  }@args: src: pkgs.buildRustCrate ({
+  }@args: src:
+    (if doCheck then testRustSimple else pkgs.lib.id)
+    (pkgs.buildRustCrate ({
       pname = name;
       version = "1.0.0";
       crateName = name;
@@ -112,7 +118,7 @@ let
         cp "$srcPath" $out/src/lib.rs
         find $out
       '';
-    } // args);
+    } // args));
 
   /* Takes a `buildRustCrate` derivation as an input,
     * builds it with `{ buildTests = true; }` and runs
@@ -146,6 +152,5 @@ in {
     rustSimple
     rustSimpleBin
     rustSimpleLib
-    testRustSimple
     ;
 }