mirrors/magic-nix-cache
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #102 from DeterminateSystems/colemickens/fallback

Browse source 
nix.conf: move write for 'fallback', always set it
This commit is contained in:
Cole Mickens 2024-09-16 12:22:57 -05:00 committed by GitHub
parent f13fa9e9f3 2bcd86656f
commit 5b126b691b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
magic-nix-cache/src/main.rs
View file

@ -222,6 +222,11 @@ async fn main_cli() -> Result<()> {
.open(&nix_conf_path) .open(&nix_conf_path)
.with_context(|| "Creating nix.conf")?; .with_context(|| "Creating nix.conf")?;
// always enable fallback, first
nix_conf
.write_all(b"fallback = true\n")
.with_context(|| "Setting fallback in nix.conf")?;
let store = Arc::new(NixStore::connect()?); let store = Arc::new(NixStore::connect()?);
let narinfo_negative_cache = Arc::new(RwLock::new(HashSet::new())); let narinfo_negative_cache = Arc::new(RwLock::new(HashSet::new()));

8
magic-nix-cache/src/pbh.rs
View file

@ -186,13 +186,7 @@ pub async fn setup_legacy_post_build_hook(
/* Update nix.conf. */ /* Update nix.conf. */
nix_conf nix_conf
.write_all( .write_all(format!("post-build-hook = {}\n", post_build_hook_script.display()).as_bytes())
format!(
"fallback = true\npost-build-hook = {}\n",
post_build_hook_script.display()
)
.as_bytes(),
)
.with_context(|| "Writing to nix.conf")?; .with_context(|| "Writing to nix.conf")?;
Ok(()) Ok(())