diff --git a/cmd/fsu/package.nix b/cmd/fsu/package.nix index 879c637..ab5c4b4 100644 --- a/cmd/fsu/package.nix +++ b/cmd/fsu/package.nix @@ -10,7 +10,7 @@ buildGoModule { src = ./.; inherit (fortify) vendorHash; - CGO_ENABLED = 0; + env.CGO_ENABLED = 0; preBuild = '' go mod init fsu >& /dev/null diff --git a/flake.lock b/flake.lock index 9819846..7793d7f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,32 +7,32 @@ ] }, "locked": { - "lastModified": 1746171682, - "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", + "lastModified": 1748665073, + "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", "owner": "nix-community", "repo": "home-manager", - "rev": "50eee705bbdbac942074a8c120e8194185633675", + "rev": "282e1e029cb6ab4811114fc85110613d72771dea", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1746557022, - "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", + "lastModified": 1748437600, + "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", + "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 93e21be..7aee0e1 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "fortify sandbox tool and nixos module"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/test/sandbox/case/device.nix b/test/sandbox/case/device.nix index 173b3e0..802e2e3 100644 --- a/test/sandbox/case/device.nix +++ b/test/sandbox/case/device.nix @@ -35,6 +35,7 @@ "NIXOS" = fs "80001ff" null null; "X11" = fs "80001ff" null null; "alsa" = fs "80001ff" null null; + "bash_logout" = fs "80001ff" null null; "bashrc" = fs "80001ff" null null; "binfmt.d" = fs "80001ff" null null; "dbus-1" = fs "80001ff" null null; @@ -148,7 +149,15 @@ } null; } null; ".local" = fs "800001ed" { + share = fs "800001ed" { + dbus-1 = fs "800001ed" { + services = fs "800001ed" { + "ca.desrt.dconf.service" = fs "80001ff" null null; + } null; + } null; + } null; state = fs "800001ed" { + ".keep" = fs "80001ff" null ""; home-manager = fs "800001ed" { gcroots = fs "800001ed" { current-home = fs "80001ff" null null; } null; } null; nix = fs "800001ed" { profiles = fs "800001ed" { diff --git a/test/sandbox/case/mapuid.nix b/test/sandbox/case/mapuid.nix index 21c89c2..228532c 100644 --- a/test/sandbox/case/mapuid.nix +++ b/test/sandbox/case/mapuid.nix @@ -59,6 +59,7 @@ "NIXOS" = fs "80001ff" null null; "X11" = fs "80001ff" null null; "alsa" = fs "80001ff" null null; + "bash_logout" = fs "80001ff" null null; "bashrc" = fs "80001ff" null null; "binfmt.d" = fs "80001ff" null null; "dbus-1" = fs "80001ff" null null; @@ -172,7 +173,15 @@ } null; } null; ".local" = fs "800001ed" { + share = fs "800001ed" { + dbus-1 = fs "800001ed" { + services = fs "800001ed" { + "ca.desrt.dconf.service" = fs "80001ff" null null; + } null; + } null; + } null; state = fs "800001ed" { + ".keep" = fs "80001ff" null ""; home-manager = fs "800001ed" { gcroots = fs "800001ed" { current-home = fs "80001ff" null null; } null; } null; nix = fs "800001ed" { profiles = fs "800001ed" { diff --git a/test/sandbox/case/preset.nix b/test/sandbox/case/preset.nix index bbea0e4..455ce8a 100644 --- a/test/sandbox/case/preset.nix +++ b/test/sandbox/case/preset.nix @@ -59,6 +59,7 @@ "NIXOS" = fs "80001ff" null null; "X11" = fs "80001ff" null null; "alsa" = fs "80001ff" null null; + "bash_logout" = fs "80001ff" null null; "bashrc" = fs "80001ff" null null; "binfmt.d" = fs "80001ff" null null; "dbus-1" = fs "80001ff" null null; @@ -172,7 +173,15 @@ } null; } null; ".local" = fs "800001ed" { + share = fs "800001ed" { + dbus-1 = fs "800001ed" { + services = fs "800001ed" { + "ca.desrt.dconf.service" = fs "80001ff" null null; + } null; + } null; + } null; state = fs "800001ed" { + ".keep" = fs "80001ff" null ""; home-manager = fs "800001ed" { gcroots = fs "800001ed" { current-home = fs "80001ff" null null; } null; } null; nix = fs "800001ed" { profiles = fs "800001ed" { diff --git a/test/sandbox/case/tty.nix b/test/sandbox/case/tty.nix index 72b2c29..6077ea4 100644 --- a/test/sandbox/case/tty.nix +++ b/test/sandbox/case/tty.nix @@ -60,6 +60,7 @@ "NIXOS" = fs "80001ff" null null; "X11" = fs "80001ff" null null; "alsa" = fs "80001ff" null null; + "bash_logout" = fs "80001ff" null null; "bashrc" = fs "80001ff" null null; "binfmt.d" = fs "80001ff" null null; "dbus-1" = fs "80001ff" null null; @@ -173,7 +174,15 @@ } null; } null; ".local" = fs "800001ed" { + share = fs "800001ed" { + dbus-1 = fs "800001ed" { + services = fs "800001ed" { + "ca.desrt.dconf.service" = fs "80001ff" null null; + } null; + } null; + } null; state = fs "800001ed" { + ".keep" = fs "80001ff" null ""; home-manager = fs "800001ed" { gcroots = fs "800001ed" { current-home = fs "80001ff" null null; } null; } null; nix = fs "800001ed" { profiles = fs "800001ed" {