From a67c97a5eb0c2aa15b42e0144f27f0b20eeb8a1c Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 8 May 2021 15:00:19 +0200
Subject: [PATCH 1/2] nixos/tests/docker-tools*: Add myself as maintainer where
 missing

I should have done this when I became maintainer for dockerTools,
but it's the PR reviews that matter.
---
 nixos/tests/docker-tools-overlay.nix | 2 +-
 nixos/tests/docker-tools.nix         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix
index 98eb72866156..6781388e639b 100644
--- a/nixos/tests/docker-tools-overlay.nix
+++ b/nixos/tests/docker-tools-overlay.nix
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
 {
   name = "docker-tools-overlay";
   meta = with pkgs.lib.maintainers; {
-    maintainers = [ lnl7 ];
+    maintainers = [ lnl7 roberth ];
   };
 
   nodes = {
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 96662b4540cc..39b97b4cb997 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -3,7 +3,7 @@
 import ./make-test-python.nix ({ pkgs, ... }: {
   name = "docker-tools";
   meta = with pkgs.lib.maintainers; {
-    maintainers = [ lnl7 ];
+    maintainers = [ lnl7 roberth ];
   };
 
   nodes = {

From 4035049af3e45554ffc4d8b4c30fd43ae9cd328a Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 8 May 2021 15:03:20 +0200
Subject: [PATCH 2/2] nixos/tests/docker-tools*: remove useless formatter

---
 nixos/tests/docker-tools-cross.nix   | 3 +++
 nixos/tests/docker-tools-overlay.nix | 3 +++
 nixos/tests/docker-tools.nix         | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/nixos/tests/docker-tools-cross.nix b/nixos/tests/docker-tools-cross.nix
index a7a6a31475d6..91a6c9540080 100644
--- a/nixos/tests/docker-tools-cross.nix
+++ b/nixos/tests/docker-tools-cross.nix
@@ -73,4 +73,7 @@ in {
             "docker rmi ${hello2.imageName}",
         )
   '';
+
+  # Remove when the formatter has been removed and a linter has been added
+  skipLint = true;
 })
diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix
index 6781388e639b..b4504032019f 100644
--- a/nixos/tests/docker-tools-overlay.nix
+++ b/nixos/tests/docker-tools-overlay.nix
@@ -30,4 +30,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
       # drw------- 99 0 0 100 Apr 14 11:36 /nix/store
       docker.succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version")
     '';
+
+  # Remove when the formatter has been removed and a linter has been added
+  skipLint = true;
 })
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 39b97b4cb997..650648fe724a 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -365,4 +365,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
             "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'"
         )
   '';
+
+  # Remove when the formatter has been removed and a linter has been added
+  skipLint = true;
 })