diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2022-11-28 11:57:36 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-12-05 13:52:32 +0100 |
| commit | 5c0a95cafb70c417fe7fe1c5d3183aa8343a3222 (patch) | |
| tree | bf44006b1b4d392f44e03a8c175e2631980d2c41 | |
| parent | Merge pull request #204101 from NixOS/backport-204091-to-release-22.11 (diff) | |
| download | nixpkgs-5c0a95cafb70c417fe7fe1c5d3183aa8343a3222.tar.gz | |
ocamlPackages.gen: 0.5 → 1.0
(cherry picked from commit e2c3f5f58fcace769eb63644b86ea49adea4c334)
| -rw-r--r-- | pkgs/development/ocaml-modules/gen/default.nix | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 1c12f3ac5f87..ee932bffd5e6 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -1,31 +1,30 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: +{ lib, buildDunePackage, fetchFromGitHub, ocaml +, dune-configurator +, seq +, qcheck, ounit2 +}: -stdenv.mkDerivation rec { - version = "0.5"; - pname = "ocaml${ocaml.version}-gen"; +buildDunePackage rec { + version = "1.0"; + pname = "gen"; + minimalOCamlVersion = "4.03"; src = fetchFromGitHub { owner = "c-cube"; repo = "gen"; - rev = version; - sha256 = "14b8vg914nb0yp1hgxzm29bg692m0gqncjj43b599s98s1cwl92h"; + rev = "v${version}"; + hash = "sha256-YWoVcl2TQoMIgU1LoKL16ia31zJjwAMwuphtSXnhtvw="; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - buildInputs = lib.optionals doCheck [ qtest ounit ]; - strictDeps = true; - - configureFlags = lib.optional doCheck "--enable-tests"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ seq ]; + checkInputs = [ qcheck ounit2 ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkTarget = "test"; - - createFindlibDestdir = true; meta = { homepage = "https://github.com/c-cube/gen"; description = "Simple, efficient iterators for OCaml"; license = lib.licenses.bsd3; - inherit (ocaml.meta) platforms; }; } |