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 <cat@gensokyo.uk>

7 files changed, 27 insertions, 13 deletions

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; };
       };