public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2021-05-02 06:21:31 +00:00 committed by GitHub
commit 89853530f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/virtualization/open-vm-tools/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "open-vm-tools"; pname = "open-vm-tools";
version = "11.2.0"; version = "11.2.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "vmware"; owner = "vmware";
repo = "open-vm-tools"; repo = "open-vm-tools";
rev = "stable-${version}"; rev = "stable-${version}";
sha256 = "125y3zdhj353dmmjmssdaib2zp1jg5aiqmvpgkrzhnh5nx2icfv6"; sha256 = "sha256-Jv+NSKw/+l+b4lfVGgCZFlcTScO/WAO/d7DtI0FAEV4=";
}; };
sourceRoot = "${src.name}/open-vm-tools"; sourceRoot = "${src.name}/open-vm-tools";

14
pkgs/tools/misc/zoxide/default.nix
View File

@ -4,20 +4,23 @@
, rustPlatform , rustPlatform
, withFzf ? true , withFzf ? true
, fzf , fzf
, installShellFiles
, libiconv , libiconv
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "zoxide"; pname = "zoxide";
version = "0.6.0"; version = "0.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ajeetdsouza"; owner = "ajeetdsouza";
repo = "zoxide"; repo = "zoxide";
rev = "v${version}"; rev = "v${version}";
sha256 = "ZeGFsVBpEhKi4EIhpQlCuriFzmHAgLYw3qE/zqfyqgU="; sha256 = "sha256-yunKyCjJ/vWUcsodweLmxv0+QJQI2i5u5VIzp2U+VyU=";
}; };
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
postPatch = lib.optionalString withFzf '' postPatch = lib.optionalString withFzf ''
@ -25,11 +28,16 @@ rustPlatform.buildRustPackage rec {
--replace '"fzf"' '"${fzf}/bin/fzf"' --replace '"fzf"' '"${fzf}/bin/fzf"'
''; '';
cargoSha256 = "Hzn01+OhdBrZD1woXN4Pwf/S72Deln1gyyBOWyDC6iM="; cargoSha256 = "sha256-eoal6z4wX1pNdAJfdamJgOSFCvGWdbVlq1X+vD9lraE=";
postInstall = ''
installManPage man/*
'';
meta = with lib; { meta = with lib; {
description = "A fast cd command that learns your habits"; description = "A fast cd command that learns your habits";
homepage = "https://github.com/ajeetdsouza/zoxide"; homepage = "https://github.com/ajeetdsouza/zoxide";
changelog = "https://github.com/ajeetdsouza/zoxide/raw/v${version}/CHANGELOG.md";
license = with licenses; [ mit ]; license = with licenses; [ mit ];
maintainers = with maintainers; [ ysndr cole-h SuperSandro2000 ]; maintainers = with maintainers; [ ysndr cole-h SuperSandro2000 ];
}; };