diff options
Diffstat (limited to 'pkgs/applications/misc/1password/default.nix')
-rw-r--r-- | pkgs/applications/misc/1password/default.nix | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 010e9ae7a50..eeaf8d56185 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,26 +2,22 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.10.0"; + version = "1.1.1"; src = - if stdenv.hostPlatform.system == "i686-linux" then - fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "07j11ikd0rzsj4d8rv74rfy497svq6l2q94ndf3b0a0mr8riyazj"; - stripRoot = false; - } - else if stdenv.hostPlatform.system == "x86_64-linux" then - fetchzip { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "177cl4x7rj3d74kzrpmiwps5n31axmlhqdwrdpkmay2gk9inswbs"; - stripRoot = false; - } - else if stdenv.hostPlatform.system == "x86_64-darwin" then - fetchurl { - url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; - sha256 = "13yxmnh77g6zvl2gqf77m5i3v5706p2plgbgsn5hqrrf3g8ql63b"; - } - else throw "Architecture not supported"; + 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"; + }.${stdenv.hostPlatform.system}; + sha256 = { + "i686-linux" = "1andl3ripkcg4jhwdkd4b39c9aaxqpx9wzq21pysn6rlyy4hfcb0"; + "x86_64-linux" = "0qj5v8psqyp0sra0pvzkwjpm28kx3bgg36y37wklb6zl2ngpxm5g"; + }.${stdenv.hostPlatform.system}; + stripRoot = false; + } else fetchurl { + url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; + sha256 = "16inwxkrky4xwlr7vara1l8kapdgjg3kfq1l94i5855782hn4ppm"; + }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ xar cpio ]; @@ -34,8 +30,16 @@ stdenv.mkDerivation rec { install -D op $out/bin/op ''; + dontStrip = stdenv.isDarwin; + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/op --version + ''; + meta = with stdenv.lib; { description = "1Password command-line tool"; homepage = "https://support.1password.com/command-line/"; |