diff options
Diffstat (limited to 'nixpkgs/pkgs/development/coq-modules')
4 files changed, 27 insertions, 3 deletions
diff --git a/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix index 8b932499ca44..9f958e8d1c44 100644 --- a/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/coq-elpi/default.nix @@ -7,8 +7,8 @@ with builtins; with lib; let { case = "8.13"; out = { version = "1.13.7"; };} { case = "8.14"; out = { version = "1.13.7"; };} { case = "8.15"; out = { version = "1.15.0"; };} - { case = "8.16"; out = { version = "1.16.5"; };} - { case = "8.17"; out = { version = "1.16.5"; };} + { case = "8.16"; out = { version = "1.17.0"; };} + { case = "8.17"; out = { version = "1.17.0"; };} ] {} ); in mkCoqDerivation { pname = "elpi"; @@ -16,7 +16,7 @@ in mkCoqDerivation { owner = "LPCIC"; inherit version; defaultVersion = lib.switch coq.coq-version [ - { case = "8.17"; out = "1.17.0"; } + { case = "8.17"; out = "1.18.0"; } { case = "8.16"; out = "1.15.6"; } { case = "8.15"; out = "1.14.0"; } { case = "8.14"; out = "1.11.2"; } @@ -24,6 +24,7 @@ in mkCoqDerivation { { case = "8.12"; out = "1.8.3_8.12"; } { case = "8.11"; out = "1.6.3_8.11"; } ] null; + release."1.18.0".sha256 = "sha256-2fCOlhqi4YkiL5n8SYHuc3pLH+DArf9zuMH7IhpBc2Y="; release."1.17.0".sha256 = "sha256-J8GatRKFU0ekNCG3V5dBI+FXypeHcLgC5QJYGYzFiEM="; release."1.15.6".sha256 = "sha256-qc0q01tW8NVm83801HHOBHe/7H1/F2WGDbKO6nCXfno="; release."1.15.1".sha256 = "sha256-NT2RlcIsFB9AvBhMxil4ZZIgx+KusMqDflj2HgQxsZg="; diff --git a/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix b/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix index 464ef4fc301d..725f7654de9b 100644 --- a/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/hierarchy-builder/default.nix @@ -5,11 +5,13 @@ let hb = mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ + { case = range "8.15" "8.18"; out = "1.5.0"; } { case = range "8.15" "8.17"; out = "1.4.0"; } { case = range "8.13" "8.14"; out = "1.2.0"; } { case = range "8.12" "8.13"; out = "1.1.0"; } { case = isEq "8.11"; out = "0.10.0"; } ] null; + release."1.5.0".sha256 = "sha256-Lia3o156Pbe8rDHOA1IniGYsG5/qzZkzDKdHecfmS+c="; release."1.4.0".sha256 = "sha256-tOed9UU3kMw6KWHJ5LVLUFEmzHx1ImutXQvZ0ldW9rw="; release."1.3.0".sha256 = "17k7rlxdx43qda6i1yafpgc64na8br285cb0mbxy5wryafcdrkrc"; release."1.2.1".sha256 = "sha256-pQYZJ34YzvdlRSGLwsrYgPdz3p/l5f+KhJjkYT08Mj0="; diff --git a/nixpkgs/pkgs/development/coq-modules/serapi/default.nix b/nixpkgs/pkgs/development/coq-modules/serapi/default.nix index ac09d26935af..b33c89aa63c1 100644 --- a/nixpkgs/pkgs/development/coq-modules/serapi/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/serapi/default.nix @@ -87,6 +87,10 @@ in then [ ./janestreet-0.15.patch ] + else if version == "8.17.0+0.17.0" + then [ + ./janestreet-0.16.patch + ] else [ ]; diff --git a/nixpkgs/pkgs/development/coq-modules/serapi/janestreet-0.16.patch b/nixpkgs/pkgs/development/coq-modules/serapi/janestreet-0.16.patch new file mode 100644 index 000000000000..01aac57639ad --- /dev/null +++ b/nixpkgs/pkgs/development/coq-modules/serapi/janestreet-0.16.patch @@ -0,0 +1,17 @@ +diff --git a/serlib/ser_stdlib.ml b/serlib/ser_stdlib.ml +index 894d300..11c9217 100644 +--- a/serlib/ser_stdlib.ml ++++ b/serlib/ser_stdlib.ml +@@ -28,6 +28,7 @@ let ref_to_yojson f x = f !x + let ref_of_yojson f x = Result.map (fun x -> ref x) (f x) + let hash_fold_ref = hash_fold_ref_frozen + let compare_ref = compare_ref ++let (==) x y = (==) x y + + module Lazy = struct + type 'a t = 'a lazy_t +@@ -35,3 +36,4 @@ module Lazy = struct + end + + module Option = Stdlib.Option ++module List = Stdlib.List |