diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index e56293dcc64..bc66791ad36 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "open-vm-tools"; - version = "11.2.0"; + version = "11.2.5"; src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "125y3zdhj353dmmjmssdaib2zp1jg5aiqmvpgkrzhnh5nx2icfv6"; + sha256 = "sha256-Jv+NSKw/+l+b4lfVGgCZFlcTScO/WAO/d7DtI0FAEV4="; }; sourceRoot = "${src.name}/open-vm-tools"; diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index a454a73384b..30b9c496900 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -4,20 +4,23 @@ , rustPlatform , withFzf ? true , fzf +, installShellFiles , libiconv }: rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "ZeGFsVBpEhKi4EIhpQlCuriFzmHAgLYw3qE/zqfyqgU="; + sha256 = "sha256-yunKyCjJ/vWUcsodweLmxv0+QJQI2i5u5VIzp2U+VyU="; }; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; postPatch = lib.optionalString withFzf '' @@ -25,11 +28,16 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "Hzn01+OhdBrZD1woXN4Pwf/S72Deln1gyyBOWyDC6iM="; + cargoSha256 = "sha256-eoal6z4wX1pNdAJfdamJgOSFCvGWdbVlq1X+vD9lraE="; + + postInstall = '' + installManPage man/* + ''; meta = with lib; { description = "A fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; + changelog = "https://github.com/ajeetdsouza/zoxide/raw/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ysndr cole-h SuperSandro2000 ]; };