Merge staging-next into staging

authored by github-actions[bot] and committed by GitHub 2cea0c50 37314035

+2 -2
+1 -1
pkgs/applications/editors/vim/plugins/overrides.nix
··· 563 563 pname = "cord.nvim-rust"; 564 564 inherit version src; 565 565 566 - cargoSha256 = "sha256-6FYf4pHEPxvhKHHPmkjQ40zPxaiypnpDxF8kNH+h+tg="; 566 + cargoHash = "sha256-6FYf4pHEPxvhKHHPmkjQ40zPxaiypnpDxF8kNH+h+tg="; 567 567 568 568 installPhase = let 569 569 cargoTarget = stdenv.hostPlatform.rust.cargoShortTarget;
+1 -1
pkgs/by-name/te/termsnap/package.nix
··· 15 15 sha256 = "sha256-FTgbbiDlHXGjkv3a2TAxjAqdClWkuteyUrtjQ8fMSIs="; 16 16 }; 17 17 18 - cargoSha256 = "sha256-hXlRkqcMHFEAnm883Q8sR8gcEbSNMutoJQsMW2M5wOY="; 18 + cargoHash = "sha256-hXlRkqcMHFEAnm883Q8sR8gcEbSNMutoJQsMW2M5wOY="; 19 19 20 20 meta = with lib; { 21 21 description = "Create SVGs from terminal output";