Bump ppx_protocol_conv and remove custom patch

Patch was accepted upstream: andersfugmann/ppx_protocol_conv@c51ed3e
dividat · Nov 26, 2024 · 815e614 · 815e614
1 parent deba726
commit 815e614
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 21 deletions.
diff --git a/pkgs/ocaml-modules/ppx_protocol_conv/default.nix b/pkgs/ocaml-modules/ppx_protocol_conv/default.nix
@@ -18,8 +18,8 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "andersfugmann";
     repo = "ppx_protocol_conv";
-    rev = "9a1c4f450cf4fc797e09296d736e5c21f6eb7c4a";
-    sha256 = "sha256-3WlpuuRJfZA6UaeuJRuYI2Z9J7Yng+/J09BDmETwy30=";
+    rev = "0a4fd698932f20345cb3ba12bab82a9eda4d9147";
+    sha256 = "sha256-gFYg0251NOPPkc01BiSU3NEj3JWGKg1fu6UgQ67BBZM=";
   };
 
   useDune2 = true;

diff --git a/pkgs/ocaml-modules/ppx_protocol_conv_jsonm/default.nix b/pkgs/ocaml-modules/ppx_protocol_conv_jsonm/default.nix
@@ -17,16 +17,12 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "andersfugmann";
     repo = "ppx_protocol_conv";
-    rev = "9a1c4f450cf4fc797e09296d736e5c21f6eb7c4a";
-    sha256 = "sha256-3WlpuuRJfZA6UaeuJRuYI2Z9J7Yng+/J09BDmETwy30=";
+    rev = "0a4fd698932f20345cb3ba12bab82a9eda4d9147";
+    sha256 = "sha256-gFYg0251NOPPkc01BiSU3NEj3JWGKg1fu6UgQ67BBZM=";
   };
 
   useDune2 = true;
 
-  patches = [
-    ./remove-runtime-dependency-from-ppxlib.patch
-  ];
-
   propagatedBuildInputs = [
     ppx_protocol_conv
     ezjsonm

diff --git a/pkgs/ocaml-modules/ppx_protocol_conv_jsonm/remove-runtime-dependency-from-ppxlib.patch b/pkgs/ocaml-modules/ppx_protocol_conv_jsonm/remove-runtime-dependency-from-ppxlib.patch