Merge master into staging-next

pkgs/tools/admin/aws-nuke/default.nix

@@ -0,0 +1,36 @@
+{ stdenv
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "aws-nuke";
+  version = "2.14.0";
+
+  src = fetchFromGitHub {
+    owner = "rebuy-de";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-ULHT2ysAVZHSojIdsbPTuwskwOQVrK8f14r9eq+Effs=";
+  };
+
+  vendorSha256 = "sha256-GUCsl5VyptNvStJZgCsJDlllZasX1OhbVkahcQFuiC8=";
+
+  preBuild = ''
+    if [ "x$outputHashAlgo" != "x" ]; then
+      # Only `go generate` when fetching the go mod vendor code
+      go generate ./...
+    fi
+  '';
+
+  doCheck = false;
+
+  subPackages = [ "." ];
+
+  meta = with stdenv.lib; {
+    description = "Nuke a whole AWS account and delete all its resources";
+    homepage = "https://github.com/rebuy-de/aws-nuke";
+    license = licenses.mit;
+    maintainers = with maintainers; [ grahamc ];
+  };
+}

pkgs/tools/admin/eksctl/default.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.34.0";
+  version = "0.35.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
     rev = version;
-    sha256 = "1n2mvnis6r5vpb60jlb3c84sllsbvy93gzsds54igsp6l3zngq19";
+    sha256 = "0l4wlg6x074slndkihvwdvw4frsyzwxfqm1pkzqwc3x8awa9nlbv";
   };
 
-  vendorSha256 = "0ggxilp44mm81b8hrxyb7642vy2q1109yz619z97mgvk0drhkhc0";
+  vendorSha256 = "0sfx8x1iwdqwbyiid5hc9wiwjc16aig8vplpjlqxkmcvig8qlwff";
 
   doCheck = false;