Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

ocamlPackages.pgocaml: 4.3.0 → 4.4.0

+9 -18
+9 -16
pkgs/development/ocaml-modules/pgocaml/default.nix
··· 1 - { lib, fetchFromGitHub, fetchpatch, buildDunePackage, ocaml 1 + { lib, fetchFromGitHub, buildDunePackage 2 2 , calendar, camlp-streams, csv, hex, ppx_deriving, ppx_sexp_conv, re, rresult, sexplib 3 3 }: 4 - 5 - let with-camlp-streams = lib.optional (lib.versionAtLeast ocaml.version "5.0"); in 6 4 7 5 buildDunePackage rec { 8 6 pname = "pgocaml"; 9 - version = "4.3.0"; 7 + version = "4.4.0"; 10 8 src = fetchFromGitHub { 11 9 owner = "darioteixeira"; 12 10 repo = "pgocaml"; 13 - rev = version; 14 - hash = "sha256-W1fbRnU1l61qqxfVY2qiBnVpGD81xrBO8k0tWr+RXMY="; 11 + rev = "v${version}"; 12 + hash = "sha256-Mz3zVgXas1UivH/BVARx5kWClgr9v9YcGarwaD961tU="; 15 13 }; 16 14 17 - # Compatibility with OCaml ≥ 5.0 18 - patches = with-camlp-streams (fetchpatch { 19 - url = "https://github.com/darioteixeira/pgocaml/commit/906a289dc57da4971e312c31eedd26d81e902ed5.patch"; 20 - hash = "sha256-/v9Jheg98GhrcD2gcsQpPvq7YiIrvJj22SKvrBRlR9Y="; 21 - }); 22 - 23 15 minimalOCamlVersion = "4.08"; 24 16 25 - propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re rresult sexplib ] 26 - ++ with-camlp-streams camlp-streams; 17 + propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re 18 + rresult sexplib camlp-streams 19 + ]; 27 20 28 21 meta = with lib; { 29 22 description = "An interface to PostgreSQL databases for OCaml applications"; 30 - inherit (src.meta) homepage; 31 - license = licenses.lgpl2; 23 + homepage = "https://github.com/darioteixeira/pgocaml"; 24 + license = licenses.lgpl2Only; 32 25 maintainers = with maintainers; [ vbgl ]; 33 26 }; 34 27 }
-2
pkgs/development/ocaml-modules/pgocaml/ppx.nix
··· 4 4 pname = "pgocaml_ppx"; 5 5 inherit (pgocaml) src version meta; 6 6 7 - duneVersion = "3"; 8 - 9 7 buildInputs = [ ppx_optcomp ]; 10 8 propagatedBuildInputs = [ pgocaml ]; 11 9 }