Skip to content

Commit d926f9f

Browse files
authored
syschdemd: add deprecation notice (#473)
* syschdemd: add deprecation notice * ci: remove legacy tarball * rename modern to default * ci: unbreak * syschdemd: add removal deadline
1 parent d7196ac commit d926f9f

File tree

8 files changed

+22
-19
lines changed

8 files changed

+22
-19
lines changed

.github/workflows/on_release.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ jobs:
2727
steps:
2828
- name: Download Tarball 📥
2929
uses: actions/download-artifact@v4
30+
with:
31+
name: tarball
3032

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

3941
- name: Generate Checksums 🔑
4042
run: |
41-
mv tarball-modern/nixos-wsl.tar.gz nixos-wsl.tar.gz
42-
mv tarball-legacy/nixos-wsl.tar.gz nixos-wsl-legacy.tar.gz
4343
for x in *.{tar.gz,msixbundle}; do
4444
sha256sum $x > ${x}.sha256
4545
done
@@ -50,8 +50,6 @@ jobs:
5050
files: |
5151
nixos-wsl.tar.gz
5252
nixos-wsl.tar.gz.sha256
53-
nixos-wsl-legacy.tar.gz
54-
nixos-wsl-legacy.tar.gz.sha256
5553
NixOS-WSL.msixbundle
5654
NixOS-WSL.msixbundle.sha256
5755
env:

.github/workflows/run_build.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ jobs:
77
tar:
88
name: Tarball 🛠️
99
runs-on: ubuntu-latest
10-
strategy:
11-
matrix:
12-
config:
13-
- modern
14-
- legacy
1510
steps:
1611
- name: Checkout
1712
uses: actions/checkout@v4
@@ -31,13 +26,13 @@ jobs:
3126
- name: Build Tarball 🛠️
3227
uses: ./.github/actions/build-wsl-tarball
3328
with:
34-
config: ${{ matrix.config }}
29+
config: default
3530
filename: nixos-wsl.tar.gz
3631

3732
- name: Upload Tarball 📤
3833
uses: actions/upload-artifact@v4
3934
with:
40-
name: tarball-${{ matrix.config }}
35+
name: tarball
4136
path: nixos-wsl.tar.gz
4237

4338
launcher:

.github/workflows/run_package.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Download tarball 📥
2020
uses: actions/download-artifact@v4
2121
with:
22-
name: tarball-modern
22+
name: tarball
2323

2424
- name: Download launcher binaries 📥
2525
uses: actions/download-artifact@v4
@@ -49,7 +49,7 @@ jobs:
4949
- name: Download tarball 📥
5050
uses: actions/download-artifact@v4
5151
with:
52-
name: tarball-modern
52+
name: tarball
5353

5454
- name: Download launcher binaries 📥
5555
uses: actions/download-artifact@v4

.github/workflows/run_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Download Tarball 📥
4242
uses: actions/download-artifact@v4
4343
with:
44-
name: tarball-modern
44+
name: tarball
4545

4646
- name: Setup WSL 🐧
4747
run: |

docs/src/building.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ If you have a flakes-enabled Nix, you can use the following command to
66
build your own tarball instead of relying on a prebuilt one:
77

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

1212
Or, if you want to build with local changes, run inside your checkout:

flake.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,17 @@
4747
system.stateVersion = config.system.nixos.release;
4848
};
4949
in
50-
{
51-
modern = nixpkgs.lib.nixosSystem {
50+
rec {
51+
default = nixpkgs.lib.nixosSystem {
5252
system = "x86_64-linux";
5353
modules = [
5454
self.nixosModules.default
5555
(config { })
5656
];
5757
};
5858

59+
modern = nixpkgs.lib.warn "nixosConfigurations.modern has been renamed to nixosConfigurations.default" default;
60+
5961
legacy = nixpkgs.lib.nixosSystem {
6062
system = "x86_64-linux";
6163
modules = [

modules/systemd/syschdemd/default.nix

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@ with lib; {
3636
'')
3737
];
3838

39+
warnings = [
40+
''
41+
The old method of running systemd in a container (syschdemd) is deprecated.
42+
Legacy WSL support is untested and is scheduled to be removed entirely with the 24.11 release.
43+
Please migrate to native systemd by removing `wsl.nativeSystemd = false;` from your configuration.
44+
''
45+
];
46+
3947
};
4048

4149
}

tests/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Please note that the tests are not compatible with Windows PowerShell, but requi
1313
### Running the Tests
1414

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

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

0 commit comments

Comments
 (0)