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/patches/crate2nix-drop-darwin-explicit-dontstrip.patch | |
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/patches/crate2nix-drop-darwin-explicit-dontstrip.patch')
-rw-r--r-- | third_party/overlays/patches/crate2nix-drop-darwin-explicit-dontstrip.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/third_party/overlays/patches/crate2nix-drop-darwin-explicit-dontstrip.patch b/third_party/overlays/patches/crate2nix-drop-darwin-explicit-dontstrip.patch deleted file mode 100644 index ba64e660c0e3..000000000000 --- a/third_party/overlays/patches/crate2nix-drop-darwin-explicit-dontstrip.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0209f258cda8a9972a785e26d92fb477ce4d1b0e Mon Sep 17 00:00:00 2001 -From: Ilan Joselevich <personal@ilanjoselevich.com> -Date: Tue, 11 Jun 2024 18:14:06 +0300 -Subject: [PATCH] Get rid of dontStrip for Darwin as it's no longer needed - -Fixed in https://github.com/NixOS/nixpkgs/pull/255900 ---- - templates/nix/crate2nix/default.nix | 2 -- - -diff --git a/templates/nix/crate2nix/default.nix b/templates/nix/crate2nix/default.nix -index 95d3730f..c53925e7 100644 ---- a/templates/nix/crate2nix/default.nix -+++ b/templates/nix/crate2nix/default.nix -@@ -349,8 +349,6 @@ rec { - buildRustCrateForPkgsFunc pkgs - ( - crateConfig // { -- # https://github.com/NixOS/nixpkgs/issues/218712 -- dontStrip = stdenv.hostPlatform.isDarwin; - src = crateConfig.src or ( - pkgs.fetchurl rec { - name = "${crateConfig.crateName}-${crateConfig.version}.tar.gz"; |