Merge pull request #300 from nix-community/fixups

fix: fix config generation for legacy/tests
nix-community · Sep 30, 2023 · cadde47 · cadde47
2 parents 8735bdf + dd632e5
commit cadde47
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/modules/build-tarball.nix b/modules/build-tarball.nix
@@ -21,7 +21,7 @@ let
 
       wsl.enable = true;
       wsl.defaultUser = "nixos";
-      ${cfg.extraTarballConfig}
+      ${lib.optionalString (!cfg.nativeSystemd) "wsl.nativeSystemd = false;"}
 
       # This value determines the NixOS release from which the default
       # settings for stateful data, like file locations and database versions
@@ -34,12 +34,6 @@ let
   '';
 in
 {
-  options.wsl.extraTarballConfig = mkOption {
-    type = types.str;
-    internal = true;
-    default = "";
-  };
-
   # These options make no sense without the wsl-distro module anyway
   config = mkIf cfg.enable {
     system.build.tarballBuilder = pkgs.writeShellApplication {

diff --git a/tests/docker/docker-native.nix b/tests/docker/docker-native.nix
@@ -4,6 +4,8 @@
   ];
 
   wsl.enable = true;
+  wsl.nativeSystemd = false;
+
   users.users.nixos.extraGroups = [ "docker" ];
 
   virtualisation.docker = {

diff --git a/tests/login-shell/session-variables.nix b/tests/login-shell/session-variables.nix
@@ -9,6 +9,7 @@ in
   ];
 
   wsl.enable = true;
+  wsl.nativeSystemd = false;
 
   home-manager.users.nixos = { ... }: {
     home = {

diff --git a/tests/shells.Tests.ps1 b/tests/shells.Tests.ps1
@@ -18,6 +18,7 @@ Describe "Shells" {
           config = mkMerge [
             {
               wsl.enable = true;
+              wsl.nativeSystemd = false;
               users.users.nixos.shell = pkgs.$package;
             }
             (optionalAttrs (hasAttrByPath ["programs" "$package" "enable"] options) {

diff --git a/tests/username-change/username-change.nix b/tests/username-change/username-change.nix
@@ -4,5 +4,6 @@
   ];
 
   wsl.enable = true;
+  wsl.nativeSystemd = false;
   wsl.defaultUser = "different-name";
 }