git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #155014 from vbgl/ocaml-progress-0.2.1

ocamlPackages.progress: 0.1.1 → 0.2.1

commitb65da092044b172f229bc611eabcbe212a1018c1 authorsterni <sternenseemann@systemli.org> dateSat 15 Jan 2022, 00:13 (5 years ago) parent297cb6570126f0
5 files changed+67−13
pkgs/development/ocaml-modules/index/default.nix+3−3 pkgs/development/ocaml-modules/progress/default.nix+7−10 pkgs/development/ocaml-modules/terminal/default.nix+30 pkgs/development/ocaml-modules/vector/default.nix+23 pkgs/top-level/ocaml-packages.nix+4
pkgs/development/ocaml-modules/index/default.nix+3−3
@@ -6,14 +6,14 @@
66
77buildDunePackage rec {
88 pname = "index";
9− version = "1.4.0";
9+ version = "1.4.1";
1010
1111 src = fetchurl {
1212 url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz";
13− sha256 = "13xd858c50fs651p1y8x70323ff0gzbf6zgc0a25f6xh3rsmkn4c";
13+ sha256 = "sha256:01i24m1xh7vn44sq7gsxg1z0jxa6rg80bpjcp3cvg6zfjpsl7sfx";
1414 };
1515
16− minimumOCamlVersion = "4.08";
16+ minimalOCamlVersion = "4.08";
1717 useDune2 = true;
1818
1919 buildInputs = [
pkgs/development/ocaml-modules/progress/default.nix+7−10
@@ -1,23 +1,20 @@
1−{ lib, buildDunePackage, fetchurl
2−, mtime, terminal_size, alcotest, astring, fmt
1+{ lib, buildDunePackage
2+, fmt, logs, mtime, optint, terminal, vector
3+, alcotest, astring
34}:
45
56buildDunePackage rec {
67 pname = "progress";
7− version = "0.1.1";
88
9− minimumOCamlVersion = "4.08";
9+ minimalOCamlVersion = "4.08";
1010 useDune2 = true;
1111
12− src = fetchurl {
13− url = "https://github.com/CraigFe/progress/releases/download/${version}/progress-${version}.tbz";
14− sha256 = "90c6bec19d014a4c6b0b67006f08bdfcf36981d2176769bebe0ccd75d6785a32";
15− };
12+ inherit (terminal) version src;
1613
17− propagatedBuildInputs = [ mtime terminal_size ];
14+ propagatedBuildInputs = [ fmt logs mtime optint terminal vector ];
1815
1916 doCheck = true;
20− checkInputs = [ alcotest astring fmt ];
17+ checkInputs = [ alcotest astring ];
2118
2219 meta = with lib; {
2320 description = "Progress bar library for OCaml";
pkgs/development/ocaml-modules/terminal/default.nixnew file+30
@@ -0,0 +1,30 @@
1+{ lib, buildDunePackage, fetchurl, ocaml
2+, stdlib-shims, uutf, uucp
3+, alcotest, fmt
4+}:
5+
6+buildDunePackage rec {
7+ pname = "terminal";
8+ version = "0.2.1";
9+
10+ minimalOCamlVersion = "4.03";
11+ useDune2 = true;
12+
13+ src = fetchurl {
14+ url = "https://github.com/CraigFe/progress/releases/download/${version}/terminal-${version}.tbz";
15+ sha256 = "sha256:0vjqkvmpyi8kvmb4vrx3f0994rph8i9pvlrz1dyi126vlb2zbrvs";
16+ };
17+
18+ propagatedBuildInputs = [ stdlib-shims uutf uucp ];
19+
20+ doCheck = lib.versionAtLeast ocaml.version "4.05";
21+ checkInputs = [ alcotest fmt ];
22+
23+ meta = with lib; {
24+ description = "Basic utilities for interacting with terminals";
25+ homepage = "https://github.com/CraigFe/progress";
26+ license = licenses.mit;
27+ maintainers = [ maintainers.vbgl ];
28+ };
29+}
30+
pkgs/development/ocaml-modules/vector/default.nixnew file+23
@@ -0,0 +1,23 @@
1+{ lib, buildDunePackage, fetchurl }:
2+
3+buildDunePackage rec {
4+ pname = "vector";
5+ version = "1.0.0";
6+
7+ useDune2 = true;
8+
9+ src = fetchurl {
10+ url = "https://github.com/backtracking/vector/releases/download/${version}/vector-${version}.tbz";
11+ sha256 = "sha256:0hb6prpada4c5z07sxf5ayj5xbahsnwall15vaqdwdyfjgbd24pj";
12+ };
13+
14+ doCheck = true;
15+
16+ meta = {
17+ description = "Resizable arrays for OCaml";
18+ license = lib.licenses.lgpl2Only;
19+ homepage = "https://github.com/backtracking/vector";
20+ maintainers = [ lib.maintainers.vbgl ];
21+ };
22+
23+}
pkgs/top-level/ocaml-packages.nix+4
@@ -1281,6 +1281,8 @@ let
12811281
12821282 tcslib = callPackage ../development/ocaml-modules/tcslib { };
12831283
1284+ terminal = callPackage ../development/ocaml-modules/terminal { };
1285+
12841286 terminal_size = callPackage ../development/ocaml-modules/terminal_size { };
12851287
12861288 tezos-010-PtGRANAD-test-helpers = callPackage ../development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nix { };
@@ -1372,6 +1374,8 @@ let
13721374
13731375 vchan = callPackage ../development/ocaml-modules/vchan { };
13741376
1377+ vector = callPackage ../development/ocaml-modules/vector { };
1378+
13751379 vg = callPackage ../development/ocaml-modules/vg { };
13761380
13771381 vlq = callPackage ../development/ocaml-modules/vlq { };