From 6c92aec801dc4067f6308e0c83c6eac8f972ba3d Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Wed, 13 Sep 2023 10:12:01 -0700 Subject: [PATCH] Fix bad rebase --- src/action/common/place_nix_configuration.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/action/common/place_nix_configuration.rs b/src/action/common/place_nix_configuration.rs index b7e42d416..82da733da 100644 --- a/src/action/common/place_nix_configuration.rs +++ b/src/action/common/place_nix_configuration.rs @@ -52,7 +52,6 @@ impl PlaceNixConfiguration { }; // https://github.com/DeterminateSystems/nix-installer/issues/449#issuecomment-1551782281 -<<<<<<< HEAD #[cfg(not(target_os = "macos"))] settings.insert("auto-optimise-store".to_string(), "true".to_string()); @@ -60,11 +59,7 @@ impl PlaceNixConfiguration { "bash-prompt-prefix".to_string(), "(nix:$name)\\040".to_string(), ); -======= - defaults_conf_settings.push(("bash-prompt-prefix", "(nix:$name)\\040".into())); - defaults_conf_settings.push(("max-jobs", "auto".into())); - defaults_conf_settings.push(("extra-nix-path", "nixpkgs=flake:nixpkgs".into())); ->>>>>>> f938f56 (Set max-jobs in nix.conf) + 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()