Merge master into staging-next

2020-05-02 09:39:00 +02:00
parent 00bbfccecf 309711c4b4
commit afb1041148
148 changed files with 4999 additions and 2597 deletions
@@ -58,6 +58,6 @@ in rec {

  kops_1_16 = mkKops {
    version = "1.16.1";
-    sha256 = "08vy57ln0qar961sf9vbrh29f04qj5siqsfim1kqwvj5xrvwa39i";
+    sha256 = "04ji1703z6b3rd4wmccah68api0jj2bndzkgdzqi855gccqbmi5g";
  };
 }