diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-13 08:52:48 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-08-13 08:52:48 +0200 |
commit | 7e189c56a16382e1987a847b24bc34d8b957fd98 (patch) | |
tree | ac1abfb4b4fdaba5961be6653c41bbbe23bdac32 /pkgs/tools/security | |
parent | e4eb9668751fc4571687c3edf50819fee9f49a23 (diff) | |
parent | 2e149209a778daacb76bc9de5dbb19ad3a6f6943 (diff) | |
download | nixpkgs-7e189c56a16382e1987a847b24bc34d8b957fd98.tar nixpkgs-7e189c56a16382e1987a847b24bc34d8b957fd98.tar.gz nixpkgs-7e189c56a16382e1987a847b24bc34d8b957fd98.tar.bz2 nixpkgs-7e189c56a16382e1987a847b24bc34d8b957fd98.tar.lz nixpkgs-7e189c56a16382e1987a847b24bc34d8b957fd98.tar.xz nixpkgs-7e189c56a16382e1987a847b24bc34d8b957fd98.tar.zst nixpkgs-7e189c56a16382e1987a847b24bc34d8b957fd98.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/age/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/security/bitwarden/default.nix | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index 8436972ebc5..8a6d008551e 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -3,7 +3,6 @@ buildGoModule rec { pname = "age"; version = "1.0.0-beta4"; - goPackagePath = "github.com/FiloSottile/age"; vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m"; doCheck = false; diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index ff55ad6691d..4e087ee631e 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -16,11 +16,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.19.0"; + x86_64-linux = "1.20.1"; }.${system} or ""; sha256 = { - x86_64-linux = "16qlgnqyi0jwzlz8wg2628jhh83xsk46bl6p4dnwi0ay07lhab9w"; + x86_64-linux = "1lywslkpgg9rxwz7kwfknkgdi0r47j14i420r5yxgkaizb7ww27z"; }.${system} or ""; meta = with stdenv.lib; { |