From 70126f0e4ac7b4df2becc34696e35a8e38837b55 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 14 Jan 2022 15:43:06 +0100 Subject: [PATCH] =?UTF-8?q?ocamlPackages.progress:=200.1.1=20=E2=86=92=200?= =?UTF-8?q?.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.index: 1.4.0 → 1.4.1 --- .../development/ocaml-modules/index/default.nix | 6 +++--- .../ocaml-modules/progress/default.nix | 17 +++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix index 8e503f5ddd2..3649ee284ec 100644 --- a/pkgs/development/ocaml-modules/index/default.nix +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -6,14 +6,14 @@ buildDunePackage rec { pname = "index"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; - sha256 = "13xd858c50fs651p1y8x70323ff0gzbf6zgc0a25f6xh3rsmkn4c"; + sha256 = "sha256:01i24m1xh7vn44sq7gsxg1z0jxa6rg80bpjcp3cvg6zfjpsl7sfx"; }; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; useDune2 = true; buildInputs = [ diff --git a/pkgs/development/ocaml-modules/progress/default.nix b/pkgs/development/ocaml-modules/progress/default.nix index a3c0a5add3d..4c00ff98465 100644 --- a/pkgs/development/ocaml-modules/progress/default.nix +++ b/pkgs/development/ocaml-modules/progress/default.nix @@ -1,23 +1,20 @@ -{ lib, buildDunePackage, fetchurl -, mtime, terminal_size, alcotest, astring, fmt +{ lib, buildDunePackage +, fmt, logs, mtime, optint, terminal, vector +, alcotest, astring }: buildDunePackage rec { pname = "progress"; - version = "0.1.1"; - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; useDune2 = true; - src = fetchurl { - url = "https://github.com/CraigFe/progress/releases/download/${version}/progress-${version}.tbz"; - sha256 = "90c6bec19d014a4c6b0b67006f08bdfcf36981d2176769bebe0ccd75d6785a32"; - }; + inherit (terminal) version src; - propagatedBuildInputs = [ mtime terminal_size ]; + propagatedBuildInputs = [ fmt logs mtime optint terminal vector ]; doCheck = true; - checkInputs = [ alcotest astring fmt ]; + checkInputs = [ alcotest astring ]; meta = with lib; { description = "Progress bar library for OCaml";