Commit 4ec9383f authored by Alyssa Ross's avatar Alyssa Ross
Browse files

sshx,sshx-server: useFetchCargoVendor 

Cargo 1.84.0 seems to have changed the output format of cargo vendor
again, once again invalidating fetchCargoTarball FOD hashes.  It's
time to fix this once and for all, switching across the board to
fetchCargoVendor, which is not dependent on cargo vendor's output
format.
parent 3e5b2351

pkgs/tools/misc/sshx/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ let 
          cargoHash

          ;



        useFetchCargoVendor = true;



        nativeBuildInputs = [ protobuf ];



        buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Security;
@@ -58,12 +60,12 @@ in 
{

  sshx = mkSshxPackage {

    pname = "sshx";

    cargoHash = "sha256-PMSKhlHSjXKh/Jxvl2z+c1zDDyuVPzQapvdCdcuaFYc=";

    cargoHash = "sha256-wXElkSaVWoUNhm2UOv8Q+UabgrVKqxwDUsk/JJaZzMw=";

  };



  sshx-server = mkSshxPackage rec {

    pname = "sshx-server";

    cargoHash = "sha256-ySsTjNoI/nuz2qtZ4M2Fd9zy239+E61hUCq1r/ahgsA=";

    cargoHash = "sha256-wXElkSaVWoUNhm2UOv8Q+UabgrVKqxwDUsk/JJaZzMw=";



    postPatch = ''

      substituteInPlace crates/sshx-server/src/web.rs \