mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(3p/overlays): Use overrideAttrs to override shell derivations

Browse source 
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>
This commit is contained in:
Vincent Ambo 2022-02-02 13:41:48 +03:00 committed by tazjin
parent a49358d8aa
commit 5540c80d87
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
third_party/overlays/tvl.nix vendored
View file

@ -46,9 +46,11 @@ self: super: {
nix-serve = super.nix-serve.override { nix = super.nix_2_3; }; nix-serve = super.nix-serve.override { nix = super.nix_2_3; };
# Avoid builds of mkShell derivations in CI. # Avoid builds of mkShell derivations in CI.
mkShell = super.lib.makeOverridable (args: (super.mkShell args) // { mkShell = super.lib.makeOverridable (args: (super.mkShell args).overrideAttrs (_: {
passthru = {
meta.ci.skip = true; meta.ci.skip = true;
}); };
}));
# bump nixpkgs-fmt to a version that doesn't touch whitespace in # bump nixpkgs-fmt to a version that doesn't touch whitespace in
# strings # strings