diff options
| author | Vincent Ambo <mail@tazj.in> | 2022-02-02T10·41+0300 |
|---|---|---|
| committer | tazjin <tazjin@tvl.su> | 2022-02-02T13·36+0000 |
| commit | 5540c80d87a0f5653b7deaa111210b60af85449f (patch) | |
| tree | 1a79ed6e2fbeaa2201afecb488c81cccb1aba8ce /third_party | |
| parent | a49358d8aa1cb444503bbe1e104adf94c17d3425 (diff) | |
fix(3p/overlays): Use overrideAttrs to override shell derivations r/3741
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 <eugene.zemtsov@gmail.com> Autosubmit: tazjin <tazjin@tvl.su>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/overlays/tvl.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 1b2f2b9792..7b2bb12fca 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 |