From 9fcd7d4e36b8758e121d09aed970133e2f88d3eb Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 6 Jun 2021 05:48:24 -0300 Subject: [PATCH] ocamlPackages.fix: 20130611 -> 20201120 --- .../development/ocaml-modules/fix/default.nix | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix index d4ce484653b..ffd0b5003ce 100644 --- a/pkgs/development/ocaml-modules/fix/default.nix +++ b/pkgs/development/ocaml-modules/fix/default.nix @@ -1,25 +1,24 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ lib, fetchFromGitLab, buildDunePackage }: -assert lib.versionAtLeast (lib.getVersion ocaml) "3.12"; +buildDunePackage rec { + pname = "fix"; + version = "20201120"; -stdenv.mkDerivation { - - name = "ocaml-fix-20130611"; - - src = fetchurl { - url = "http://gallium.inria.fr/~fpottier/fix/fix-20130611.tar.gz"; - sha256 = "1phlqcs1nb93x9cf0w0hnq2ck4dmn71zm4mxf60w96vb9yb9qzp0"; + src = fetchFromGitLab { + domain = "gitlab.inria.fr"; + owner = "fpottier"; + repo = "fix"; + rev = "${version}"; + sha256 = "sha256-RO+JCG6R2i5uZfwTYEnQBCVq963fjv5lA2wA/8KrgMg="; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - - createFindlibDestdir = true; + minimumOCamlVersion = "4.03"; + useDune2 = true; meta = with lib; { - homepage = "http://gallium.inria.fr/~fpottier/fix/"; + homepage = "https://gitlab.inria.fr/fpottier/fix/"; description = "A simple OCaml module for computing the least solution of a system of monotone equations"; license = licenses.cecill-c; - maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or []; + maintainers = with maintainers; [ vbgl ]; }; }