diff --git a/pkgs/ocaml-modules/ppx_protocol_conv/default.nix b/pkgs/ocaml-modules/ppx_protocol_conv/default.nix index 15b74a30..fd9bb665 100644 --- 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 index b991dbc2..06e97ff9 100644 --- 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 deleted file mode 100644 index 8bf5e84f..00000000 --- a/pkgs/ocaml-modules/ppx_protocol_conv_jsonm/remove-runtime-dependency-from-ppxlib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/drivers/jsonm/dune b/drivers/jsonm/dune -index fb0bc81..554241f 100644 ---- a/drivers/jsonm/dune -+++ b/drivers/jsonm/dune -@@ -1,6 +1,6 @@ - (library - (name protocol_conv_jsonm) - (public_name ppx_protocol_conv_jsonm) -- (libraries ppx_protocol_conv ppx_protocol_conv.runtime ppx_protocol_conv.driver ezjsonm) -+ (libraries ppx_protocol_conv.runtime ppx_protocol_conv.driver ezjsonm) - (synopsis "jsonm (de)serialization driver for ppx_protocol_conv based on ezjsonm") - ) -