snowfallorg/nix-software-center
1
1
Fork 0
mirror of https://github.com/snowfallorg/nix-software-center.git synced 2024-08-18 01:20:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

(Hopefully) Fix profile nixpkgs download

Browse Source
This commit is contained in:
Victor Fuentes 2022-09-29 15:42:54 -04:00
parent 8a6810fe08
commit b1a89ece31
No known key found for this signature in database
GPG Key ID: 0A88B68D6A9ACAE0
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/parse/cache.rs
View File

@ -348,21 +348,8 @@ fn setupprofilepkgscache() -> Result<(), Box<dyn Error>> {
fs::remove_file(format!("{}/chnver.txt", &cachedir).as_str())?;
}
let vout = Command::new("nixos-version").arg("--json").output()?;
let versiondata: Value = serde_json::from_str(&String::from_utf8_lossy(&vout.stdout))?;
let dlver = versiondata.get("nixosVersion").unwrap().as_str().unwrap();
let mut relver = dlver.split('.').collect::<Vec<&str>>()[0..2].join(".");
if relver == "22.11" {
relver = "unstable".to_string();
}
fs::create_dir_all(&cachedir).expect("Failed to create cache directory");
let url = format!(
"https://channels.nixos.org/nixpkgs-{}/packages.json.br",
relver.trim()
);
let url = "https://channels.nixos.org/nixpkgs-unstable/packages.json.br".to_string();
// Check nix profile nixpkgs version
let client = reqwest::blocking::Client::builder()
@ -381,7 +368,6 @@ fn setupprofilepkgscache() -> Result<(), Box<dyn Error>> {
let mut sysver = fs::File::create(format!("{}/profilever.txt", &cachedir))?;
sysver.write_all(profilerev.as_bytes())?;
dlfile(&url, &format!("{}/profilepackages.json", &cachedir))?;
// writeprofilepkgs(&format!("{}/profilepackages.json", &cachedir))?;
} else {
let oldver =
fs::read_to_string(&Path::new(format!("{}/profilever.txt", &cachedir).as_str()))?;
@ -391,7 +377,6 @@ fn setupprofilepkgscache() -> Result<(), Box<dyn Error>> {
let mut sysver = fs::File::create(format!("{}/profilever.txt", &cachedir))?;
sysver.write_all(profilerev.as_bytes())?;
dlfile(&url, &format!("{}/profilepackages.json", &cachedir))?;
// writeprofilepkgs(&format!("{}/profilepackages.json", &cachedir))?;
} else {
info!("PROFILEVER UP TO DATE");
}
@ -549,6 +534,12 @@ fn dlfile(url: &str, path: &str) -> Result<(), Box<dyn Error>> {
}
}
}
} else {
error!("Failed to download {}", url);
return Err(Box::new(std::io::Error::new(
std::io::ErrorKind::InvalidData,
"Failed to download file",
)))
}
trace!("Finished downloading {} -> {}", url, path);
Ok(())