From 5349ebee9a395dcc66884b3ea03916e432b75a05 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 14 Jul 2021 17:57:06 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.ocaml=5Fpcre:=207.2.3=20=E2=86=92?= =?UTF-8?q?=207.4.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/pcre/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index 210b7d58857..ea853c4648b 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -1,26 +1,26 @@ -{ lib, stdenv, fetchurl, pcre, ocaml, findlib, ocamlbuild }: +{ lib, buildDunePackage, fetchurl, pcre, dune-configurator }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-pcre-${version}"; - version = "7.2.3"; +buildDunePackage rec { + pname = "pcre"; + version = "7.4.6"; + + useDune2 = true; + + minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mmottl/pcre-ocaml/releases/download/v${version}/pcre-ocaml-${version}.tar.gz"; - sha256 = "0rj6dw79px4sj2kq0iss2nzq3rnsn9wivvc0f44wa1mppr6njfb3"; + url = "https://github.com/mmottl/pcre-ocaml/releases/download/${version}/pcre-${version}.tbz"; + sha256 = "17ajl0ra5xkxn5pf0m0zalylp44wsfy6mvcq213djh2pwznh4gya"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [pcre]; + buildInputs = [ dune-configurator ]; - createFindlibDestdir = true; - - dontConfigure = true; # Skip configure phase + propagatedBuildInputs = [ pcre ]; meta = with lib; { - homepage = "https://bitbucket.org/mmottl/pcre-ocaml"; + homepage = "https://mmottl.github.io/pcre-ocaml"; description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml"; - license = licenses.lgpl21; - platforms = ocaml.meta.platforms or []; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ maggesi vbmithr ]; }; }