From 4389b676951d8c368a382f9411f1816bcab54307 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Sun, 28 Jun 2020 20:50:49 +0200 Subject: [PATCH] _1password: 1.0.0 -> 1.1.1 --- pkgs/applications/misc/1password/default.nix | 34 +++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 5e027fcdf04b..eeaf8d561852 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 = "1.0.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 = "1d1lxmrmirh3837zib91dmxblb4imdz8gbq56pb7kgbff3zf96ql"; - 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 = "0pscm61dc69vmkrzrnxi531d37ig9y48w8q1lvzsg13zvvwaw8hs"; - 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 = "1sb5qdssasqm7z7j4xzgkmkgf132zhgm93d7rkx3y5j0rac98y0g"; - } - 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 ];