about summary refs log tree commit diff
path: root/third_party/overlays
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2024-03-09T12·15+0100
committerclbot <clbot@tvl.fyi>2024-04-16T16·15+0000
commitdce1a7480c283e5298f5f8ecdb1df95f164c7576 (patch)
treecac9d8a6cba176b75ddfeff48baeefb55d0a7b81 /third_party/overlays
parent80d0b305a74885850aae5f5941d2c9fccbeaec9b (diff)
feat(nix/buildkite): use keys based on drvPaths where possible r/7939
This will make it easier to emit intra pipeline dependencies based on
the dependencies between derivations contained therein later.

A consequence of this change is that it is no longer possible to have
the same derivation be exposed as multiple steps in the pipeline. I
doubt that having this is very useful, though.

Keys for extraSteps are not changed significantly, but are distinguished
from derivation based steps (with prefix `drv-*`) by their prefix
`extra-step-*`.

Change-Id: I4165900e512b3967fa3ca4cd5bffd44bc15915fc
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11115
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: ezemtsov <eugene.zemtsov@gmail.com>
Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/overlays')
-rw-r--r--third_party/overlays/tvl.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix
index 33031f94c288..23f56e2f98af 100644
--- a/third_party/overlays/tvl.nix
+++ b/third_party/overlays/tvl.nix
@@ -8,7 +8,14 @@ depot.nix.readTree.drvTargets {
     # flaky tests, long painful build, see https://github.com/NixOS/nixpkgs/pull/266443
     withAWS = false;
   });
-  nix = self.nix_2_3;
+  nix = self.nix_2_3 // {
+    # avoid duplicate pipeline step
+    meta = self.nix_2_3.meta or { } // {
+      ci = self.nix_2_3.meta.ci or { } // {
+        skip = true;
+      };
+    };
+  };
   nix_latest = super.nix.override ({
     # flaky tests, long painful build, see https://github.com/NixOS/nixpkgs/pull/266443
     withAWS = false;