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

Fixup a couple differences with the official installer scripts (#311)

Browse source 
* Fixup a couple differences with the official installer scripts

* Fixup broken tests
This commit is contained in:
Ana Hobden 2023-03-08 12:44:11 -08:00 committed by GitHub
parent f9ab680840
commit 4a3deef2a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/action/base/create_or_merge_nix_config.rs
View file

@ -16,7 +16,7 @@ use crate::action::{Action, ActionDescription, ActionError, ActionTag, StatefulA
/// The `nix.conf` configuration names that are safe to merge. /// The `nix.conf` configuration names that are safe to merge.
// FIXME(@cole-h): make configurable by downstream users? // FIXME(@cole-h): make configurable by downstream users?
const MERGEABLE_CONF_NAMES: &[&str] = &["experimental-features"]; const MERGEABLE_CONF_NAMES: &[&str] = &["experimental-features"];
const NIX_CONF_MODE: u32 = 0o644; const NIX_CONF_MODE: u32 = 0o664;
const NIX_CONF_COMMENT_CHAR: char = '#'; const NIX_CONF_COMMENT_CHAR: char = '#';
#[non_exhaustive] #[non_exhaustive]
@ -590,6 +590,7 @@ mod test {
"experimental-features = flakes\nwarn-dirty = true\n", "experimental-features = flakes\nwarn-dirty = true\n",
) )
.await?; .await?;
tokio::fs::set_permissions(&test_file, PermissionsExt::from_mode(NIX_CONF_MODE)).await?;
let mut nix_config = NixConfig::new(); let mut nix_config = NixConfig::new();
nix_config nix_config
@ -631,6 +632,7 @@ mod test {
"# test 2\n# test\nexperimental-features = flakes # some inline comment about experimental-features\n# the following line should be warn-dirty = true\nwarn-dirty = true # this is an inline comment\n# this is an ungrouped comment\n# this too", "# test 2\n# test\nexperimental-features = flakes # some inline comment about experimental-features\n# the following line should be warn-dirty = true\nwarn-dirty = true # this is an inline comment\n# this is an ungrouped comment\n# this too",
) )
.await?; .await?;
tokio::fs::set_permissions(&test_file, PermissionsExt::from_mode(NIX_CONF_MODE)).await?;
let mut nix_config = NixConfig::new(); let mut nix_config = NixConfig::new();
nix_config nix_config
.settings_mut() .settings_mut()
@ -662,6 +664,7 @@ mod test {
let test_file = temp_dir.path().join("preserves_comments"); let test_file = temp_dir.path().join("preserves_comments");
write(test_file.as_path(), " a = b\n c = d# lol\n# e = f").await?; write(test_file.as_path(), " a = b\n c = d# lol\n# e = f").await?;
tokio::fs::set_permissions(&test_file, PermissionsExt::from_mode(NIX_CONF_MODE)).await?;
let mut nix_config = NixConfig::new(); let mut nix_config = NixConfig::new();
nix_config nix_config
.settings_mut() .settings_mut()