lix-project/lix-installer
16
4
Fork 4
Code Issues 23 Code Review (Gerrit) Projects Activity

Reintroduce 640, 638, 627 (#651)

Browse source 
* Reintroduce 640, 638, 627

* fmt
This commit is contained in:
Ana Hobden 2023-09-28 15:58:31 -07:00 committed by GitHub
parent b0bdd3ddef
commit 042873d7d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/action/common/place_nix_configuration.rs
View file

@ -91,7 +91,7 @@ impl PlaceNixConfiguration {
let settings = nix_config.settings_mut(); let settings = nix_config.settings_mut();
settings.insert("build-users-group".to_string(), nix_build_group_name); 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()) { match settings.entry("experimental-features".to_string()) {
Entry::Occupied(mut slot) => { Entry::Occupied(mut slot) => {
let slot_mut = slot.get_mut(); let slot_mut = slot.get_mut();
@ -115,6 +115,7 @@ impl PlaceNixConfiguration {
"bash-prompt-prefix".to_string(), "bash-prompt-prefix".to_string(),
"(nix:$name)\\040".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 { if let Some(ssl_cert_file) = ssl_cert_file {
let ssl_cert_file_canonical = ssl_cert_file let ssl_cert_file_canonical = ssl_cert_file
.canonicalize() .canonicalize()
@ -129,11 +130,6 @@ impl PlaceNixConfiguration {
"nixpkgs=flake:nixpkgs".to_string(), "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) let create_directory = CreateDirectory::plan(NIX_CONF_FOLDER, None, None, 0o0755, force)
.await .await
.map_err(Self::error)?; .map_err(Self::error)?;