Merge staging-next into staging

2020-08-13 08:52:48 +02:00
parent e4eb966875 2e149209a7
commit 7e189c56a1
161 changed files with 1310 additions and 676 deletions
@@ -3,7 +3,6 @@
 buildGoModule rec {
  pname = "age";
  version = "1.0.0-beta4";
-  goPackagePath = "github.com/FiloSottile/age";
  vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m";

  doCheck = false;
@@ -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; {