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.

Sign up for GitHub

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

Jump to bottom

Bump stable to 23.05 #268

Merged
merged 3 commits into from
Jul 24, 2023
Merged

Bump stable to 23.05 #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1638486
Bump stable to 23.05
SuperSandro2000 Jul 19, 2023
0c872da
fix: shells test
nzbr Jul 24, 2023
72b8000
Only include wslpath derivation on syschdemd
nzbr Jul 24, 2023
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<h1 align=center>
NixOS on WSL<br />
<a href="https://matrix.to/#/#wsl:nixos.org"><img src="https://img.shields.io/matrix/wsl:nixos.org?server_fqdn=nixos.ems.host&logo=matrix" alt="Matrix Chat" /></a>
<a href="https://github.com/NixOS/nixpkgs/tree/nixos-22.11"><img src="https://img.shields.io/badge/nixpkgs-22.11-brightgreen" alt="nixpkgs 22.11" /></a>
<a href="https://github.com/NixOS/nixpkgs/tree/nixos-23.05"><img src="https://img.shields.io/badge/nixpkgs-23.05-brightgreen" alt="nixpkgs 23.05" /></a>
<a href="https://github.com/nix-community/NixOS-WSL/releases"><img alt="Downloads" src="https://img.shields.io/github/downloads/nix-community/NixOS-WSL/total"></a>
</h1>

Expand Down
4 changes: 2 additions & 2 deletions configuration.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ pkgs, config, modulesPath, ... }:
{ pkgs, ... }:

let
nixos-wsl = import ./default.nix;
Expand Down Expand Up @@ -28,5 +28,5 @@ in
experimental-features = nix-command flakes
'';

system.stateVersion = "22.11";
system.stateVersion = "23.05";
}
8 changes: 4 additions & 4 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description = "NixOS WSL";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
flake-utils.url = "github:numtide/flake-utils";

flake-compat = {
Expand Down
6 changes: 6 additions & 0 deletions modules/wsl-distro.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,12 @@ in

# Include Windows %PATH% in Linux $PATH.
environment.extraInit = mkIf cfg.interop.includePath ''PATH="$PATH:$WSLPATH"'';
environment.systemPackages = [
(pkgs.runCommand "wslpath" { } ''
mkdir -p $out/bin
ln -s /init $out/bin/wslpath
'')
];
})
(mkIf cfg.nativeSystemd {
wsl.wslConf = {
Expand Down
13 changes: 9 additions & 4 deletions tests/shells.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,16 @@ Describe "Shells" {
function Add-ShellTest([string]$package, [string]$executable) {
$temp = New-TemporaryFile
@"
{ pkgs, config, ... }:
{
imports = [ ./base.nix ];
{ pkgs, lib, config, options, ... }:
with lib; {
imports = [ ./base.nix ];

users.users.`${config.wsl.defaultUser}.shell = pkgs.$package;
config = mkMerge [
{ users.users.`${config.wsl.defaultUser}.shell = pkgs.$package; }
(optionalAttrs (hasAttrByPath ["programs" "$package" "enable"] options) {
programs.$package.enable = true;
})
];
}
"@ > $temp
$distro.InstallConfig($temp)
Expand Down
Loading