Current obuilder specs use a mix of opam 2.0 and 2.1 syntax, this needs updating to use 2.1 for everything.