From 5540c80d87a0f5653b7deaa111210b60af85449f Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 2 Feb 2022 13:41:48 +0300 Subject: fix(3p/overlays): Use overrideAttrs to override shell derivations Otherwise the skipping will be nuked by the subsequent readTree change (cl/5186). Change-Id: Ia1101d5073ecf892fb1881d6ee4a723c5d572c84 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5188 Tested-by: BuildkiteCI Reviewed-by: ezemtsov Autosubmit: tazjin --- third_party/overlays/tvl.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 1b2f2b9792f6..7b2bb12fcae5 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -46,9 +46,11 @@ self: super: { nix-serve = super.nix-serve.override { nix = super.nix_2_3; }; # Avoid builds of mkShell derivations in CI. - mkShell = super.lib.makeOverridable (args: (super.mkShell args) // { - meta.ci.skip = true; - }); + mkShell = super.lib.makeOverridable (args: (super.mkShell args).overrideAttrs (_: { + passthru = { + meta.ci.skip = true; + }; + })); # bump nixpkgs-fmt to a version that doesn't touch whitespace in # strings -- cgit 1.4.1