mirror of
https://github.com/ryan4yin/nix-config.git
synced 2026-07-07 13:25:11 +02:00
fix(nix): preserve default sandbox shell
Setting nix.settings.sandbox-paths replaces Nix compiled sandbox defaults. Keeping only /dev/net made local builds lose the sandbox shell that normally provides /bin/sh, which broke upstream scripts with /bin/sh shebangs in packages such as X11-fonts and openldap. Use extra-sandbox-paths for /dev/net instead. This keeps Nix daemon defaults intact, including the configured sandbox shell, while still allowing builds that need /dev/net. Add eval coverage for both Linux output sets so future changes keep /dev/net in extra-sandbox-paths and do not reintroduce an explicit sandbox-paths override.
This commit is contained in:
@@ -31,7 +31,15 @@
|
||||
"auto-allocate-uids"
|
||||
"cgroups"
|
||||
];
|
||||
sandbox-paths = [ "/dev/net" ];
|
||||
# Use extra-sandbox-paths instead of sandbox-paths here. The plain
|
||||
# sandbox-paths setting replaces Nix's compiled sandbox defaults, including
|
||||
# the sandbox shell that provides /bin/sh for builders with legacy shebangs.
|
||||
# extra-sandbox-paths keeps those defaults and only adds the paths we need.
|
||||
# After deploying, verify the effective daemon config with:
|
||||
# nix config show | grep sandbox-paths
|
||||
extra-sandbox-paths = [
|
||||
"/dev/net"
|
||||
];
|
||||
};
|
||||
|
||||
nix.channel.enable = false; # remove nix-channel related tools & configs, we use flakes instead.
|
||||
|
||||
@@ -7,5 +7,6 @@ lib.genAttrs (builtins.attrNames outputs.nixosConfigurations) (_: {
|
||||
hasUidRange = true;
|
||||
hasAutoAllocateUidsFeature = true;
|
||||
hasCgroupsFeature = true;
|
||||
hasDevNetSandboxPath = true;
|
||||
hasNoExplicitSandboxPaths = true;
|
||||
hasDevNetExtraSandboxPath = true;
|
||||
})
|
||||
|
||||
@@ -16,6 +16,7 @@ lib.genAttrs (builtins.attrNames outputs.nixosConfigurations) (
|
||||
settings.experimental-features or [ ]
|
||||
);
|
||||
hasCgroupsFeature = builtins.elem "cgroups" (settings.experimental-features or [ ]);
|
||||
hasDevNetSandboxPath = builtins.elem "/dev/net" (settings.sandbox-paths or [ ]);
|
||||
hasNoExplicitSandboxPaths = !(settings ? sandbox-paths);
|
||||
hasDevNetExtraSandboxPath = builtins.elem "/dev/net" (settings.extra-sandbox-paths or [ ]);
|
||||
}
|
||||
)
|
||||
|
||||
@@ -7,5 +7,6 @@ lib.genAttrs (builtins.attrNames outputs.nixosConfigurations) (_: {
|
||||
hasUidRange = true;
|
||||
hasAutoAllocateUidsFeature = true;
|
||||
hasCgroupsFeature = true;
|
||||
hasDevNetSandboxPath = true;
|
||||
hasNoExplicitSandboxPaths = true;
|
||||
hasDevNetExtraSandboxPath = true;
|
||||
})
|
||||
|
||||
@@ -16,6 +16,7 @@ lib.genAttrs (builtins.attrNames outputs.nixosConfigurations) (
|
||||
settings.experimental-features or [ ]
|
||||
);
|
||||
hasCgroupsFeature = builtins.elem "cgroups" (settings.experimental-features or [ ]);
|
||||
hasDevNetSandboxPath = builtins.elem "/dev/net" (settings.sandbox-paths or [ ]);
|
||||
hasNoExplicitSandboxPaths = !(settings ? sandbox-paths);
|
||||
hasDevNetExtraSandboxPath = builtins.elem "/dev/net" (settings.extra-sandbox-paths or [ ]);
|
||||
}
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user