Merge staging-next into staging

authored by github-actions[bot] and committed by GitHub 89853530 b0813d32

+13 -5
+2 -2
pkgs/applications/virtualization/open-vm-tools/default.nix
··· 6 7 stdenv.mkDerivation rec { 8 pname = "open-vm-tools"; 9 - version = "11.2.0"; 10 11 src = fetchFromGitHub { 12 owner = "vmware"; 13 repo = "open-vm-tools"; 14 rev = "stable-${version}"; 15 - sha256 = "125y3zdhj353dmmjmssdaib2zp1jg5aiqmvpgkrzhnh5nx2icfv6"; 16 }; 17 18 sourceRoot = "${src.name}/open-vm-tools";
··· 6 7 stdenv.mkDerivation rec { 8 pname = "open-vm-tools"; 9 + version = "11.2.5"; 10 11 src = fetchFromGitHub { 12 owner = "vmware"; 13 repo = "open-vm-tools"; 14 rev = "stable-${version}"; 15 + sha256 = "sha256-Jv+NSKw/+l+b4lfVGgCZFlcTScO/WAO/d7DtI0FAEV4="; 16 }; 17 18 sourceRoot = "${src.name}/open-vm-tools";
+11 -3
pkgs/tools/misc/zoxide/default.nix
··· 4 , rustPlatform 5 , withFzf ? true 6 , fzf 7 , libiconv 8 }: 9 10 rustPlatform.buildRustPackage rec { 11 pname = "zoxide"; 12 - version = "0.6.0"; 13 14 src = fetchFromGitHub { 15 owner = "ajeetdsouza"; 16 repo = "zoxide"; 17 rev = "v${version}"; 18 - sha256 = "ZeGFsVBpEhKi4EIhpQlCuriFzmHAgLYw3qE/zqfyqgU="; 19 }; 20 21 buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; 22 ··· 25 --replace '"fzf"' '"${fzf}/bin/fzf"' 26 ''; 27 28 - cargoSha256 = "Hzn01+OhdBrZD1woXN4Pwf/S72Deln1gyyBOWyDC6iM="; 29 30 meta = with lib; { 31 description = "A fast cd command that learns your habits"; 32 homepage = "https://github.com/ajeetdsouza/zoxide"; 33 license = with licenses; [ mit ]; 34 maintainers = with maintainers; [ ysndr cole-h SuperSandro2000 ]; 35 };
··· 4 , rustPlatform 5 , withFzf ? true 6 , fzf 7 + , installShellFiles 8 , libiconv 9 }: 10 11 rustPlatform.buildRustPackage rec { 12 pname = "zoxide"; 13 + version = "0.7.0"; 14 15 src = fetchFromGitHub { 16 owner = "ajeetdsouza"; 17 repo = "zoxide"; 18 rev = "v${version}"; 19 + sha256 = "sha256-yunKyCjJ/vWUcsodweLmxv0+QJQI2i5u5VIzp2U+VyU="; 20 }; 21 + 22 + nativeBuildInputs = [ installShellFiles ]; 23 24 buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; 25 ··· 28 --replace '"fzf"' '"${fzf}/bin/fzf"' 29 ''; 30 31 + cargoSha256 = "sha256-eoal6z4wX1pNdAJfdamJgOSFCvGWdbVlq1X+vD9lraE="; 32 + 33 + postInstall = '' 34 + installManPage man/* 35 + ''; 36 37 meta = with lib; { 38 description = "A fast cd command that learns your habits"; 39 homepage = "https://github.com/ajeetdsouza/zoxide"; 40 + changelog = "https://github.com/ajeetdsouza/zoxide/raw/v${version}/CHANGELOG.md"; 41 license = with licenses; [ mit ]; 42 maintainers = with maintainers; [ ysndr cole-h SuperSandro2000 ]; 43 };