Merge pull request #192437 from kyoDralliam/metacoq-fix-dev
fix metacoq builds for coq >= 8.16 in dev mode, adds 1.1 release for coq 8.16
This commit is contained in:
commit
ff346a442d
|
@ -10,9 +10,9 @@ let
|
|||
{ case = "8.12"; out = "1.0-beta2-8.12"; }
|
||||
# Do not provide 8.13 because it does not compile with equations 1.3 provided by default (only 1.2.3)
|
||||
# { case = "8.13"; out = "1.0-beta2-8.13"; }
|
||||
{ case = "8.14"; out = "1.0-8.14"; }
|
||||
{ case = "8.15"; out = "1.0-8.15"; }
|
||||
{ case = "8.16"; out = "1.0-8.16"; }
|
||||
{ case = "8.14"; out = "1.1-8.14"; }
|
||||
{ case = "8.15"; out = "1.1-8.15"; }
|
||||
{ case = "8.16"; out = "1.1-8.16"; }
|
||||
] null;
|
||||
release = {
|
||||
"1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs=";
|
||||
|
@ -21,6 +21,9 @@ let
|
|||
"1.0-8.14".sha256 = "sha256-iRnaNeHt22JqxMNxOGPPycrO9EoCVjusR2s0GfON1y0=";
|
||||
"1.0-8.15".sha256 = "sha256-8RUC5dHNfLJtJh+IZG4nPTAVC8ZKVh2BHedkzjwLf/k=";
|
||||
"1.0-8.16".sha256 = "sha256-7rkCAN4PNnMgsgUiiLe2TnAliknN75s2SfjzyKCib/o=";
|
||||
"1.1-8.14".sha256 = "sha256-6vViCNQl6BnGgOHX3P/OLfFXN4aUfv4RbDokfz2BgQI=";
|
||||
"1.1-8.15".sha256 = "sha256-qCD3wFW4E+8vSVk4XoZ0EU4PVya0al+JorzS9nzmR/0=";
|
||||
"1.1-8.16".sha256 = "sha256-cTK4ptxpPPlqxAhasZFX3RpSlsoTZwhTqs2A3BZy9sA=";
|
||||
};
|
||||
releaseRev = v: "v${v}";
|
||||
|
||||
|
@ -75,10 +78,13 @@ let
|
|||
};
|
||||
} // optionalAttrs (package != "single")
|
||||
{ passthru = genAttrs packages metacoq_; })
|
||||
).overrideAttrs (o: {
|
||||
propagatedBuildInputs = o.propagatedBuildInputs ++
|
||||
optional (versionAtLeast o.version "1.0-8.16") coq.ocamlPackages.stdlib-shims;
|
||||
});
|
||||
in derivation;
|
||||
).overrideAttrs (o:
|
||||
let requiresOcamlStdlibShims = versionAtLeast o.version "1.0-8.16" ||
|
||||
(o.version == "dev" && (versionAtLeast coq.coq-version "8.16" || coq.coq-version == "dev")) ;
|
||||
in
|
||||
{
|
||||
propagatedBuildInputs = o.propagatedBuildInputs ++ optional requiresOcamlStdlibShims coq.ocamlPackages.stdlib-shims;
|
||||
});
|
||||
in derivation;
|
||||
in
|
||||
metacoq_ (if single then "single" else "all")
|
||||
|
|
Loading…
Reference in a new issue