diff options
| author | Aspen Smith <root@gws.fyi> | 2024-07-28T16·58-0400 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2024-08-01T10·06+0000 |
| commit | 756539a59687f9abc9fef5fce50b5590c35a242f (patch) | |
| tree | 06bd57732c359bb5b366b225043b59c6dd2f2ad9 /third_party/overlays/tvl.nix | |
| parent | bdf82698592acc3f27fa7a9aa612ea1ad7970437 (diff) | |
chore(3p/sources): Bump channels & overlays (2024-07-28) r/8435
* Treewide: re-run depotfmt * //third_party/nixpkgs:html5validator: build with Python 3.11, dependency openstackdocstheme doesn't support 3.12 * //users/sterni/machines/ingeborg: adapt to poorly handled fcgiwrap module API change: https://github.com/NixOS/nixpkgs/pull/318599 * //tvix/*-go: regenerate protobuf files * //third_party/nixpkgs:treefmt: Remove patch for merged pull request * //users/flokli/ipu6-softisp: rebase, drop upstreamed kernel patches Change-Id: Ie4e0df007c287e8cd6207683a9a25838aa5bd39a Reviewed-on: https://cl.tvl.fyi/c/depot/+/11971 Autosubmit: sterni <sternenseemann@systemli.org> Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: flokli <flokli@flokli.de> Reviewed-by: aspen <root@gws.fyi> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: Ilan Joselevich <personal@ilanjoselevich.com>
Diffstat (limited to 'third_party/overlays/tvl.nix')
| -rw-r--r-- | third_party/overlays/tvl.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 5c654287b275..217d2017f24e 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -140,6 +140,11 @@ depot.nix.readTree.drvTargets { patches = (old.patches or [ ]) ++ [ ./patches/tpm2-pkcs11-190-dbupgrade.patch ]; }); + # Dependency isn't supported by Python 3.12 + html5validator = super.html5validator.override { + python3 = self.python311; + }; + # macFUSE bump containing fix for https://github.com/osxfuse/osxfuse/issues/974 # https://github.com/NixOS/nixpkgs/pull/320197 fuse = @@ -152,9 +157,4 @@ depot.nix.readTree.drvTargets { hash = "sha256-ucTzO2qdN4QkowMVvC3+4pjEVjbwMsB0xFk+bvQxwtQ="; }; }) else super.fuse; - - treefmt = super.treefmt.overrideAttrs (old: { - # https://github.com/numtide/treefmt/pull/328 - patches = old.patches or [ ] ++ [ ./patches/treefmt-fix-no-cache.patch ]; - }); } |