about summary refs log tree commit diff
path: root/tvix/utils.nix
diff options
context:
space:
mode:
authorIlan Joselevich <personal@ilanjoselevich.com>2024-08-28T22·49+0300
committerclbot <clbot@tvl.fyi>2024-08-30T12·09+0000
commit0979379980ef9bcd019f07020455b73ac3816676 (patch)
tree416fda6d644e8b766788c29fff7004350afdfccd /tvix/utils.nix
parentf2d9255a98841e64a1640298391a77783dacf233 (diff)
fix(tvix/utils): Add missing src filtering for nix-compat-derive[-tests] r/8613
Change-Id: I2beed2cdcb5423d3594562e0011b1cb889add07f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12390
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com>
Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/utils.nix')
-rw-r--r--tvix/utils.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/tvix/utils.nix b/tvix/utils.nix
index c398930e7587..6fa99e63eb05 100644
--- a/tvix/utils.nix
+++ b/tvix/utils.nix
@@ -34,7 +34,7 @@
       fileset = lib.fileset.intersection
         (lib.fileset.fromSource root) # We build our final fileset from the original src
         (lib.fileset.unions ([
-          (root + "/src")
+          (lib.fileset.maybeMissing (root + "/src")) # src may be missing if the crate just has tests for example
           (lib.fileset.fileFilter (f: f.hasExt "rs") root)
         ] ++ lib.optionals cargoSupport [
           (lib.fileset.fileFilter (f: f.name == "Cargo.toml") root)
@@ -62,6 +62,15 @@
           extraFileset = root + "/testdata";
         };
       };
+
+      nix-compat-derive = prev: {
+        src = depot.tvix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
+      };
+
+      nix-compat-derive-tests = prev: {
+        src = depot.tvix.utils.filterRustCrateSrc { root = prev.src.origSrc; };
+      };
+
       tvix-build = prev: {
         src = depot.tvix.utils.filterRustCrateSrc rec {
           root = prev.src.origSrc;