Merge staging-next into staging
This commit is contained in:
@@ -13,11 +13,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "1password";
|
||||
version = "0.9.3";
|
||||
version = "0.9.4-1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
|
||||
sha256 = "wO1HwXl6Lf7+2fXX7i8nrD/hi9dAWn50Jkoztx6aT0Q=";
|
||||
sha256 = "1d5k7066hzc7j2nncrj6b85nklpjbn88izlyisznb3m1yxi8jm5i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -17,11 +17,11 @@ let
|
||||
pname = "bitwarden";
|
||||
|
||||
version = {
|
||||
x86_64-linux = "1.22.2";
|
||||
x86_64-linux = "1.23.0";
|
||||
}.${system} or "";
|
||||
|
||||
sha256 = {
|
||||
x86_64-linux = "1yx550whld0dg3b10x57r2nzizydla4i40zqqm6dzd3wic8yi365";
|
||||
x86_64-linux = "1z1r8327xymqf2h98wb2fb02s41pxc6fh5w4bxmdgpx7k1jx5kvg";
|
||||
}.${system} or "";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -35,7 +35,7 @@ buildGoPackage rec {
|
||||
homepage = "https://www.keybase.io/";
|
||||
description = "The Keybase official command-line utility and service";
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ avaq carlsverre np rvolosatovs filalex77 ];
|
||||
maintainers = with maintainers; [ avaq carlsverre np rvolosatovs Br1ght0ne ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://www.keybase.io/";
|
||||
description = "The Keybase official GUI";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np filalex77 ];
|
||||
maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np Br1ght0ne ];
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user