From 7eafc7b1e4b895d1986280e192aa8d493fff8d96 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Fri, 5 Jun 2026 09:53:15 +0900 Subject: [PATCH] nix: update flake lock Was unfortunately not able to implement vm test suite before this release. Hopefully the last nixos update we have to follow. Signed-off-by: Ophestra --- flake.lock | 16 +- flake.nix | 8 +- options.md | 318 ++++++++++++++++++++++++++++------- package.nix | 17 +- test/default.nix | 4 +- test/sandbox/case/device.nix | 4 +- test/sandbox/case/mapuid.nix | 4 +- test/sandbox/case/pd.nix | 16 +- test/sandbox/case/pdlike.nix | 4 +- test/sandbox/case/preset.nix | 4 +- test/sandbox/case/tty.nix | 4 +- test/sandbox/default.nix | 4 +- 12 files changed, 308 insertions(+), 95 deletions(-) diff --git a/flake.lock b/flake.lock index ddbe935e..ce9fe45f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,32 +7,32 @@ ] }, "locked": { - "lastModified": 1772985280, - "narHash": "sha256-FdrNykOoY9VStevU4zjSUdvsL9SzJTcXt4omdEDZDLk=", + "lastModified": 1780361225, + "narHash": "sha256-wnV9ttf4fPWNonBIQmvlrSlNpQYgx5HgWWd007mwIFA=", "owner": "nix-community", "repo": "home-manager", - "rev": "8f736f007139d7f70752657dff6a401a585d6cbc", + "rev": "e28654b71096e08c019d4861ca26acb646f583d8", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1772822230, - "narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=", + "lastModified": 1780453794, + "narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71caefce12ba78d84fe618cf61644dce01cf3a96", + "rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 09520be2..92548b40 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "hakurei container tool and nixos module"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -37,7 +37,7 @@ inherit (pkgs) runCommandLocal callPackage - nixfmt-rfc-style + nixfmt deadnix statix ; @@ -57,7 +57,7 @@ sharefs = callPackage ./cmd/sharefs/test { inherit system self; }; - formatting = runCommandLocal "check-formatting" { nativeBuildInputs = [ nixfmt-rfc-style ]; } '' + formatting = runCommandLocal "check-formatting" { nativeBuildInputs = [ nixfmt ]; } '' cd ${./.} echo "running nixfmt..." diff --git a/options.md b/options.md index 1d289d25..6f6acddd 100644 --- a/options.md +++ b/options.md @@ -12,12 +12,18 @@ boolean *Default:* -` false ` + +```nix +false +``` *Example:* -` true ` + +```nix +true +``` @@ -35,7 +41,10 @@ package *Default:* -` ` + +```nix + +``` @@ -51,7 +60,10 @@ attribute set of (submodule) *Default:* -` { } ` + +```nix +{ } +``` @@ -69,7 +81,10 @@ null or boolean *Default:* -` true ` + +```nix +true +``` @@ -87,7 +102,10 @@ null or boolean *Default:* -` true ` + +```nix +true +``` @@ -105,7 +123,10 @@ null or boolean *Default:* -` true ` + +```nix +true +``` @@ -123,7 +144,10 @@ null or boolean *Default:* -` false ` + +```nix +false +``` @@ -141,7 +165,10 @@ list of package *Default:* -` [ ] ` + +```nix +[ ] +``` @@ -160,7 +187,10 @@ null or (list of string) *Default:* -` null ` + +```nix +null +``` @@ -180,7 +210,10 @@ null or string *Default:* -` null ` + +```nix +null +``` @@ -199,7 +232,10 @@ null or (function that evaluates to a(n) anything) *Default:* -` null ` + +```nix +null +``` @@ -218,7 +254,10 @@ null or anything *Default:* -` null ` + +```nix +null +``` @@ -236,12 +275,18 @@ boolean *Default:* -` false ` + +```nix +false +``` *Example:* -` true ` + +```nix +true +``` @@ -259,12 +304,18 @@ boolean *Default:* -` false ` + +```nix +false +``` *Example:* -` true ` + +```nix +true +``` @@ -282,7 +333,10 @@ null or (attribute set of string) *Default:* -` null ` + +```nix +null +``` @@ -300,7 +354,10 @@ anything *Default:* -` { } ` + +```nix +{ } +``` @@ -318,7 +375,10 @@ list of attribute set of anything *Default:* -` [ ] ` + +```nix +[ ] +``` @@ -337,7 +397,10 @@ null or boolean *Default:* -` null ` + +```nix +null +``` @@ -355,7 +418,10 @@ list of string *Default:* -` [ ] ` + +```nix +[ ] +``` @@ -373,12 +439,18 @@ boolean *Default:* -` false ` + +```nix +false +``` *Example:* -` true ` + +```nix +true +``` @@ -396,12 +468,18 @@ boolean *Default:* -` true ` + +```nix +true +``` *Example:* -` true ` + +```nix +true +``` @@ -432,12 +510,18 @@ boolean *Default:* -` false ` + +```nix +false +``` *Example:* -` true ` + +```nix +true +``` @@ -455,12 +539,18 @@ boolean *Default:* -` false ` + +```nix +false +``` *Example:* -` true ` + +```nix +true +``` @@ -478,12 +568,18 @@ boolean *Default:* -` false ` + +```nix +false +``` *Example:* -` true ` + +```nix +true +``` @@ -514,12 +610,18 @@ boolean *Default:* -` false ` + +```nix +false +``` *Example:* -` true ` + +```nix +true +``` @@ -538,7 +640,10 @@ null or string *Default:* -` null ` + +```nix +null +``` @@ -557,7 +662,10 @@ null or one of “fifo”, “rr”, “batch”, “idle”, “deadline”, *Default:* -` null ` + +```nix +null +``` @@ -575,7 +683,10 @@ null or integer between 1 and 99 (both inclusive) *Default:* -` null ` + +```nix +null +``` @@ -593,7 +704,10 @@ null or string *Default:* -` null ` + +```nix +null +``` @@ -612,7 +726,10 @@ null or package *Default:* -` null ` + +```nix +null +``` @@ -630,12 +747,18 @@ boolean *Default:* -` false ` + +```nix +false +``` *Example:* -` true ` + +```nix +true +``` @@ -653,12 +776,18 @@ boolean *Default:* -` false ` + +```nix +false +``` *Example:* -` true ` + +```nix +true +``` @@ -676,12 +805,18 @@ boolean *Default:* -` false ` + +```nix +false +``` *Example:* -` true ` + +```nix +true +``` @@ -699,12 +834,18 @@ boolean *Default:* -` false ` + +```nix +false +``` *Example:* -` true ` + +```nix +true +``` @@ -722,12 +863,18 @@ boolean *Default:* -` true ` + +```nix +true +``` *Example:* -` true ` + +```nix +true +``` @@ -745,12 +892,18 @@ boolean *Default:* -` false ` + +```nix +false +``` *Example:* -` true ` + +```nix +true +``` @@ -768,12 +921,18 @@ boolean *Default:* -` false ` + +```nix +false +``` *Example:* -` true ` + +```nix +true +``` @@ -793,7 +952,10 @@ null or signed integer *Default:* -` null ` + +```nix +null +``` @@ -811,7 +973,10 @@ list of attribute set of anything *Default:* -` [ ] ` + +```nix +[ ] +``` @@ -842,7 +1007,10 @@ package *Default:* -` ` + +```nix + +``` @@ -860,7 +1028,10 @@ package *Default:* -` ` + +```nix + +``` @@ -878,7 +1049,10 @@ string *Default:* -` "sharefs" ` + +```nix +"sharefs" +``` @@ -896,7 +1070,10 @@ string *Default:* -` "/sdcard" ` + +```nix +"/sdcard" +``` @@ -914,7 +1091,10 @@ null or string *Default:* -` null ` + +```nix +null +``` @@ -932,7 +1112,10 @@ string *Default:* -` "sharefs" ` + +```nix +"sharefs" +``` @@ -950,7 +1133,10 @@ string *Default:* -` "/run/current-system/sw/bin/bash" ` + +```nix +"/run/current-system/sw/bin/bash" +``` @@ -979,3 +1165,11 @@ Users allowed to spawn hakurei apps and their corresponding hakurei identity\. attribute set of integer between 0 and 99 (both inclusive) + +*Default:* + +```nix +{ } +``` + + diff --git a/package.nix b/package.nix index d9fbd826..ff0d7a07 100644 --- a/package.nix +++ b/package.nix @@ -11,7 +11,10 @@ wayland, wayland-protocols, wayland-scanner, - xorg, + + libxcb, + libxau, + libxdmcp, # for sharefs fuse3, @@ -19,6 +22,7 @@ # for passthru.buildInputs go_1_26, clang, + xorgproto, # for check util-linux, @@ -90,12 +94,11 @@ buildGo126Module rec { fuse3 acl wayland - ] - ++ (with xorg; [ + libxcb - libXau - libXdmcp - ]); + libxau + libxdmcp + ]; nativeBuildInputs = [ pkg-config @@ -128,7 +131,7 @@ buildGo126Module rec { targetPkgs = [ go_1_26 clang - xorg.xorgproto + xorgproto util-linux # for go generate diff --git a/test/default.nix b/test/default.nix index 246d6dfc..76a490a7 100644 --- a/test/default.nix +++ b/test/default.nix @@ -55,7 +55,9 @@ testers.nixosTest { environment.hakurei = lib.mkIf withRace rec { # race detector does not support static linking package = (pkgs.callPackage ../package.nix { }).overrideAttrs (previousAttrs: { - GOFLAGS = previousAttrs.GOFLAGS ++ [ "-race" ]; + env = previousAttrs.env // { + GOFLAGS = previousAttrs.env.GOFLAGS + " -race"; + }; }); hsuPackage = options.environment.hakurei.hsuPackage.default.override { hakurei = package; }; }; diff --git a/test/sandbox/case/device.nix b/test/sandbox/case/device.nix index d37768a4..889e0a06 100644 --- a/test/sandbox/case/device.nix +++ b/test/sandbox/case/device.nix @@ -71,6 +71,7 @@ in "dbus-1" = fs "80001ff" null null; "default" = fs "80001ff" null null; "dhcpcd.exit-hook" = fs "80001ff" null null; + "environment.d" = fs "80001ff" null null; "fonts" = fs "80001ff" null null; "fstab" = fs "80001ff" null null; "hsurc" = fs "80001ff" null null; @@ -114,6 +115,7 @@ in "set-environment" = fs "80001ff" null null; "shadow" = fs "80001ff" null null; "shells" = fs "80001ff" null null; + "speech-dispatcher" = fs "80001ff" null null; "ssh" = fs "80001ff" null null; "ssl" = fs "80001ff" null null; "static" = fs "80001ff" null null; @@ -228,7 +230,7 @@ in (ent ignore "/run/user/65534/bus" "ro,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") (ent "/bin" "/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") (ent "/usr/bin" "/usr/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") - (ent "/" "/nix/store" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/mnt-root/nix/.ro-store,upperdir=/mnt-root/nix/.rw-store/upper,workdir=/mnt-root/nix/.rw-store/work,uuid=on") + (ent "/" "/nix/store" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/sysroot/nix/.ro-store,upperdir=/sysroot/nix/.rw-store/upper,workdir=/sysroot/nix/.rw-store/work,uuid=on") (ent "/block" "/sys/block" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") (ent "/bus" "/sys/bus" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") (ent "/class" "/sys/class" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") diff --git a/test/sandbox/case/mapuid.nix b/test/sandbox/case/mapuid.nix index 7aa78a9b..1b6ef0e7 100644 --- a/test/sandbox/case/mapuid.nix +++ b/test/sandbox/case/mapuid.nix @@ -96,6 +96,7 @@ in "dbus-1" = fs "80001ff" null null; "default" = fs "80001ff" null null; "dhcpcd.exit-hook" = fs "80001ff" null null; + "environment.d" = fs "80001ff" null null; "fonts" = fs "80001ff" null null; "fstab" = fs "80001ff" null null; "hsurc" = fs "80001ff" null null; @@ -139,6 +140,7 @@ in "set-environment" = fs "80001ff" null null; "shadow" = fs "80001ff" null null; "shells" = fs "80001ff" null null; + "speech-dispatcher" = fs "80001ff" null null; "ssh" = fs "80001ff" null null; "ssl" = fs "80001ff" null null; "static" = fs "80001ff" null null; @@ -255,7 +257,7 @@ in (ent ignore "/run/user/1000/bus" "ro,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") (ent "/bin" "/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") (ent "/usr/bin" "/usr/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") - (ent "/" "/nix/store" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/mnt-root/nix/.ro-store,upperdir=/mnt-root/nix/.rw-store/upper,workdir=/mnt-root/nix/.rw-store/work,uuid=on") + (ent "/" "/nix/store" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/sysroot/nix/.ro-store,upperdir=/sysroot/nix/.rw-store/upper,workdir=/sysroot/nix/.rw-store/work,uuid=on") (ent "/block" "/sys/block" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") (ent "/bus" "/sys/bus" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") (ent "/class" "/sys/class" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") diff --git a/test/sandbox/case/pd.nix b/test/sandbox/case/pd.nix index 9ea799f2..2174cd8b 100644 --- a/test/sandbox/case/pd.nix +++ b/test/sandbox/case/pd.nix @@ -57,6 +57,7 @@ "dbus-1" = fs "80001ff" null null; "default" = fs "80001ff" null null; "dhcpcd.exit-hook" = fs "80001ff" null null; + "environment.d" = fs "80001ff" null null; "fonts" = fs "80001ff" null null; "fstab" = fs "80001ff" null null; "hsurc" = fs "80001ff" null null; @@ -100,6 +101,7 @@ "set-environment" = fs "80001ff" null null; "shadow" = fs "80001ff" null null; "shells" = fs "80001ff" null null; + "speech-dispatcher" = fs "80001ff" null null; "ssh" = fs "80001ff" null null; "ssl" = fs "80001ff" null null; "static" = fs "80001ff" null null; @@ -145,22 +147,22 @@ (ent "/lib64" "/lib64" "rw,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") (ent "/lost+found" "/lost+found" "rw,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") (ent "/nix" "/nix" "rw,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") - (ent "/" "/nix/.ro-store" "rw,nosuid,nodev,relatime" "9p" "nix-store" ignore) (ent "/" "/nix/.rw-store" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" "rw,mode=755") - (ent "/" "/nix/store" "rw,relatime" "overlay" "overlay" "rw,lowerdir=/mnt-root/nix/.ro-store,upperdir=/mnt-root/nix/.rw-store/upper,workdir=/mnt-root/nix/.rw-store/work,uuid=on") - (ent "/" "/nix/store" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/mnt-root/nix/.ro-store,upperdir=/mnt-root/nix/.rw-store/upper,workdir=/mnt-root/nix/.rw-store/work,uuid=on") + (ent "/" "/nix/.ro-store" "rw,nosuid,nodev,relatime" "9p" "nix-store" ignore) + (ent "/" "/nix/store" "rw,relatime" "overlay" "overlay" "rw,lowerdir=/sysroot/nix/.ro-store,upperdir=/sysroot/nix/.rw-store/upper,workdir=/sysroot/nix/.rw-store/work,uuid=on") + (ent "/" "/nix/store" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/sysroot/nix/.ro-store,upperdir=/sysroot/nix/.rw-store/upper,workdir=/sysroot/nix/.rw-store/work,uuid=on") (ent "/root" "/root" "rw,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") (ent "/" "/run" "rw,nosuid,nodev" "tmpfs" "tmpfs" ignore) (ent "/" "/run/keys" "rw,nosuid,nodev,relatime" "ramfs" "ramfs" "rw,mode=750") - (ent "/" "/run/credentials/systemd-journald.service" "ro,nosuid,nodev,noexec,relatime,nosymfollow" "tmpfs" "tmpfs" "rw,size=1024k,nr_inodes=1024,mode=700,noswap") + (ent "/" "/run/credentials/systemd-journald.service" "rw,nosuid,nodev,noexec,relatime,nosymfollow" "tmpfs" "none" "ro,size=1024k,nr_inodes=1024,mode=700,noswap") (ent "/" "/run/wrappers" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" ignore) - (ent "/" "/run/credentials/getty@tty1.service" "ro,nosuid,nodev,noexec,relatime,nosymfollow" "tmpfs" "tmpfs" "rw,size=1024k,nr_inodes=1024,mode=700,noswap") + (ent "/" "/run/credentials/getty@tty1.service" "rw,nosuid,nodev,noexec,relatime,nosymfollow" "tmpfs" "none" "ro,size=1024k,nr_inodes=1024,mode=700,noswap") (ent "/" "/run/user/1000" "rw,nosuid,nodev,relatime" "tmpfs" "tmpfs" ignore) (ent "/srv" "/srv" "rw,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") (ent "/" "/sys" "rw,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") (ent "/" "/sys/kernel/security" "rw,nosuid,nodev,noexec,relatime" "securityfs" "securityfs" "rw") - (ent "/../../.." "/sys/fs/cgroup" "rw,nosuid,nodev,noexec,relatime" "cgroup2" "cgroup2" "rw,nsdelegate,memory_recursiveprot") - (ent "/" "/sys/fs/pstore" "rw,nosuid,nodev,noexec,relatime" "pstore" "pstore" "rw") + (ent "/../../.." "/sys/fs/cgroup" "rw,nosuid,nodev,noexec,relatime" "cgroup2" "cgroup2" "rw,nsdelegate,memory_recursiveprot,memory_hugetlb_accounting") + (ent "/" "/sys/fs/pstore" "rw,nosuid,nodev,noexec,relatime" "pstore" "none" "rw") (ent "/" "/sys/fs/bpf" "rw,nosuid,nodev,noexec,relatime" "bpf" "bpf" "rw,mode=700") # systemd nondeterminism: tracefs debugfs configfs fusectl (ent "/" ignore "rw,nosuid,nodev,noexec,relatime" ignore ignore "rw") diff --git a/test/sandbox/case/pdlike.nix b/test/sandbox/case/pdlike.nix index 9be58348..7f0716fb 100644 --- a/test/sandbox/case/pdlike.nix +++ b/test/sandbox/case/pdlike.nix @@ -94,6 +94,7 @@ in "dbus-1" = fs "80001ff" null null; "default" = fs "80001ff" null null; "dhcpcd.exit-hook" = fs "80001ff" null null; + "environment.d" = fs "80001ff" null null; "fonts" = fs "80001ff" null null; "fstab" = fs "80001ff" null null; "hsurc" = fs "80001ff" null null; @@ -137,6 +138,7 @@ in "set-environment" = fs "80001ff" null null; "shadow" = fs "80001ff" null null; "shells" = fs "80001ff" null null; + "speech-dispatcher" = fs "80001ff" null null; "ssh" = fs "80001ff" null null; "ssl" = fs "80001ff" null null; "static" = fs "80001ff" null null; @@ -253,7 +255,7 @@ in (ent ignore "/run/user/65534/bus" "ro,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") (ent "/bin" "/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") (ent "/usr/bin" "/usr/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") - (ent "/" "/nix/store" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/mnt-root/nix/.ro-store,upperdir=/mnt-root/nix/.rw-store/upper,workdir=/mnt-root/nix/.rw-store/work,uuid=on") + (ent "/" "/nix/store" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/sysroot/nix/.ro-store,upperdir=/sysroot/nix/.rw-store/upper,workdir=/sysroot/nix/.rw-store/work,uuid=on") (ent "/block" "/sys/block" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") (ent "/bus" "/sys/bus" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") (ent "/class" "/sys/class" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") diff --git a/test/sandbox/case/preset.nix b/test/sandbox/case/preset.nix index a333d356..33cc3b8b 100644 --- a/test/sandbox/case/preset.nix +++ b/test/sandbox/case/preset.nix @@ -93,6 +93,7 @@ in "dbus-1" = fs "80001ff" null null; "default" = fs "80001ff" null null; "dhcpcd.exit-hook" = fs "80001ff" null null; + "environment.d" = fs "80001ff" null null; "fonts" = fs "80001ff" null null; "fstab" = fs "80001ff" null null; "hsurc" = fs "80001ff" null null; @@ -136,6 +137,7 @@ in "set-environment" = fs "80001ff" null null; "shadow" = fs "80001ff" null null; "shells" = fs "80001ff" null null; + "speech-dispatcher" = fs "80001ff" null null; "ssh" = fs "80001ff" null null; "ssl" = fs "80001ff" null null; "static" = fs "80001ff" null null; @@ -250,7 +252,7 @@ in (ent ignore "/run/user/65534/bus" "ro,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") (ent "/bin" "/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") (ent "/usr/bin" "/usr/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") - (ent "/" "/nix/store" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/mnt-root/nix/.ro-store,upperdir=/mnt-root/nix/.rw-store/upper,workdir=/mnt-root/nix/.rw-store/work,uuid=on") + (ent "/" "/nix/store" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/sysroot/nix/.ro-store,upperdir=/sysroot/nix/.rw-store/upper,workdir=/sysroot/nix/.rw-store/work,uuid=on") (ent "/block" "/sys/block" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") (ent "/bus" "/sys/bus" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") (ent "/class" "/sys/class" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") diff --git a/test/sandbox/case/tty.nix b/test/sandbox/case/tty.nix index ccd404a9..4ba9360e 100644 --- a/test/sandbox/case/tty.nix +++ b/test/sandbox/case/tty.nix @@ -98,6 +98,7 @@ in "dbus-1" = fs "80001ff" null null; "default" = fs "80001ff" null null; "dhcpcd.exit-hook" = fs "80001ff" null null; + "environment.d" = fs "80001ff" null null; "fonts" = fs "80001ff" null null; "fstab" = fs "80001ff" null null; "hsurc" = fs "80001ff" null null; @@ -141,6 +142,7 @@ in "set-environment" = fs "80001ff" null null; "shadow" = fs "80001ff" null null; "shells" = fs "80001ff" null null; + "speech-dispatcher" = fs "80001ff" null null; "ssh" = fs "80001ff" null null; "ssl" = fs "80001ff" null null; "static" = fs "80001ff" null null; @@ -261,7 +263,7 @@ in (ent ignore "/run/user/65534/bus" "ro,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") (ent "/bin" "/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") (ent "/usr/bin" "/usr/bin" "ro,nosuid,nodev,relatime" "ext4" "/dev/vda" "rw") - (ent "/" "/nix/store" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/mnt-root/nix/.ro-store,upperdir=/mnt-root/nix/.rw-store/upper,workdir=/mnt-root/nix/.rw-store/work,uuid=on") + (ent "/" "/nix/store" "ro,nosuid,nodev,relatime" "overlay" "overlay" "rw,lowerdir=/sysroot/nix/.ro-store,upperdir=/sysroot/nix/.rw-store/upper,workdir=/sysroot/nix/.rw-store/work,uuid=on") (ent "/block" "/sys/block" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") (ent "/bus" "/sys/bus" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") (ent "/class" "/sys/class" "ro,nosuid,nodev,noexec,relatime" "sysfs" "sysfs" "rw") diff --git a/test/sandbox/default.nix b/test/sandbox/default.nix index 5528fd9b..a0b8d13a 100644 --- a/test/sandbox/default.nix +++ b/test/sandbox/default.nix @@ -15,7 +15,9 @@ testers.nixosTest { environment.hakurei = lib.mkIf withRace rec { # race detector does not support static linking package = (pkgs.callPackage ../../package.nix { }).overrideAttrs (previousAttrs: { - GOFLAGS = previousAttrs.GOFLAGS ++ [ "-race" ]; + env = previousAttrs.env // { + GOFLAGS = previousAttrs.env.GOFLAGS + " -race"; + }; }); hsuPackage = options.environment.hakurei.hsuPackage.default.override { hakurei = package; }; };