Merge pull request #165321 from malob/update-1password

This commit is contained in:
Ben Siraphob 2022-03-28 21:29:23 -05:00 committed by GitHub
commit 27f51c5d7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,28 +1,38 @@
{ lib, stdenv, fetchzip, autoPatchelfHook, fetchurl, xar, cpio }:
{ lib, stdenv, fetchurl, fetchzip, autoPatchelfHook, installShellFiles, cpio, xar }:
let
inherit (stdenv.hostPlatform) system;
fetch = srcPlatform: sha256: extension:
let
args = {
url = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_${srcPlatform}_v${version}.${extension}";
inherit sha256;
} // lib.optionalAttrs (extension == "zip") { stripRoot = false; };
in
if extension == "zip" then fetchzip args else fetchurl args;
stdenv.mkDerivation rec {
pname = "1password-cli";
version = "1.12.2";
version = "2.0.0";
sources = rec {
aarch64-linux = fetch "linux_arm64" "sha256-NhCs68on8LzoeOmM5eP8LwmFaVWz6aghqtHzfUlACiA=" "zip";
i686-linux = fetch "linux_386" "sha256-vCxgEBq4YVfljq2zUpvBdZUbIiam4z64P1m9OMWq1f4=" "zip";
x86_64-linux = fetch "linux_amd64" "sha256-CDwrJ5ksXf9kwHobw4jvRUi1hLQzq4/yRlk+kHPN7UE=" "zip";
aarch64-darwin = fetch "apple_universal" "sha256-DC9hdzRjQ9iNjbe6PfRpMXzDeInq4rYSAa2nDHQMTRo=" "pkg";
x86_64-darwin = aarch64-darwin;
};
platforms = builtins.attrNames sources;
mainProgram = "op";
in
stdenv.mkDerivation {
inherit pname version;
src =
if stdenv.isLinux then
fetchzip
{
url = {
"i686-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
"x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
"aarch64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_arm64_v${version}.zip";
}.${stdenv.hostPlatform.system};
sha256 = {
"i686-linux" = "tCm/vDBASPN9FBSVRJ6BrFc7hdtZWPEAgvokJhjazPg=";
"x86_64-linux" = "3VkVMuTAfeEowkguJi2fd1kG7GwO1VN5GBPgNaH3Zv4=";
"aarch64-linux" = "12h1s9c97w0gb6bia3hy7773mwpfnyrn40sbjm1zc37y4zyi5dyp";
}.${stdenv.hostPlatform.system};
stripRoot = false;
} else
fetchurl {
url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_apple_universal_v${version}.pkg";
sha256 = "xG/6YZdkJxr5Py90rkIyG4mK40yFTmNSfih9jO2uF+4=";
};
if (builtins.elem system platforms) then
sources.${system}
else
throw "Source for ${pname} is not available for ${system}";
nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isLinux autoPatchelfHook;
buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ];
@ -32,25 +42,27 @@ stdenv.mkDerivation rec {
'';
installPhase = ''
install -D op $out/bin/op
install -D ${mainProgram} $out/bin/${mainProgram}
runHook postInstall
'';
dontStrip = stdenv.isDarwin;
postInstall = "installShellCompletion --cmd ${mainProgram}" + lib.concatMapStrings
(s: " --${s} <($out/bin/${mainProgram} completion ${s})") [ "bash" "fish" "zsh" ];
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
dontStrip = stdenv.isDarwin;
doInstallCheck = true;
installCheckPhase = ''
$out/bin/op --version
$out/bin/${mainProgram} --version
'';
meta = with lib; {
description = "1Password command-line tool";
homepage = "https://support.1password.com/command-line/";
downloadPage = "https://app-updates.agilebits.com/product_history/CLI";
homepage = "https://developer.1password.com/docs/cli/";
downloadPage = "https://app-updates.agilebits.com/product_history/CLI2";
maintainers = with maintainers; [ joelburget marsam ];
license = licenses.unfree;
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
inherit mainProgram platforms;
};
}