From 635e71f62c734dc1f2a9d8f61b43bb032a183c83 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 13 Jun 2023 06:25:28 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.cudf:=200.9=20=E2=86=92=200.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/cudf/default.nix | 43 ++++++------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/pkgs/development/ocaml-modules/cudf/default.nix b/pkgs/development/ocaml-modules/cudf/default.nix index 6cef074498d6..18ea3defa193 100644 --- a/pkgs/development/ocaml-modules/cudf/default.nix +++ b/pkgs/development/ocaml-modules/cudf/default.nix @@ -1,46 +1,27 @@ -{ lib, fetchurl, stdenv, ocaml, ocamlbuild, findlib, extlib, glib, perl, pkg-config, stdlib-shims, ounit }: +{ lib, buildDunePackage, ocaml, fetchFromGitLab, extlib, ounit2 }: -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-cudf"; - version = "0.9"; +buildDunePackage rec { + pname = "cudf"; + version = "0.10"; - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/36602/cudf-0.9.tar.gz"; - sha256 = "sha256-mTLk2V3OI1sUNIYv84nM3reiirf0AuozG5ZzLCmn4Rw="; + minimalOCamlVersion = "4.07"; + + src = fetchFromGitLab { + owner = "irill"; + repo = pname; + rev = "v${version}"; + hash = "sha256-E4KXKnso/Q3ZwcYpKPgvswNR9qd/lafKljPMxfStedM="; }; - buildFlags = [ - "all" - "opt" - ]; - - nativeBuildInputs = [ - findlib - ocaml - ocamlbuild - pkg-config - perl - ]; - buildInputs = [ - glib - stdlib-shims - ]; propagatedBuildInputs = [ extlib ]; - checkTarget = [ - "all" - "test" - ]; checkInputs = [ - ounit + ounit2 ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - preInstall = "mkdir -p $OCAMLFIND_DESTDIR"; - installFlags = [ "BINDIR=$(out)/bin" ]; - meta = with lib; { description = "A library for CUDF format"; homepage = "https://www.mancoosi.org/cudf/";