cy/nixcp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

don't do anything cahash cause serde fails to parse sometimes

Browse source
This commit is contained in:
cy 2025-04-14 16:47:59 -04:00
parent 5111af1d34
commit df8d3a0bc6
Signed by: cy
SSH key fingerprint: SHA256:o/geVWV4om1QhUSkKvDQeW/eAihwnjyXkqMwrVdbuts
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/path_info.rs
View file

@ -2,8 +2,8 @@ use std::collections::HashSet;
use anyhow::{Context, Error, Result}; use anyhow::{Context, Error, Result};
use aws_sdk_s3 as s3; use aws_sdk_s3 as s3;
use nix_compat::nixbase32;
use nix_compat::store_path::StorePath; use nix_compat::store_path::StorePath;
use nix_compat::{nixbase32, nixhash::CAHash};
use regex::Regex; use regex::Regex;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tokio::process::Command; use tokio::process::Command;
@ -18,7 +18,6 @@ pub struct PathInfo {
pub path: StorePath<String>, pub path: StorePath<String>,
signatures: Vec<String>, signatures: Vec<String>,
pub references: Vec<StorePath<String>>, pub references: Vec<StorePath<String>>,
pub ca: Option<CAHash>,
} }
impl PathInfo { impl PathInfo {
/// get PathInfo for a package or a store path /// get PathInfo for a package or a store path

2
src/uploader.rs
View file

@ -157,7 +157,7 @@ impl<'a> Uploader<'a> {
nar_size: nar.len() as u64, nar_size: nar.len() as u64,
references: self.path.references.iter().map(StorePath::as_ref).collect(), references: self.path.references.iter().map(StorePath::as_ref).collect(),
signatures: Vec::new(), signatures: Vec::new(),
ca: self.path.ca.clone(), ca: None,
system: None, system: None,
deriver: Some(self.path.deriver.as_ref()), deriver: Some(self.path.deriver.as_ref()),
compression: Some("zstd"), compression: Some("zstd"),