the-distro/ofborg
2
0
Fork 1
Code Issues 5 Pull requests 1 Projects Releases Packages Wiki Activity

tasks/eval/nixpkgs: pass in rev, use proper rev and shortrev

Browse source 
Here, we can easily access the real commit ID, so pass it in instead of
a bogus rev and shortRev.

Hydra seems to have passed in rev all the time, and nixpkgs will soon
require `rev` to be set.

This initially broke nixpkgs eval in
5e8545e723,
so we now update ofborg to always pass `rev` when instantiating nixpkgs
to avoid breaking it.
This commit is contained in:
Florian Klink 2020-03-29 22:38:11 +02:00
parent 29ac8fbba9
commit 5fadddfbb0
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ofborg/src/tasks/eval/nixpkgs.rs
View file

@ -406,6 +406,12 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
}
fn evaluation_checks(&self) -> Vec<EvalChecker> {
// the value that's passed as the nixpkgs arg
let nixpkgs_arg_value = format!(
"{{ outPath=./.; revCount=999999; shortRev=\"{}\"; rev=\"{}\"; }}",
&self.job.pr.head_sha[0..7],
&self.job.pr.head_sha,
);
vec![
EvalChecker::new(
"package-list",
@ -431,7 +437,7 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
vec![
String::from("--arg"),
String::from("nixpkgs"),
String::from("{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; }"),
nixpkgs_arg_value.clone(),
String::from("./nixos/release-combined.nix"),
String::from("-A"),
String::from("tested"),
@ -444,7 +450,7 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
vec![
String::from("--arg"),
String::from("nixpkgs"),
String::from("{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; }"),
nixpkgs_arg_value.clone(),
String::from("./nixos/release.nix"),
String::from("-A"),
String::from("options"),
@ -457,7 +463,7 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
vec![
String::from("--arg"),
String::from("nixpkgs"),
String::from("{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; }"),
nixpkgs_arg_value.clone(),
String::from("./nixos/release.nix"),
String::from("-A"),
String::from("manual"),
@ -470,7 +476,7 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
vec![
String::from("--arg"),
String::from("nixpkgs"),
String::from("{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; }"),
nixpkgs_arg_value.clone(),
String::from("./pkgs/top-level/release.nix"),
String::from("-A"),
String::from("manual"),
@ -483,7 +489,7 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
vec![
String::from("--arg"),
String::from("nixpkgs"),
String::from("{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; }"),
nixpkgs_arg_value.clone(),
String::from("./pkgs/top-level/release.nix"),
String::from("-A"),
String::from("tarball"),
@ -496,7 +502,7 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
vec![
String::from("--arg"),
String::from("nixpkgs"),
String::from("{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; }"),
nixpkgs_arg_value.clone(),
String::from("./pkgs/top-level/release.nix"),
String::from("-A"),
String::from("unstable"),
@ -509,7 +515,7 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
vec![
String::from("--arg"),
String::from("nixpkgs"),
String::from("{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; }"),
nixpkgs_arg_value,
String::from("./pkgs/top-level/release.nix"),
String::from("-A"),
String::from("darwin-tested"),