From 06113f18b48600431a38f7c61dc195edd59e79a8 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 22 Mar 2022 12:36:05 -0700 Subject: [PATCH 1/3] _1password: 1.12.2 -> 2.0.0 --- pkgs/applications/misc/1password/default.nix | 22 ++++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 512f5546aecd..fed406b42975 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,26 +2,26 @@ stdenv.mkDerivation rec { pname = "1password-cli"; - version = "1.12.2"; + version = "2.0.0"; 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"; + "i686-linux" = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_linux_386_v${version}.zip"; + "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_linux_amd64_v${version}.zip"; + "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_linux_arm64_v${version}.zip"; }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "tCm/vDBASPN9FBSVRJ6BrFc7hdtZWPEAgvokJhjazPg="; - "x86_64-linux" = "3VkVMuTAfeEowkguJi2fd1kG7GwO1VN5GBPgNaH3Zv4="; - "aarch64-linux" = "12h1s9c97w0gb6bia3hy7773mwpfnyrn40sbjm1zc37y4zyi5dyp"; + "i686-linux" = "sha256-vCxgEBq4YVfljq2zUpvBdZUbIiam4z64P1m9OMWq1f4="; + "x86_64-linux" = "sha256-CDwrJ5ksXf9kwHobw4jvRUi1hLQzq4/yRlk+kHPN7UE="; + "aarch64-linux" = "sha256-NhCs68on8LzoeOmM5eP8LwmFaVWz6aghqtHzfUlACiA="; }.${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="; + url = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_apple_universal_v${version}.pkg"; + sha256 = "sha256-DC9hdzRjQ9iNjbe6PfRpMXzDeInq4rYSAa2nDHQMTRo="; }; buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ]; @@ -47,8 +47,8 @@ stdenv.mkDerivation rec { 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" ]; From 93eb4dbde177b5a0ede1c3174f5cb8a7c566906a Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 22 Mar 2022 12:58:32 -0700 Subject: [PATCH 2/3] _1password: refactor code to reduce duplication --- pkgs/applications/misc/1password/default.nix | 54 +++++++++++--------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index fed406b42975..826b8558b377 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -1,28 +1,36 @@ { lib, stdenv, fetchzip, autoPatchelfHook, fetchurl, xar, cpio }: -stdenv.mkDerivation rec { +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; + pname = "1password-cli"; 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/op2/pkg/v${version}/op_linux_386_v${version}.zip"; - "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_linux_amd64_v${version}.zip"; - "aarch64-linux" = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_linux_arm64_v${version}.zip"; - }.${stdenv.hostPlatform.system}; - sha256 = { - "i686-linux" = "sha256-vCxgEBq4YVfljq2zUpvBdZUbIiam4z64P1m9OMWq1f4="; - "x86_64-linux" = "sha256-CDwrJ5ksXf9kwHobw4jvRUi1hLQzq4/yRlk+kHPN7UE="; - "aarch64-linux" = "sha256-NhCs68on8LzoeOmM5eP8LwmFaVWz6aghqtHzfUlACiA="; - }.${stdenv.hostPlatform.system}; - stripRoot = false; - } else - fetchurl { - url = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_apple_universal_v${version}.pkg"; - sha256 = "sha256-DC9hdzRjQ9iNjbe6PfRpMXzDeInq4rYSAa2nDHQMTRo="; - }; + if (builtins.elem system platforms) then + sources.${system} + else + throw "Source for ${pname} is not available for ${system}"; buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ]; @@ -32,7 +40,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - install -D op $out/bin/op + install -D ${mainProgram} $out/bin/${mainProgram} ''; dontStrip = stdenv.isDarwin; @@ -42,7 +50,7 @@ stdenv.mkDerivation rec { doInstallCheck = true; installCheckPhase = '' - $out/bin/op --version + $out/bin/${mainProgram} --version ''; meta = with lib; { @@ -51,6 +59,6 @@ stdenv.mkDerivation rec { 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; }; } From 47417621a5a54a78944f959230a94e5f5ac1836c Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 28 Mar 2022 14:53:32 -0700 Subject: [PATCH 3/3] _1password: add shell completions --- pkgs/applications/misc/1password/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 826b8558b377..25685b2e125e 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, autoPatchelfHook, fetchurl, xar, cpio }: +{ lib, stdenv, fetchurl, fetchzip, autoPatchelfHook, installShellFiles, cpio, xar }: let inherit (stdenv.hostPlatform) system; @@ -32,6 +32,8 @@ stdenv.mkDerivation { else throw "Source for ${pname} is not available for ${system}"; + nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isLinux autoPatchelfHook; + buildInputs = lib.optionals stdenv.isDarwin [ xar cpio ]; unpackPhase = lib.optionalString stdenv.isDarwin '' @@ -41,11 +43,13 @@ stdenv.mkDerivation { installPhase = '' 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;