From c87bca6b7c85db6adafaf81807c71047a584e172 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 22 Mar 2019 13:49:02 -0500 Subject: [PATCH 1/2] lastpass-cli: 1.3.1 -> 1.3.2 https://github.com/lastpass/lastpass-cli/releases/tag/v1.3.2 --- pkgs/tools/security/lastpass-cli/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 4db350684bef..51a7d8daa54a 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -2,15 +2,14 @@ , bash-completion, openssl, curl, libxml2, libxslt }: stdenv.mkDerivation rec { - name = "lastpass-cli-${version}"; - - version = "1.3.1"; + pname = "lastpass-cli"; + version = "1.3.2"; src = fetchFromGitHub { owner = "lastpass"; - repo = "lastpass-cli"; + repo = pname; rev = "v${version}"; - sha256 = "11drzmfdvb8ydw1dxaz9zz8rk0jjqmfv076vydz05qqvgx59s38h"; + sha256 = "12qjqvqzi3pq7hrdpq59bcxqy6yj1mhx145g9rky1jm2ipzpfayq"; }; nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ]; From 27e7d83dc5448ac06cb55ff6199a23b63e7f5d2d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 22 Mar 2019 13:51:22 -0500 Subject: [PATCH 2/2] lastpass-cli: touchups, install more completions --- pkgs/tools/security/lastpass-cli/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 51a7d8daa54a..0415b10b25d8 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -20,11 +20,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = [ - "-DBASH_COMPLETION_COMPLETIONSDIR=./share/bash-completion/completions" - ]; + installTargets = [ "install" "install-doc" ]; - installTargets = "install install-doc"; + postInstall = '' + install -Dm644 -T ../contrib/lpass_zsh_completion $out/share/zsh/site-functions/_lpass + install -Dm644 -T ../contrib/completions-lpass.fish $out/share/fish/vendor_completions.d/lpass.fish + ''; meta = with lib; { description = "Stores, retrieves, generates, and synchronizes passwords securely";