diff options
| author | Vincent Laporte <vbgl@users.noreply.github.com> | 2026-02-05 16:45:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-05 16:45:17 +0000 |
| commit | 65bf8db7d1c207260dde2041a9ff43a93d77ce6e (patch) | |
| tree | 53efffe27da9fba13a4dd6126c70c66e65f1d4e0 /pkgs/applications | |
| parent | harper: 1.5.1 -> 1.6.0 (#487056) (diff) | |
| parent | rocq-core_9_2: init at 9.2+rc1 (diff) | |
| download | nixpkgs-65bf8db7d1c207260dde2041a9ff43a93d77ce6e.tar.gz | |
rocq-core_9_2: init at 9.2+rc1 (#487257)
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/science/logic/coq/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/rocq-core/default.nix | 14 |
2 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 1884ef85fe57..5f8526d879aa 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -19,6 +19,7 @@ ocamlPackages_4_10, ocamlPackages_4_12, ocamlPackages_4_14, + ocamlPackages_5_4, rocqPackages, # for versions >= 9.0 that are transition shims on top of Rocq ncurses, buildIde ? null, # default is true for Coq < 8.14 and false for Coq >= 8.14 @@ -73,6 +74,7 @@ let "9.0.0".sha256 = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU="; "9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk="; "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE="; + "9.2+rc1".sha256 = "sha256-zKVhnBid5LOcd7uHWFGmUdHpyNLxIyB7RNNz5btz0mI="; }; releaseRev = v: "V${v}"; fetched = @@ -111,7 +113,7 @@ let else lib.switch coq-version [ { - case = lib.versions.range "8.16" "8.18"; + case = lib.versions.range "8.16" "9.1"; out = ocamlPackages_4_14; } { @@ -126,7 +128,7 @@ let case = lib.versions.range "8.7" "8.10"; out = ocamlPackages_4_09; } - ] ocamlPackages_4_14; + ] ocamlPackages_5_4; ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib diff --git a/pkgs/applications/science/logic/rocq-core/default.nix b/pkgs/applications/science/logic/rocq-core/default.nix index 3d76ff2d0fda..bf8776d13d70 100644 --- a/pkgs/applications/science/logic/rocq-core/default.nix +++ b/pkgs/applications/science/logic/rocq-core/default.nix @@ -14,6 +14,7 @@ dune, customOCamlPackages ? null, ocamlPackages_4_14, + ocamlPackages_5_4, ncurses, csdp ? null, version, @@ -26,6 +27,7 @@ let "9.0.0".sha256 = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU="; "9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk="; "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE="; + "9.2+rc1".sha256 = "sha256-zKVhnBid5LOcd7uHWFGmUdHpyNLxIyB7RNNz5btz0mI="; }; releaseRev = v: "V${v}"; fetched = @@ -53,7 +55,17 @@ let substituteInPlace plugins/micromega/sos.ml --replace-warn "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/coq_micromega.ml --replace-warn "System.is_in_system_path \"csdp\"" "true" ''; - ocamlPackages = if customOCamlPackages != null then customOCamlPackages else ocamlPackages_4_14; + ocamlPackages = + if customOCamlPackages != null then + customOCamlPackages + else + let + case = case: out: { inherit case out; }; + inherit (lib.versions) range; + in + lib.switch rocq-version [ + (case (range "9.0" "9.1") ocamlPackages_4_14) + ] ocamlPackages_5_4; ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib |