about summary refs log tree commit diff
path: root/users/Profpatsch/netstring
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2021-03-15T21·32+0100
committersterni <sternenseemann@systemli.org>2021-03-15T22·16+0000
commit5d8490d2fc7a735f747704792d4fc7d779d6e471 (patch)
tree7a9e64d1252017126e3b86b23dd29948b8d4497e /users/Profpatsch/netstring
parent5b9229186face34fb612b8ecc1e4f94eed598bc9 (diff)
feat(users/Profpatsch): build attrset members on CI r/2282
Setting meta.targets to include all derivations in the different package
sets in Profpatsch's user folder makes them checked by CI until they do
the readTree refactor as promised.

To reduce code duplication we handle this in a simple function which is
exposed from nix.utils which may be a good place for depot specific bits
and bops we accumulate over time.

To get around the issue of too nested sets we perform the following
renames:

* users.Profpatsch.tests gets moved into its own directory
* users.Profpatsch.arglib.netencode now lives in its own file instead of
  the default.nix
* users.Profpatsch.netstring.tests gets moved into its own directory

Change-Id: Icd039c29d7760a711c1c53554504d6b0cd19e120
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2603
Tested-by: BuildkiteCI
Reviewed-by: Profpatsch <mail@profpatsch.de>
Diffstat (limited to 'users/Profpatsch/netstring')
-rw-r--r--users/Profpatsch/netstring/default.nix16
-rw-r--r--users/Profpatsch/netstring/tests/default.nix (renamed from users/Profpatsch/netstring/tests.nix)11
2 files changed, 10 insertions, 17 deletions
diff --git a/users/Profpatsch/netstring/default.nix b/users/Profpatsch/netstring/default.nix
index 3cf882d5a2..a1d6a1e77f 100644
--- a/users/Profpatsch/netstring/default.nix
+++ b/users/Profpatsch/netstring/default.nix
@@ -52,25 +52,11 @@ let
     }
   '';
 
-  tests = import ./tests.nix {
-    inherit
-      depot
-      pkgs
-      lib
-      python-netstring
-      rust-netstring
-      toNetstring
-      toNetstringKeyVal
-      ;
-  };
-
-in {
+in depot.nix.utils.drvTargets {
   inherit
     toNetstring
     toNetstringKeyVal
     python-netstring
     rust-netstring
-    tests
       ;
-
 }
diff --git a/users/Profpatsch/netstring/tests.nix b/users/Profpatsch/netstring/tests/default.nix
index 23141472d6..a9e6c9c688 100644
--- a/users/Profpatsch/netstring/tests.nix
+++ b/users/Profpatsch/netstring/tests/default.nix
@@ -1,7 +1,14 @@
-{ depot, lib, pkgs, python-netstring, rust-netstring, toNetstring, toNetstringKeyVal }:
+{ depot, lib, pkgs, ... }:
 
 let
 
+  inherit (depot.users.Profpatsch.netstring)
+    toNetstring
+    toNetstringKeyVal
+    python-netstring
+    rust-netstring
+    ;
+
   python-netstring-test = depot.users.Profpatsch.writers.python3 {
     name = "python-netstring-test";
     libraries = p: [
@@ -53,7 +60,7 @@ let
     }
   '';
 
-in {
+in depot.nix.utils.drvTargets {
   inherit
     python-netstring-test
     rust-netstring-test