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

Reintroduce 640, 638, 627 #651

Merged
merged 3 commits into from
Sep 28, 2023
+2 −6
Merged

Reintroduce 640, 638, 627 #651

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e78ca0d
Reintroduce 640, 638, 627
Hoverbear Sep 28, 2023
68ade75
fmt
Hoverbear Sep 28, 2023
b344b10
Missed something from auto-allocate-uids
Hoverbear Sep 28, 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
8 changes: 2 additions & 6 deletions src/action/common/place_nix_configuration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ impl PlaceNixConfiguration {
let settings = nix_config.settings_mut();

settings.insert("build-users-group".to_string(), nix_build_group_name);
let experimental_features = ["nix-command", "flakes", "auto-allocate-uids"];
let experimental_features = ["nix-command", "flakes", "repl-flake"];
match settings.entry("experimental-features".to_string()) {
Entry::Occupied(mut slot) => {
let slot_mut = slot.get_mut();
Expand All @@ -115,6 +115,7 @@ impl PlaceNixConfiguration {
"bash-prompt-prefix".to_string(),
"(nix:$name)\\040".to_string(),
);
settings.insert("max-jobs".to_string(), "auto".to_string());
if let Some(ssl_cert_file) = ssl_cert_file {
let ssl_cert_file_canonical = ssl_cert_file
.canonicalize()
Expand All @@ -129,11 +130,6 @@ impl PlaceNixConfiguration {
"nixpkgs=flake:nixpkgs".to_string(),
);

// Auto-allocate uids is broken on Mac. Tools like `whoami` don't work.
// e.g. https://github.com/NixOS/nix/issues/8444
#[cfg(not(target_os = "macos"))]
settings.insert("auto-allocate-uids".to_string(), "true".to_string());

let create_directory = CreateDirectory::plan(NIX_CONF_FOLDER, None, None, 0o0755, force)
.await
.map_err(Self::error)?;
Expand Down
Loading