diff options
author | Vincent Ambo <tazjin@tvl.su> | 2024-07-01T09·47+0300 |
---|---|---|
committer | tazjin <tazjin@tvl.su> | 2024-07-01T17·42+0000 |
commit | 4b2f3c5454a249c6fbd7697a5297c6d4db92ef3e (patch) | |
tree | 1967abbea143ca7ed1a106edacecf4ad08cde9b1 /third_party/overlays/tvl.nix | |
parent | 17bdf9a5748be02d5cc36a7be4689788c49a33fe (diff) |
chore(3p/sources): bump to OpenSSH vulnerability hotfix r/8337
See https://github.com/NixOS/nixpkgs/pull/323753 for details. Changes: * git: temporarily comment out dottime patch (it doesn't apply, but it's not critical) * third-party/cgit: use an older git version where dottime patch still applies * 3p/crate2nix: remove crate2nix patches included in latest release * tvix: remove unneeded defaultCrateOverrides (upstreamed to nixpkgs) * tvix: regenerate Cargo.nix * tvix/nix-compat: remove unnused AtermWriteable::aterm_bytes pub(crate) function * tvix/nix-compat: remove redundant trait bounds * tvix/glue: use clone_into() to set drv.{builder,system} * tools/crate2nix: apply workaround for https://github.com/numtide/treefmt/issues/327 * toold/depotfmt: expose treefmt config as passthru * tools/crate2nix: undo some more hacks in the crate2nix-check drv Change-Id: Ifbcedeb3e8f81b2f6ec1dbf10189bfa6dfd9c75c Co-Authored-By: Florian Klink <flokli@flokli.de> Reviewed-on: https://cl.tvl.fyi/c/depot/+/11907 Reviewed-by: tazjin <tazjin@tvl.su> Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de>
Diffstat (limited to 'third_party/overlays/tvl.nix')
-rw-r--r-- | third_party/overlays/tvl.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index f2260be8b8fb..6aba5480b205 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -101,8 +101,6 @@ depot.nix.readTree.drvTargets { patches = old.patches or [ ] ++ [ # https://github.com/nix-community/crate2nix/pull/301 ./patches/crate2nix-tests-debug.patch - # TODO(Kranzes): drop on next release - ./patches/crate2nix-drop-darwin-explicit-dontstrip.patch ]; }); @@ -135,4 +133,9 @@ 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 ]; + }); } |