Merge pull request #278772 from vbgl/ocaml-pgocaml-4.4.0

ocamlPackages.pgocaml: 4.3.0 → 4.4.0

Author: ulrikstrid

pkgs/development/ocaml-modules/macaque/default.nix

@@ -1,34 +1,27 @@
-{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, ocaml
+{ lib, fetchFromGitHub, buildDunePackage
 , calendar, camlp-streams, csv, hex, ppx_deriving, ppx_sexp_conv, re, rresult, sexplib
 }:
 
-let with-camlp-streams = lib.optional (lib.versionAtLeast ocaml.version "5.0"); in
-
 buildDunePackage rec {
   pname = "pgocaml";
-  version = "4.3.0";
+  version = "4.4.0";
   src = fetchFromGitHub {
     owner = "darioteixeira";
     repo = "pgocaml";
-    rev = version;
-    hash = "sha256-W1fbRnU1l61qqxfVY2qiBnVpGD81xrBO8k0tWr+RXMY=";
+    rev = "v${version}";
+    hash = "sha256-Mz3zVgXas1UivH/BVARx5kWClgr9v9YcGarwaD961tU=";
   };
 
-  # Compatibility with OCaml ≥ 5.0
-  patches = with-camlp-streams (fetchpatch {
-    url = "https://github.com/darioteixeira/pgocaml/commit/906a289dc57da4971e312c31eedd26d81e902ed5.patch";
-    hash = "sha256-/v9Jheg98GhrcD2gcsQpPvq7YiIrvJj22SKvrBRlR9Y=";
-  });
-
   minimalOCamlVersion = "4.08";
 
-  propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re rresult sexplib ]
-  ++ with-camlp-streams camlp-streams;
+  propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re
+    rresult sexplib camlp-streams
+  ];
 
   meta = with lib; {
     description = "An interface to PostgreSQL databases for OCaml applications";
-    inherit (src.meta) homepage;
-    license = licenses.lgpl2;
+    homepage = "https://github.com/darioteixeira/pgocaml";
+    license = licenses.lgpl2Only;
     maintainers = with maintainers; [ vbgl ];
   };
 }

pkgs/development/ocaml-modules/pgocaml/default.nix

@@ -4,8 +4,6 @@ buildDunePackage {
   pname = "pgocaml_ppx";
   inherit (pgocaml) src version meta;
 
-  duneVersion = "3";
-
   buildInputs = [ ppx_optcomp ];
   propagatedBuildInputs = [ pgocaml ];
 }

pkgs/development/ocaml-modules/pgocaml/ppx.nix

@@ -1010,8 +1010,6 @@ let
 
     macaddr-sexp = callPackage ../development/ocaml-modules/macaddr/sexp.nix { };
 
-    macaque = callPackage ../development/ocaml-modules/macaque { };
-
     mad = callPackage ../development/ocaml-modules/mad { };
 
     magic = callPackage ../development/ocaml-modules/magic { };