From 9bff9a09a4eb89ca814d4e069c00e52f6c901cdf Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 29 Sep 2023 22:31:16 +0300
Subject: fix: remove deprecated options from test

---
 tests/docker/docker-native.nix | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'tests/docker/docker-native.nix')

diff --git a/tests/docker/docker-native.nix b/tests/docker/docker-native.nix
index 47ccb7f..f9319fe 100644
--- a/tests/docker/docker-native.nix
+++ b/tests/docker/docker-native.nix
@@ -1,10 +1,6 @@
-{ pkgs, lib, ... }:
 {
   imports = [ ./base.nix ];
 
-  wsl.docker-native.enable = true;
-  wsl.docker-native.addToDockerGroup = true;
-
   # Github Actions runners try to use aufs and fail if this is not set explicitly
   virtualisation.docker.daemon.settings = {
     "storage-driver" = "vfs";
-- 
cgit v1.2.3


From 5bca9165acee81d3187fb75df858db765de102cd Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 29 Sep 2023 22:36:09 +0300
Subject: cleanup: clean up tests, don't rely on base config

---
 tests/docker/docker-native.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'tests/docker/docker-native.nix')

diff --git a/tests/docker/docker-native.nix b/tests/docker/docker-native.nix
index f9319fe..f119482 100644
--- a/tests/docker/docker-native.nix
+++ b/tests/docker/docker-native.nix
@@ -1,8 +1,14 @@
 {
-  imports = [ ./base.nix ];
+  imports = [
+    <nixos-wsl/modules>
+  ];
 
-  # Github Actions runners try to use aufs and fail if this is not set explicitly
-  virtualisation.docker.daemon.settings = {
-    "storage-driver" = "vfs";
+  wsl.enable = true;
+  users.users.nixos.extraGroups = [ "docker" ];
+
+  virtualisation.docker = {
+    enable = true;
+    # Github Actions runners try to use aufs and fail if this is not set explicitly
+    daemon.settings."storage-driver" = "vfs";
   };
 }
-- 
cgit v1.2.3