From a424084668d2c182049160f4da1fc24f63e3b84a Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 14 Feb 2021 15:24:49 +0100 Subject: pkgs/sternenseemann/temp: test using testRustSimple This means we don't need the -common machinery anymore and can remove the -tests attribute altogether. --- pkgs/sternenseemann/default.nix | 2 +- pkgs/sternenseemann/rust/default.nix | 22 +++++++++------------- 2 files changed, 10 insertions(+), 14 deletions(-) (limited to 'pkgs/sternenseemann') diff --git a/pkgs/sternenseemann/default.nix b/pkgs/sternenseemann/default.nix index 8ee48ce5..c41cb3fa 100644 --- a/pkgs/sternenseemann/default.nix +++ b/pkgs/sternenseemann/default.nix @@ -36,6 +36,7 @@ let rust = callPackage ./rust { inherit (profpatsch) writeRustSimpleLib + testRustSimple ; }; @@ -83,7 +84,6 @@ lib.fix (self: { inherit (rust) temp - temp-tests ; # don't bother hydra with trivial text substitution diff --git a/pkgs/sternenseemann/rust/default.nix b/pkgs/sternenseemann/rust/default.nix index 787cf2e1..f79644a8 100644 --- a/pkgs/sternenseemann/rust/default.nix +++ b/pkgs/sternenseemann/rust/default.nix @@ -1,24 +1,20 @@ { writeRustSimpleLib -, buildRustCrate +, testRustSimple }: let - temp-common = tests: writeRustSimpleLib "temp" { - buildTests = tests; - release = false; - verbose = true; - meta = { - description = "Tiny temp dir/file crate for rust"; - }; - } ./temp.rs; - - temp = temp-common false; - temp-tests = temp-common true; + temp = testRustSimple + (writeRustSimpleLib "temp" { + release = false; + verbose = true; + meta = { + description = "Tiny temp dir/file crate for rust"; + }; + } ./temp.rs); in { inherit temp - temp-tests ; } -- cgit 1.4.1