From cdc81f0d0b3498b0fb7aa9da7eb8743b4e840809 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 22 Oct 2024 10:10:47 -0500 Subject: [PATCH 1/4] _1password: format --- pkgs/applications/misc/1password/default.nix | 38 +++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 81cb76043f8e..60f235f361fa 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -1,8 +1,20 @@ -{ lib, stdenv, fetchurl, fetchzip, autoPatchelfHook, installShellFiles, cpio, xar, _1password, testers }: +{ + lib, + stdenv, + fetchurl, + fetchzip, + autoPatchelfHook, + installShellFiles, + cpio, + xar, + _1password, + testers, +}: let inherit (stdenv.hostPlatform) system; - fetch = srcPlatform: hash: extension: + fetch = + srcPlatform: hash: extension: let args = { url = "https://cache.agilebits.com/dist/1P/op2/pkg/v${version}/op_${srcPlatform}_v${version}.${extension}"; @@ -17,7 +29,9 @@ let aarch64-linux = fetch "linux_arm64" "sha256-sBbdkoacGI/gawM4YH+BBCLDhC2B+cE4iKVGHBhwkic=" "zip"; i686-linux = fetch "linux_386" "sha256-TTd5juT0Aqp1+OfunXcuk0KbL6HIHQV31+1Q1e0GYMY=" "zip"; x86_64-linux = fetch "linux_amd64" "sha256-Bb6fNoeNxlbDfwt7Jr8BaKCmFUwSdsLQdVoCmQCNmLA=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-/ryklZnGhrgJggDIa8HmuDsHAXkdrWeXKCQGGVwUAAo=" "pkg"; + aarch64-darwin = + fetch "apple_universal" "sha256-/ryklZnGhrgJggDIa8HmuDsHAXkdrWeXKCQGGVwUAAo=" + "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; @@ -32,9 +46,14 @@ stdenv.mkDerivation { else throw "Source for ${pname} is not available for ${system}"; - nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; + nativeBuildInputs = [ + installShellFiles + ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ xar cpio ]; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + xar + cpio + ]; unpackPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' xar -xf $src @@ -63,10 +82,11 @@ stdenv.mkDerivation { $out/bin/${mainProgram} --version ''; - passthru.updateScript = ./update.sh; - - passthru.tests.version = testers.testVersion { - package = _1password; + passthru = { + tests.version = testers.testVersion { + package = _1password; + }; + updateScript = ./update.sh; }; meta = with lib; { From a8d7a0b55e0f3b083b78a49134799798c02beb1f Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 22 Oct 2024 10:22:06 -0500 Subject: [PATCH 2/4] _1password: use versionCheckHook --- pkgs/applications/misc/1password/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 60f235f361fa..66f6ddaf9507 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -7,8 +7,7 @@ installShellFiles, cpio, xar, - _1password, - testers, + versionCheckHook, }: let @@ -48,6 +47,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ installShellFiles + versionCheckHook ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ @@ -78,14 +78,10 @@ stdenv.mkDerivation { doInstallCheck = true; - installCheckPhase = '' - $out/bin/${mainProgram} --version - ''; + versionCheckProgram = "${builtins.placeholder "out"}/bin/${mainProgram}"; + versionCheckProgramArg = [ "--version" ]; passthru = { - tests.version = testers.testVersion { - package = _1password; - }; updateScript = ./update.sh; }; From 545b9f67b54980829d631d4f38c37d2f34f946b2 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 22 Oct 2024 10:19:24 -0500 Subject: [PATCH 3/4] _1password: move to by-name --- .../1password/default.nix => by-name/_1/_1password/package.nix} | 0 .../misc/1password => by-name/_1/_1password}/update.sh | 2 +- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{applications/misc/1password/default.nix => by-name/_1/_1password/package.nix} (100%) rename pkgs/{applications/misc/1password => by-name/_1/_1password}/update.sh (97%) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/by-name/_1/_1password/package.nix similarity index 100% rename from pkgs/applications/misc/1password/default.nix rename to pkgs/by-name/_1/_1password/package.nix diff --git a/pkgs/applications/misc/1password/update.sh b/pkgs/by-name/_1/_1password/update.sh similarity index 97% rename from pkgs/applications/misc/1password/update.sh rename to pkgs/by-name/_1/_1password/update.sh index 562c1af31a25..4f04279fcea6 100755 --- a/pkgs/applications/misc/1password/update.sh +++ b/pkgs/by-name/_1/_1password/update.sh @@ -4,7 +4,7 @@ set -eu ROOT="$(dirname "$(readlink -f "$0")")" -NIX_DRV="$ROOT/default.nix" +NIX_DRV="$ROOT/package.nix" if [ ! -f "$NIX_DRV" ]; then echo "ERROR: cannot find default.nix in $ROOT" exit 1 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eba4c0b7f4c7..8c59c8a43dbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1429,8 +1429,6 @@ with pkgs; _3mux = callPackage ../tools/misc/3mux { }; - _1password = callPackage ../applications/misc/1password { }; - _1password-gui = callPackage ../applications/misc/1password-gui { }; _1password-gui-beta = callPackage ../applications/misc/1password-gui { channel = "beta"; }; From 1d9480f045c5b86889ea6fa87dbc353bfd8791a9 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Tue, 22 Oct 2024 10:25:12 -0500 Subject: [PATCH 4/4] _1password: 2.29.0 -> 2.30.0 --- pkgs/by-name/_1/_1password/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/_1/_1password/package.nix b/pkgs/by-name/_1/_1password/package.nix index 66f6ddaf9507..085013667620 100644 --- a/pkgs/by-name/_1/_1password/package.nix +++ b/pkgs/by-name/_1/_1password/package.nix @@ -23,13 +23,13 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.29.0"; + version = "2.30.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-sBbdkoacGI/gawM4YH+BBCLDhC2B+cE4iKVGHBhwkic=" "zip"; - i686-linux = fetch "linux_386" "sha256-TTd5juT0Aqp1+OfunXcuk0KbL6HIHQV31+1Q1e0GYMY=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-Bb6fNoeNxlbDfwt7Jr8BaKCmFUwSdsLQdVoCmQCNmLA=" "zip"; + aarch64-linux = fetch "linux_arm64" "sha256-KNduqspTzLEHmymSefLnnhIBcIQWx2tshvOc0NwDek0=" "zip"; + i686-linux = fetch "linux_386" "sha256-StdWtD3tz6bKqSem/GFqeRHzkbv4aP7d7dKKtgNhuY8=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-bzhRkpR3te1bcBEfP2BR6SECTC9sRFDshl7B+/278Kg=" "zip"; aarch64-darwin = - fetch "apple_universal" "sha256-/ryklZnGhrgJggDIa8HmuDsHAXkdrWeXKCQGGVwUAAo=" + fetch "apple_universal" "sha256-L1SZWQWjAJDZydlAttbWLS7igZNAvOmIyaUUdVbvEa8=" "pkg"; x86_64-darwin = aarch64-darwin; };