From 0385e6094f4cfad912c011d4a10f99afde0aef71 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 9 Oct 2020 22:15:39 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.camlimages:=205.0.1=20=E2=86=92?= =?UTF-8?q?=205.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/camlimages/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 1ea3e78a06be..5874e7a52d35 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -1,21 +1,27 @@ -{ lib, fetchzip, buildDunePackage, configurator, cppo, lablgtk }: +{ lib, fetchFromGitLab, buildDunePackage, dune-configurator, cppo, lablgtk, stdio }: buildDunePackage rec { pname = "camlimages"; - version = "5.0.1"; + version = "5.0.3"; - src = fetchzip { - url = "https://bitbucket.org/camlspotter/${pname}/get/${version}.tar.gz"; - sha256 = "1figrgzsdrrxzfza0bhz0225g1rwawdf5x2m9lw2kzrdb815khs5"; + useDune2 = true; + + minimumOCamlVersion = "4.07"; + + src = fetchFromGitLab { + owner = "camlspotter"; + repo = pname; + rev = version; + sha256 = "1ng9pkvrzlibfyf97iqvmbsqcykz8v1ln106xhq9nigih5i68zyd"; }; - buildInputs = [ configurator cppo lablgtk ]; + buildInputs = [ dune-configurator cppo lablgtk stdio ]; meta = with lib; { branch = "5.0"; - homepage = "https://bitbucket.org/camlspotter/camlimages"; + inherit (src.meta) homepage; description = "OCaml image processing library"; - license = licenses.gpl2; + license = licenses.lgpl2; maintainers = [ maintainers.vbgl maintainers.mt-caret ]; }; }