diff options
| author | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-09-27 13:39:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-27 13:39:10 +0200 |
| commit | ff346a442d1e5ec81b24c312c06fd134bcc9c088 (patch) | |
| tree | 93cb39f61a770a5c479de8bd5003e526b082faf9 /pkgs/development/coq-modules | |
| parent | 68770d269df8d7d8c7deba87156f66b0f997c071 (diff) | |
| parent | fb3c48614fe70a547f2a87ac797657768c56ff9c (diff) | |
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
Diffstat (limited to 'pkgs/development/coq-modules')
| -rw-r--r-- | pkgs/development/coq-modules/metacoq/default.nix | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index 268ce247c7d33..ab036add60bba 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -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") |