summary refs log tree commit diff
path: root/pkgs/development/coq-modules
diff options
context:
space:
mode:
authorDimitrije Radojević <me@dimitrije.website>2023-08-31 06:46:20 +0100
committerGitHub <noreply@github.com>2023-08-31 07:46:20 +0200
commit9b4d043ba2c3c7770bb23ea8ba7858c2a93906a6 (patch)
treeeddf1e19133d19e5b0780f6a49947e1ba45bd396 /pkgs/development/coq-modules
parente6eee3ee22cb70d9ce558a04712aa5b633fcf5fb (diff)
downloadnixpkgs-9b4d043ba2c3c7770bb23ea8ba7858c2a93906a6.tar
nixpkgs-9b4d043ba2c3c7770bb23ea8ba7858c2a93906a6.tar.gz
nixpkgs-9b4d043ba2c3c7770bb23ea8ba7858c2a93906a6.tar.bz2
nixpkgs-9b4d043ba2c3c7770bb23ea8ba7858c2a93906a6.tar.lz
nixpkgs-9b4d043ba2c3c7770bb23ea8ba7858c2a93906a6.tar.xz
nixpkgs-9b4d043ba2c3c7770bb23ea8ba7858c2a93906a6.tar.zst
nixpkgs-9b4d043ba2c3c7770bb23ea8ba7858c2a93906a6.zip
ocamlPackages.janestreet: 0.15 -> 0.16 (#247022)
Diffstat (limited to 'pkgs/development/coq-modules')
-rw-r--r--pkgs/development/coq-modules/serapi/default.nix4
-rw-r--r--pkgs/development/coq-modules/serapi/janestreet-0.16.patch17
2 files changed, 21 insertions, 0 deletions
diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix
index ac09d26935a..b33c89aa63c 100644
--- a/pkgs/development/coq-modules/serapi/default.nix
+++ b/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/pkgs/development/coq-modules/serapi/janestreet-0.16.patch b/pkgs/development/coq-modules/serapi/janestreet-0.16.patch
new file mode 100644
index 00000000000..01aac57639a
--- /dev/null
+++ b/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