diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-12-06T07·12-0800 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-12-10T14·17+0000 |
| commit | 19fd6ffae53277067df2b38a7757c225427ce970 (patch) | |
| tree | 67791f8fc961e9ed6f1298ebf851b82c93884093 /third_party/overlays/tvl.nix | |
| parent | 2b4920c35582cddf0a8063e7d82d4de2e250732c (diff) | |
chore(third_party/overlays): disable nix aws integration r/7143
The Nix AWS integration is a complete dumpster-fire, the library it relies on (aws-sdk-cpp) accounts for more build time than cppnix itself, and its tests fail nondeterministically. We recently disabled it for nixpkgs' CI: https://github.com/NixOS/nixpkgs/pull/266443 Since it appears TVL does not use the AWS integration (correct me if I'm wrong) let's disable it here too. Hopefully someday cppnix will give up on it and just delete it. Change-Id: I71668c03379275b2083e59ff7c3a48b3bc7f5e48 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10202 Reviewed-by: flokli <flokli@flokli.de> Autosubmit: Adam Joseph <adam@westernsemico.com> Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/overlays/tvl.nix')
| -rw-r--r-- | third_party/overlays/tvl.nix | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index ccd2f21d1a53..000c234ea9f2 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -4,8 +4,15 @@ self: super: depot.nix.readTree.drvTargets { + nix_2_3 = (super.nix_2_3.override { + # flaky tests, long painful build, see https://github.com/NixOS/nixpkgs/pull/266443 + withAWS = false; + }); nix = self.nix_2_3; - nix_latest = super.nix; + nix_latest = super.nix.override ({ + # flaky tests, long painful build, see https://github.com/NixOS/nixpkgs/pull/266443 + withAWS = false; + }); # To match telega in emacs-overlay or wherever tdlib = super.tdlib.overrideAttrs (_: { @@ -74,7 +81,7 @@ depot.nix.readTree.drvTargets { }; })); - crate2nix = super.crate2nix.overrideAttrs (old: rec { + crate2nix = (super.crate2nix.override (_: { nix = self.nix_latest; })).overrideAttrs (old: rec { patches = old.patches ++ [ # run tests in debug mode, not release mode # https://github.com/nix-community/crate2nix/pull/301 |