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

ofborg: nix: pass rev to nixpkgs

Browse source 
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:34:49 +02:00
parent ea4b7f8aab
commit 29ac8fbba9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ofborg/src/nix.rs
View file

@ -219,7 +219,7 @@ impl Nix {
args.push(String::from("--arg")); args.push(String::from("--arg"));
args.push(String::from("nixpkgs")); args.push(String::from("nixpkgs"));
args.push(String::from( args.push(String::from(
"{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; }", "{ outPath=./.; revCount=999999; shortRev=\"ofborg\"; rev=\"0000000000000000000000000000000000000000\"; }",
)); ));
} }
command.args(args); command.args(args);
@ -659,7 +659,7 @@ mod tests {
Expect::Pass, Expect::Pass,
vec![ vec![
"./nixos/release.nix", "./nixos/release.nix",
"--arg nixpkgs { outPath=./.; revCount=999999; shortRev=\"ofborg\"; }", "--arg nixpkgs { outPath=./.; revCount=999999; shortRev=\"ofborg\"; rev=\"0000000000000000000000000000000000000000\"; }",
], ],
); );
} }