Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprectate syschdemd #473

Merged
merged 5 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/on_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ jobs:
steps:
- name: Download Tarball 📥
uses: actions/download-artifact@v4
with:
name: tarball

- name: Download appx 📥
uses: actions/download-artifact@v4
Expand All @@ -38,8 +40,6 @@ jobs:

- name: Generate Checksums 🔑
run: |
mv tarball-modern/nixos-wsl.tar.gz nixos-wsl.tar.gz
mv tarball-legacy/nixos-wsl.tar.gz nixos-wsl-legacy.tar.gz
for x in *.{tar.gz,msixbundle}; do
sha256sum $x > ${x}.sha256
done
Expand All @@ -50,8 +50,6 @@ jobs:
files: |
nixos-wsl.tar.gz
nixos-wsl.tar.gz.sha256
nixos-wsl-legacy.tar.gz
nixos-wsl-legacy.tar.gz.sha256
NixOS-WSL.msixbundle
NixOS-WSL.msixbundle.sha256
env:
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/run_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ jobs:
tar:
name: Tarball 🛠️
runs-on: ubuntu-latest
strategy:
matrix:
config:
- modern
- legacy
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -31,13 +26,13 @@ jobs:
- name: Build Tarball 🛠️
uses: ./.github/actions/build-wsl-tarball
with:
config: ${{ matrix.config }}
config: default
filename: nixos-wsl.tar.gz

- name: Upload Tarball 📤
uses: actions/upload-artifact@v4
with:
name: tarball-${{ matrix.config }}
name: tarball
path: nixos-wsl.tar.gz

launcher:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Download tarball 📥
uses: actions/download-artifact@v4
with:
name: tarball-modern
name: tarball

- name: Download launcher binaries 📥
uses: actions/download-artifact@v4
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Download tarball 📥
uses: actions/download-artifact@v4
with:
name: tarball-modern
name: tarball

- name: Download launcher binaries 📥
uses: actions/download-artifact@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Download Tarball 📥
uses: actions/download-artifact@v4
with:
name: tarball-modern
name: tarball

- name: Setup WSL 🐧
run: |
Expand Down
2 changes: 1 addition & 1 deletion docs/src/building.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ If you have a flakes-enabled Nix, you can use the following command to
build your own tarball instead of relying on a prebuilt one:

```sh
sudo nix run github:nix-community/NixOS-WSL#nixosConfigurations.modern.config.system.build.tarballBuilder
sudo nix run github:nix-community/NixOS-WSL#nixosConfigurations.default.config.system.build.tarballBuilder
```

Or, if you want to build with local changes, run inside your checkout:
Expand Down
6 changes: 4 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,17 @@
system.stateVersion = config.system.nixos.release;
};
in
{
modern = nixpkgs.lib.nixosSystem {
rec {
default = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
self.nixosModules.default
(config { })
];
};

modern = nixpkgs.lib.warn "nixosConfigurations.modern has been renamed to nixosConfigurations.default" default;

legacy = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
Expand Down
8 changes: 8 additions & 0 deletions modules/systemd/syschdemd/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ with lib; {
'')
];

warnings = [
''
The old method of running systemd in a container (syschdemd) is deprecated.
Legacy WSL support is untested and is scheduled to be removed entirely with the 24.11 release.
Please migrate to native systemd by removing `wsl.nativeSystemd = false;` from your configuration.
''
];

};

}
4 changes: 2 additions & 2 deletions tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Please note that the tests are not compatible with Windows PowerShell, but requi
### Running the Tests

If you haven't already, [install Pester](https://pester.dev/docs/introduction/installation/).
The tests require a "modern" `nixos-wsl.tar.gz` to be present in the current working directory, which can be built with
`sudo nix run .#nixosConfigurations.modern.config.system.build.tarballBuilder -- nixos-wsl.tar.gz`.
The tests require a "default" (formerly "modern") `nixos-wsl.tar.gz` to be present in the current working directory, which can be built with
`sudo nix run .#nixosConfigurations.default.config.system.build.tarballBuilder -- nixos-wsl.tar.gz`.

Once everything is in place, run the test by running the following in PowerShell at the root of this repo:

Expand Down
Loading