git.iko.soy/typeable/nixpkgs
on master help sign in
ocamlPackages.*: use spaces for indentation
commit8488ebab05929b1d65c12a9294661478f01a1a55 authorzowoq <59103226+zowoq@users.noreply.github.com> dateThu 21 Jan 2021, 10:24 (6 years ago) parent569987c
34 files changed+437−438
pkgs/development/ocaml-modules/bos/default.nix+17−17 pkgs/development/ocaml-modules/camomile/default.nix+15−15 pkgs/development/ocaml-modules/cohttp/async.nix+12−12 pkgs/development/ocaml-modules/cohttp/default.nix+16−16 pkgs/development/ocaml-modules/cohttp/lwt-unix.nix+5−5 pkgs/development/ocaml-modules/cohttp/lwt.nix+4−4 pkgs/development/ocaml-modules/conduit/async.nix+8−8 pkgs/development/ocaml-modules/conduit/lwt-unix.nix+9−9 pkgs/development/ocaml-modules/conduit/lwt.nix+7−7 pkgs/development/ocaml-modules/cstruct/lwt.nix+3−3 pkgs/development/ocaml-modules/cstruct/ppx.nix+4−4 pkgs/development/ocaml-modules/cstruct/sexp.nix+5−6 pkgs/development/ocaml-modules/cstruct/unix.nix+4−4 pkgs/development/ocaml-modules/csv/default.nix+12−12 pkgs/development/ocaml-modules/decompress/default.nix+17−17 pkgs/development/ocaml-modules/dolmen/default.nix+19−19 pkgs/development/ocaml-modules/expat/default.nix+22−22 pkgs/development/ocaml-modules/git-http/default.nix+8−8 pkgs/development/ocaml-modules/git-unix/default.nix+10−10 pkgs/development/ocaml-modules/git/default.nix+20−20 pkgs/development/ocaml-modules/hmap/default.nix+5−5 pkgs/development/ocaml-modules/inifiles/default.nix+18−18 pkgs/development/ocaml-modules/inotify/default.nix+37−37 pkgs/development/ocaml-modules/integers/default.nix+12−12 pkgs/development/ocaml-modules/lwt_react/default.nix+13−13 pkgs/development/ocaml-modules/num/default.nix+21−21 pkgs/development/ocaml-modules/ocp-ocamlres/default.nix+19−19 pkgs/development/ocaml-modules/ocplib-json-typed/default.nix+16−16 pkgs/development/ocaml-modules/octavius/default.nix+14−14 pkgs/development/ocaml-modules/opium/default.nix+4−4 pkgs/development/ocaml-modules/ppx_derivers/default.nix+14−14 pkgs/development/ocaml-modules/ppxfind/default.nix+15−15 pkgs/development/ocaml-modules/rresult/default.nix+15−15 pkgs/development/ocaml-modules/webbrowser/default.nix+17−17
pkgs/development/ocaml-modules/bos/default.nix+17−17
@@ -3,24 +3,24 @@
33}:
44
55stdenv.mkDerivation rec {
6− name = "ocaml${ocaml.version}-bos-${version}";
7− version = "0.2.0";
8− src = fetchurl {
9− url = "https://erratique.ch/software/bos/releases/bos-${version}.tbz";
10− sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc";
11− };
6+ name = "ocaml${ocaml.version}-bos-${version}";
7+ version = "0.2.0";
8+ src = fetchurl {
9+ url = "https://erratique.ch/software/bos/releases/bos-${version}.tbz";
10+ sha256 = "1s10iqx8rgnxr5n93lf4blwirjf8nlm272yg5sipr7lsr35v49wc";
11+ };
1212
13− nativeBuildInputs = [ ocaml findlib ocamlbuild ];
14− buildInputs = [ findlib topkg ];
15− propagatedBuildInputs = [ astring fmt fpath logs rresult ];
13+ nativeBuildInputs = [ ocaml findlib ocamlbuild ];
14+ buildInputs = [ findlib topkg ];
15+ propagatedBuildInputs = [ astring fmt fpath logs rresult ];
1616
17− inherit (topkg) buildPhase installPhase;
17+ inherit (topkg) buildPhase installPhase;
1818
19− meta = {
20− description = "Basic OS interaction for OCaml";
21− homepage = "https://erratique.ch/software/bos";
22− license = lib.licenses.isc;
23− maintainers = [ lib.maintainers.vbgl ];
24− inherit (ocaml.meta) platforms;
25− };
19+ meta = {
20+ description = "Basic OS interaction for OCaml";
21+ homepage = "https://erratique.ch/software/bos";
22+ license = lib.licenses.isc;
23+ maintainers = [ lib.maintainers.vbgl ];
24+ inherit (ocaml.meta) platforms;
25+ };
2626}
pkgs/development/ocaml-modules/camomile/default.nix+15−15
@@ -2,23 +2,23 @@
22
33buildDunePackage rec {
44 pname = "camomile";
5− version = "1.0.2";
5+ version = "1.0.2";
66
7− src = fetchFromGitHub {
8− owner = "yoriyuki";
9− repo = pname;
10− rev = version;
11− sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad";
12− };
7+ src = fetchFromGitHub {
8+ owner = "yoriyuki";
9+ repo = pname;
10+ rev = version;
11+ sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad";
12+ };
1313
14− buildInputs = [ cppo ];
14+ buildInputs = [ cppo ];
1515
16− configurePhase = "ocaml configure.ml --share $out/share/camomile";
16+ configurePhase = "ocaml configure.ml --share $out/share/camomile";
1717
18− meta = {
19− inherit (src.meta) homepage;
20− maintainers = [ lib.maintainers.vbgl ];
21− license = lib.licenses.lgpl21;
22− description = "A Unicode library for OCaml";
23− };
18+ meta = {
19+ inherit (src.meta) homepage;
20+ maintainers = [ lib.maintainers.vbgl ];
21+ license = lib.licenses.lgpl21;
22+ description = "A Unicode library for OCaml";
23+ };
2424}
pkgs/development/ocaml-modules/cohttp/async.nix+12−12
@@ -2,21 +2,21 @@
22, logs, magic-mime }:
33
44if !lib.versionAtLeast cohttp.version "0.99" then
5− cohttp
5+ cohttp
66else if !lib.versionAtLeast async.version "0.13" then
7− throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)"
7+ throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)"
88else
99
10− buildDunePackage {
11− pname = "cohttp-async";
12− useDune2 = true;
13− inherit (cohttp) version src;
10+ buildDunePackage {
11+ pname = "cohttp-async";
12+ useDune2 = true;
13+ inherit (cohttp) version src;
1414
15− buildInputs = [ ppx_sexp_conv ];
15+ buildInputs = [ ppx_sexp_conv ];
1616
17− propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ];
17+ propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ];
1818
19− meta = cohttp.meta // {
20− description = "CoHTTP implementation for the Async concurrency library";
21− };
22− }
19+ meta = cohttp.meta // {
20+ description = "CoHTTP implementation for the Async concurrency library";
21+ };
22+ }
pkgs/development/ocaml-modules/cohttp/default.nix+16−16
@@ -4,26 +4,26 @@
44}:
55
66buildDunePackage rec {
7− pname = "cohttp";
8− version = "2.5.4";
7+ pname = "cohttp";
8+ version = "2.5.4";
99
10− useDune2 = true;
10+ useDune2 = true;
1111
12− minimumOCamlVersion = "4.04.1";
12+ minimumOCamlVersion = "4.04.1";
1313
14− src = fetchurl {
15− url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz";
16− sha256 = "1q04spmki5zis5p5m1vs77i3k7ijm134j62g61071vblwx25z17a";
17− };
14+ src = fetchurl {
15+ url = "https://github.com/mirage/ocaml-cohttp/releases/download/v${version}/cohttp-v${version}.tbz";
16+ sha256 = "1q04spmki5zis5p5m1vs77i3k7ijm134j62g61071vblwx25z17a";
17+ };
1818
19− buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ];
19+ buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ];
2020
21− propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ];
21+ propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp stdlib-shims ];
2222
23− meta = {
24− description = "HTTP(S) library for Lwt, Async and Mirage";
25− license = lib.licenses.isc;
26− maintainers = [ lib.maintainers.vbgl ];
27− homepage = "https://github.com/mirage/ocaml-cohttp";
28− };
23+ meta = {
24+ description = "HTTP(S) library for Lwt, Async and Mirage";
25+ license = lib.licenses.isc;
26+ maintainers = [ lib.maintainers.vbgl ];
27+ homepage = "https://github.com/mirage/ocaml-cohttp";
28+ };
2929}
pkgs/development/ocaml-modules/cohttp/lwt-unix.nix+5−5
@@ -8,12 +8,12 @@ then cohttp-lwt
88else
99
1010buildDunePackage {
11− pname = "cohttp-lwt-unix";
12− inherit (cohttp-lwt) version src meta;
11+ pname = "cohttp-lwt-unix";
12+ inherit (cohttp-lwt) version src meta;
1313
14− useDune2 = true;
14+ useDune2 = true;
1515
16− buildInputs = [ cmdliner ppx_sexp_conv ];
16+ buildInputs = [ cmdliner ppx_sexp_conv ];
1717
18− propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ];
18+ propagatedBuildInputs = [ cohttp-lwt conduit-lwt-unix fmt magic-mime ];
1919}
pkgs/development/ocaml-modules/cohttp/lwt.nix+4−4
@@ -7,10 +7,10 @@ then throw "cohttp-lwt is not available for ppx_sexp_conv version ${ppx_sexp_con
77else
88
99buildDunePackage {
10− pname = "cohttp-lwt";
11− inherit (cohttp) version src useDune2 meta;
10+ pname = "cohttp-lwt";
11+ inherit (cohttp) version src useDune2 meta;
1212
13− buildInputs = [ uri ppx_sexp_conv ];
13+ buildInputs = [ uri ppx_sexp_conv ];
1414
15− propagatedBuildInputs = [ cohttp ocaml_lwt logs ];
15+ propagatedBuildInputs = [ cohttp ocaml_lwt logs ];
1616}
pkgs/development/ocaml-modules/conduit/async.nix+8−8
@@ -5,15 +5,15 @@ then conduit
55else
66
77buildDunePackage {
8− pname = "conduit-async";
9− useDune2 = true;
10− inherit (conduit) version src;
8+ pname = "conduit-async";
9+ useDune2 = true;
10+ inherit (conduit) version src;
1111
12− buildInputs = [ ppx_sexp_conv ];
12+ buildInputs = [ ppx_sexp_conv ];
1313
14− propagatedBuildInputs = [ async async_ssl conduit ];
14+ propagatedBuildInputs = [ async async_ssl conduit ];
1515
16− meta = conduit.meta // {
17− description = "A network connection establishment library for Async";
18− };
16+ meta = conduit.meta // {
17+ description = "A network connection establishment library for Async";
18+ };
1919}
pkgs/development/ocaml-modules/conduit/lwt-unix.nix+9−9
@@ -4,17 +4,17 @@
44}:
55
66buildDunePackage {
7− pname = "conduit-lwt-unix";
8− inherit (conduit-lwt) version src minimumOCamlVersion;
7+ pname = "conduit-lwt-unix";
8+ inherit (conduit-lwt) version src minimumOCamlVersion;
99
10− useDune2 = true;
10+ useDune2 = true;
1111
12− buildInputs = [ ppx_sexp_conv ];
12+ buildInputs = [ ppx_sexp_conv ];
1313
14− propagatedBuildInputs =
15− [ conduit-lwt ocaml_lwt uri ipaddr ipaddr-sexp tls lwt_ssl ];
14+ propagatedBuildInputs =
15+ [ conduit-lwt ocaml_lwt uri ipaddr ipaddr-sexp tls lwt_ssl ];
1616
17− meta = conduit-lwt.meta // {
18− description = "A network connection establishment library for Lwt_unix";
19− };
17+ meta = conduit-lwt.meta // {
18+ description = "A network connection establishment library for Lwt_unix";
19+ };
2020}
pkgs/development/ocaml-modules/conduit/lwt.nix+7−7
@@ -1,14 +1,14 @@
11{ buildDunePackage, ppx_sexp_conv, conduit, ocaml_lwt, sexplib }:
22
33buildDunePackage {
4− pname = "conduit-lwt";
5− inherit (conduit) version src useDune2 minimumOCamlVersion;
4+ pname = "conduit-lwt";
5+ inherit (conduit) version src useDune2 minimumOCamlVersion;
66
7− buildInputs = [ ppx_sexp_conv ];
7+ buildInputs = [ ppx_sexp_conv ];
88
9− propagatedBuildInputs = [ conduit ocaml_lwt sexplib ];
9+ propagatedBuildInputs = [ conduit ocaml_lwt sexplib ];
1010
11− meta = conduit.meta // {
12− description = "A network connection establishment library for Lwt";
13− };
11+ meta = conduit.meta // {
12+ description = "A network connection establishment library for Lwt";
13+ };
1414}
pkgs/development/ocaml-modules/cstruct/lwt.nix+3−3
@@ -5,10 +5,10 @@ then cstruct
55else
66
77buildDunePackage {
8− pname = "cstruct-lwt";
9− inherit (cstruct) version src useDune2 meta;
8+ pname = "cstruct-lwt";
9+ inherit (cstruct) version src useDune2 meta;
1010
1111 minimumOCamlVersion = "4.02";
1212
13− propagatedBuildInputs = [ cstruct lwt ];
13+ propagatedBuildInputs = [ cstruct lwt ];
1414}
pkgs/development/ocaml-modules/cstruct/ppx.nix+4−4
@@ -5,10 +5,10 @@ then cstruct
55else
66
77buildDunePackage {
8− pname = "ppx_cstruct";
9− inherit (cstruct) version src useDune2 meta;
8+ pname = "ppx_cstruct";
9+ inherit (cstruct) version src useDune2 meta;
1010
11− minimumOCamlVersion = "4.03";
11+ minimumOCamlVersion = "4.03";
1212
13− propagatedBuildInputs = [ cstruct ppx_tools_versioned ppxlib sexplib ];
13+ propagatedBuildInputs = [ cstruct ppx_tools_versioned ppxlib sexplib ];
1414}
pkgs/development/ocaml-modules/cstruct/sexp.nix+5−6
@@ -5,12 +5,11 @@ then cstruct
55else
66
77buildDunePackage rec {
8− pname = "cstruct-sexp";
9− inherit (cstruct) version src useDune2 meta;
8+ pname = "cstruct-sexp";
9+ inherit (cstruct) version src useDune2 meta;
1010
11− doCheck = lib.versionAtLeast ocaml.version "4.03";
12− checkInputs = lib.optional doCheck alcotest;
11+ doCheck = lib.versionAtLeast ocaml.version "4.03";
12+ checkInputs = lib.optional doCheck alcotest;
1313
14− propagatedBuildInputs = [ cstruct sexplib ];
14+ propagatedBuildInputs = [ cstruct sexplib ];
1515}
16−
pkgs/development/ocaml-modules/cstruct/unix.nix+4−4
@@ -5,10 +5,10 @@ then cstruct
55else
66
77buildDunePackage {
8− pname = "cstruct-unix";
9− inherit (cstruct) version src useDune2 meta;
8+ pname = "cstruct-unix";
9+ inherit (cstruct) version src useDune2 meta;
1010
11− minimumOCamlVersion = "4.06";
11+ minimumOCamlVersion = "4.06";
1212
13− propagatedBuildInputs = [ cstruct ];
13+ propagatedBuildInputs = [ cstruct ];
1414}
pkgs/development/ocaml-modules/csv/default.nix+12−12
@@ -2,19 +2,19 @@
22
33buildDunePackage rec {
44 pname = "csv";
5− version = "2.4";
5+ version = "2.4";
66
7− useDune2 = true;
7+ useDune2 = true;
88
9− src = fetchurl {
10− url = "https://github.com/Chris00/ocaml-${pname}/releases/download/${version}/csv-${version}.tbz";
11− sha256 = "13m9n8mdss6jfbiw7d5bybxn4n85vmg4zw7dc968qrgjfy0w9zhk";
12− };
9+ src = fetchurl {
10+ url = "https://github.com/Chris00/ocaml-${pname}/releases/download/${version}/csv-${version}.tbz";
11+ sha256 = "13m9n8mdss6jfbiw7d5bybxn4n85vmg4zw7dc968qrgjfy0w9zhk";
12+ };
1313
14− meta = {
15− description = "A pure OCaml library to read and write CSV files";
16− license = lib.licenses.lgpl21;
17− maintainers = [ lib.maintainers.vbgl ];
18− homepage = "https://github.com/Chris00/ocaml-csv";
19− };
14+ meta = {
15+ description = "A pure OCaml library to read and write CSV files";
16+ license = lib.licenses.lgpl21;
17+ maintainers = [ lib.maintainers.vbgl ];
18+ homepage = "https://github.com/Chris00/ocaml-csv";
19+ };
2020}
pkgs/development/ocaml-modules/decompress/default.nix+17−17
@@ -4,25 +4,25 @@
44}:
55
66buildDunePackage rec {
7− version = "0.9.0";
8− pname = "decompress";
7+ version = "0.9.0";
8+ pname = "decompress";
99
10− useDune2 = true;
10+ useDune2 = true;
1111
12− src = fetchurl {
13− url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
14− sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh";
15− };
12+ src = fetchurl {
13+ url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz";
14+ sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh";
15+ };
1616
17− buildInputs = [ cmdliner ];
18− propagatedBuildInputs = [ checkseum ];
19− checkInputs = lib.optionals doCheck [ alcotest bos camlzip mmap re ];
20− doCheck = true;
17+ buildInputs = [ cmdliner ];
18+ propagatedBuildInputs = [ checkseum ];
19+ checkInputs = lib.optionals doCheck [ alcotest bos camlzip mmap re ];
20+ doCheck = true;
2121
22− meta = {
23− description = "Pure OCaml implementation of Zlib";
24− license = lib.licenses.mit;
25− maintainers = [ lib.maintainers.vbgl ];
26− homepage = "https://github.com/mirage/decompress";
27− };
22+ meta = {
23+ description = "Pure OCaml implementation of Zlib";
24+ license = lib.licenses.mit;
25+ maintainers = [ lib.maintainers.vbgl ];
26+ homepage = "https://github.com/mirage/decompress";
27+ };
2828}
pkgs/development/ocaml-modules/dolmen/default.nix+19−19
@@ -1,27 +1,27 @@
11{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }:
22
33stdenv.mkDerivation rec {
4− name = "ocaml${ocaml.version}-dolmen-${version}";
5− version = "0.2";
6− src = fetchFromGitHub {
7− owner = "Gbury";
8− repo = "dolmen";
9− rev = "v${version}";
10− sha256 = "1b9mf8p6mic0n76acx8x82hhgm2n40sdv0jri95im65l52223saf";
11− };
4+ name = "ocaml${ocaml.version}-dolmen-${version}";
5+ version = "0.2";
6+ src = fetchFromGitHub {
7+ owner = "Gbury";
8+ repo = "dolmen";
9+ rev = "v${version}";
10+ sha256 = "1b9mf8p6mic0n76acx8x82hhgm2n40sdv0jri95im65l52223saf";
11+ };
1212
13− buildInputs = [ ocaml findlib ocamlbuild ];
14− propagatedBuildInputs = [ menhir ];
13+ buildInputs = [ ocaml findlib ocamlbuild ];
14+ propagatedBuildInputs = [ menhir ];
1515
16− makeFlags = [ "-C" "src" ];
16+ makeFlags = [ "-C" "src" ];
1717
18− createFindlibDestdir = true;
18+ createFindlibDestdir = true;
1919
20− meta = {
21− description = "An OCaml library providing clean and flexible parsers for input languages";
22− license = lib.licenses.bsd2;
23− maintainers = [ lib.maintainers.vbgl ];
24− inherit (src.meta) homepage;
25− inherit (ocaml.meta) platforms;
26− };
20+ meta = {
21+ description = "An OCaml library providing clean and flexible parsers for input languages";
22+ license = lib.licenses.bsd2;
23+ maintainers = [ lib.maintainers.vbgl ];
24+ inherit (src.meta) homepage;
25+ inherit (ocaml.meta) platforms;
26+ };
2727}
pkgs/development/ocaml-modules/expat/default.nix+22−22
@@ -1,32 +1,32 @@
11{ stdenv, lib, fetchFromGitHub, expat, ocaml, findlib, ounit }:
22
33stdenv.mkDerivation rec {
4− name = "ocaml${ocaml.version}-expat-${version}";
5− version = "1.1.0";
4+ name = "ocaml${ocaml.version}-expat-${version}";
5+ version = "1.1.0";
66
7− src = fetchFromGitHub {
8− owner = "whitequark";
9− repo = "ocaml-expat";
10− rev = "v${version}";
11− sha256 = "07wm9663z744ya6z2lhiz5hbmc76kkipg04j9vw9dqpd1y1f2x3q";
12− };
7+ src = fetchFromGitHub {
8+ owner = "whitequark";
9+ repo = "ocaml-expat";
10+ rev = "v${version}";
11+ sha256 = "07wm9663z744ya6z2lhiz5hbmc76kkipg04j9vw9dqpd1y1f2x3q";
12+ };
1313
14− prePatch = ''
15− substituteInPlace Makefile --replace "gcc" "\$(CC)"
16− '';
14+ prePatch = ''
15+ substituteInPlace Makefile --replace "gcc" "\$(CC)"
16+ '';
1717
18− buildInputs = [ ocaml findlib expat ounit ];
18+ buildInputs = [ ocaml findlib expat ounit ];
1919
20− doCheck = !lib.versionAtLeast ocaml.version "4.06";
21− checkTarget = "testall";
20+ doCheck = !lib.versionAtLeast ocaml.version "4.06";
21+ checkTarget = "testall";
2222
23− createFindlibDestdir = true;
23+ createFindlibDestdir = true;
2424
25− meta = {
26− description = "OCaml wrapper for the Expat XML parsing library";
27− license = lib.licenses.mit;
28− maintainers = [ lib.maintainers.vbgl ];
29− inherit (src.meta) homepage;
30− inherit (ocaml.meta) platforms;
31− };
25+ meta = {
26+ description = "OCaml wrapper for the Expat XML parsing library";
27+ license = lib.licenses.mit;
28+ maintainers = [ lib.maintainers.vbgl ];
29+ inherit (src.meta) homepage;
30+ inherit (ocaml.meta) platforms;
31+ };
3232}
pkgs/development/ocaml-modules/git-http/default.nix+8−8
@@ -1,15 +1,15 @@
11{ buildDunePackage, git, cohttp, cohttp-lwt }:
22
33buildDunePackage {
4− pname = "git-http";
5− inherit (git) version src minimumOCamlVersion;
4+ pname = "git-http";
5+ inherit (git) version src minimumOCamlVersion;
66
7− useDune2 = true;
7+ useDune2 = true;
88
9− propagatedBuildInputs = [ git cohttp cohttp-lwt ];
9+ propagatedBuildInputs = [ git cohttp cohttp-lwt ];
1010
11− meta = {
12− description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml";
13− inherit (git.meta) homepage license maintainers;
14− };
11+ meta = {
12+ description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml";
13+ inherit (git.meta) homepage license maintainers;
14+ };
1515}
pkgs/development/ocaml-modules/git-unix/default.nix+10−10
@@ -4,17 +4,17 @@
44}:
55
66buildDunePackage {
7− pname = "git-unix";
8− inherit (git-http) version src minimumOCamlVersion;
7+ pname = "git-unix";
8+ inherit (git-http) version src minimumOCamlVersion;
99
10− useDune2 = true;
10+ useDune2 = true;
1111
12− propagatedBuildInputs = [ mmap cmdliner git-http cohttp cohttp-lwt-unix mtime ];
13− checkInputs = [ alcotest mirage-crypto-rng tls io-page git-binary ];
14− doCheck = !stdenv.isAarch64;
12+ propagatedBuildInputs = [ mmap cmdliner git-http cohttp cohttp-lwt-unix mtime ];
13+ checkInputs = [ alcotest mirage-crypto-rng tls io-page git-binary ];
14+ doCheck = !stdenv.isAarch64;
1515
16− meta = {
17− description = "Unix backend for the Git protocol(s)";
18− inherit (git-http.meta) homepage license maintainers;
19− };
16+ meta = {
17+ description = "Unix backend for the Git protocol(s)";
18+ inherit (git-http.meta) homepage license maintainers;
19+ };
2020}
pkgs/development/ocaml-modules/git/default.nix+20−20
@@ -6,28 +6,28 @@
66}:
77
88buildDunePackage rec {
9− pname = "git";
10− version = "2.1.3";
9+ pname = "git";
10+ version = "2.1.3";
1111
12− minimumOCamlVersion = "4.07";
13− useDune2 = true;
12+ minimumOCamlVersion = "4.07";
13+ useDune2 = true;
1414
15− src = fetchurl {
16− url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
17− sha256 = "1ppllv65vrkfrmx46aiq5879isffcjmg92z9rv2kh92a83h4lqax";
18− };
15+ src = fetchurl {
16+ url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz";
17+ sha256 = "1ppllv65vrkfrmx46aiq5879isffcjmg92z9rv2kh92a83h4lqax";
18+ };
1919
20− propagatedBuildInputs = [
21− angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath
22− hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult stdlib-shims
23− ];
24− checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ];
25− doCheck = !stdenv.isAarch64;
20+ propagatedBuildInputs = [
21+ angstrom astring checkseum cstruct decompress digestif encore duff fmt fpath
22+ hex ke logs lru ocaml_lwt ocamlgraph ocplib-endian uri rresult stdlib-shims
23+ ];
24+ checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ];
25+ doCheck = !stdenv.isAarch64;
2626
27− meta = {
28− description = "Git format and protocol in pure OCaml";
29− license = lib.licenses.isc;
30− maintainers = [ lib.maintainers.vbgl ];
31− homepage = "https://github.com/mirage/ocaml-git";
32− };
27+ meta = {
28+ description = "Git format and protocol in pure OCaml";
29+ license = lib.licenses.isc;
30+ maintainers = [ lib.maintainers.vbgl ];
31+ homepage = "https://github.com/mirage/ocaml-git";
32+ };
3333}
pkgs/development/ocaml-modules/hmap/default.nix+5−5
@@ -13,7 +13,7 @@ in
1313assert lib.versionOlder minimumSupportedOcamlVersion ocaml.version;
1414
1515stdenv.mkDerivation rec {
16− pname = "hmap";
16+ pname = "hmap";
1717 version = "0.8.1";
1818 name = "ocaml${ocaml.version}-${pname}-${version}";
1919
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222 sha256 = "10xyjy4ab87z7jnghy0wnla9wrmazgyhdwhr4hdmxxdn28dxn03a";
2323 };
2424
25− buildInputs = [ ocaml ocamlbuild findlib topkg ];
25+ buildInputs = [ ocaml ocamlbuild findlib topkg ];
2626
2727 inherit (topkg) installPhase;
2828
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
3333 checkPhase = "${topkg.run} test";
3434
3535 meta = {
36− description = "Heterogeneous value maps for OCaml";
36+ description = "Heterogeneous value maps for OCaml";
3737 homepage = "https://erratique.ch/software/hmap";
38− license = lib.licenses.isc;
39− maintainers = [ lib.maintainers.pmahoney ];
38+ license = lib.licenses.isc;
39+ maintainers = [ lib.maintainers.pmahoney ];
4040 };
4141}
pkgs/development/ocaml-modules/inifiles/default.nix+18−18
@@ -1,28 +1,28 @@
11{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }:
22
33stdenv.mkDerivation {
4− name = "ocaml${ocaml.version}-inifiles-1.2";
4+ name = "ocaml${ocaml.version}-inifiles-1.2";
55
6− src = fetchurl {
7− url = "http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz";
8− sha256 = "0jhzgiypmh6hwsv1zpiq77fi0cvcmwbiy5x0yg7mz6p3dh1dmkns";
9− };
6+ src = fetchurl {
7+ url = "http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz";
8+ sha256 = "0jhzgiypmh6hwsv1zpiq77fi0cvcmwbiy5x0yg7mz6p3dh1dmkns";
9+ };
1010
11− patches = [ (fetchpatch {
12− url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff";
13− sha256 = "037kk3172s187w8vwsykdxlpklxzc7m7np57sapk499d8adzdgwn";
14− })];
11+ patches = [ (fetchpatch {
12+ url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff";
13+ sha256 = "037kk3172s187w8vwsykdxlpklxzc7m7np57sapk499d8adzdgwn";
14+ })];
1515
16− buildInputs = [ ocaml findlib ];
17− propagatedBuildInputs = [ ocaml_pcre ];
16+ buildInputs = [ ocaml findlib ];
17+ propagatedBuildInputs = [ ocaml_pcre ];
1818
19− buildFlags = [ "all" "opt" ];
19+ buildFlags = [ "all" "opt" ];
2020
21− createFindlibDestdir = true;
21+ createFindlibDestdir = true;
2222
23− meta = {
24− description = "A small OCaml library to read and write .ini files";
25− license = lib.licenses.lgpl21Plus;
26− inherit (ocaml.meta) platforms;
27− };
23+ meta = {
24+ description = "A small OCaml library to read and write .ini files";
25+ license = lib.licenses.lgpl21Plus;
26+ inherit (ocaml.meta) platforms;
27+ };
2828}
pkgs/development/ocaml-modules/inotify/default.nix+37−37
@@ -4,41 +4,41 @@
44}:
55
66stdenv.mkDerivation rec {
7− version = "2.3";
8− name = "ocaml${ocaml.version}-inotify-${version}";
9−
10− src = fetchFromGitHub {
11− owner = "whitequark";
12− repo = "ocaml-inotify";
13− rev = "v${version}";
14− sha256 = "1s6vmqpx19hxzsi30jvp3h7p56rqnxfhfddpcls4nz8sqca1cz5y";
15− };
16−
17− patches = [ (fetchpatch {
18− url = "https://github.com/whitequark/ocaml-inotify/commit/716c8002cc1652f58eb0c400ae92e04003cba8c9.patch";
19− sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k";
20− }) ];
21−
22− buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ];
23− checkInputs = [ ounit fileutils ];
24−
25− configureFlags = [ "--enable-lwt"
26− (lib.optionalString doCheck "--enable-tests") ];
27−
28− postConfigure = lib.optionalString doCheck ''
29− echo '<lib_test/test_inotify_lwt.*>: pkg_threads' | tee -a _tags
30− '';
31−
32− doCheck = true;
33− checkTarget = "test";
34−
35− createFindlibDestdir = true;
36−
37− meta = {
38− description = "Bindings for Linux’s filesystem monitoring interface, inotify";
39− license = lib.licenses.lgpl21;
40− maintainers = [ lib.maintainers.vbgl ];
41− inherit (src.meta) homepage;
42− platforms = lib.platforms.linux;
43− };
7+ version = "2.3";
8+ name = "ocaml${ocaml.version}-inotify-${version}";
9+
10+ src = fetchFromGitHub {
11+ owner = "whitequark";
12+ repo = "ocaml-inotify";
13+ rev = "v${version}";
14+ sha256 = "1s6vmqpx19hxzsi30jvp3h7p56rqnxfhfddpcls4nz8sqca1cz5y";
15+ };
16+
17+ patches = [ (fetchpatch {
18+ url = "https://github.com/whitequark/ocaml-inotify/commit/716c8002cc1652f58eb0c400ae92e04003cba8c9.patch";
19+ sha256 = "04lfxrrsmk2mc704kaln8jqx93jc4bkxhijmfy2d4cmk1cim7r6k";
20+ }) ];
21+
22+ buildInputs = [ ocaml findlib ocamlbuild ocaml_lwt ];
23+ checkInputs = [ ounit fileutils ];
24+
25+ configureFlags = [ "--enable-lwt"
26+ (lib.optionalString doCheck "--enable-tests") ];
27+
28+ postConfigure = lib.optionalString doCheck ''
29+ echo '<lib_test/test_inotify_lwt.*>: pkg_threads' | tee -a _tags
30+ '';
31+
32+ doCheck = true;
33+ checkTarget = "test";
34+
35+ createFindlibDestdir = true;
36+
37+ meta = {
38+ description = "Bindings for Linux’s filesystem monitoring interface, inotify";
39+ license = lib.licenses.lgpl21;
40+ maintainers = [ lib.maintainers.vbgl ];
41+ inherit (src.meta) homepage;
42+ platforms = lib.platforms.linux;
43+ };
4444}
pkgs/development/ocaml-modules/integers/default.nix+12−12
@@ -1,18 +1,18 @@
11{ lib, fetchzip, buildDunePackage }:
22
33buildDunePackage rec {
4− pname = "integers";
5− version = "0.4.0";
4+ pname = "integers";
5+ version = "0.4.0";
66
7− src = fetchzip {
8− url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz";
9− sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd";
10− };
7+ src = fetchzip {
8+ url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz";
9+ sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd";
10+ };
1111
12− meta = {
13− description = "Various signed and unsigned integer types for OCaml";
14− license = lib.licenses.mit;
15− homepage = "https://github.com/ocamllabs/ocaml-integers";
16− maintainers = [ lib.maintainers.vbgl ];
17− };
12+ meta = {
13+ description = "Various signed and unsigned integer types for OCaml";
14+ license = lib.licenses.mit;
15+ homepage = "https://github.com/ocamllabs/ocaml-integers";
16+ maintainers = [ lib.maintainers.vbgl ];
17+ };
1818}
pkgs/development/ocaml-modules/lwt_react/default.nix+13−13
@@ -1,22 +1,22 @@
11{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, lwt, react }:
22
33stdenv.mkDerivation rec {
4− version = "1.0.1";
5− name = "ocaml${ocaml.version}-lwt_react-${version}";
6− src = fetchzip {
7− url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz";
8− sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31";
9− };
4+ version = "1.0.1";
5+ name = "ocaml${ocaml.version}-lwt_react-${version}";
6+ src = fetchzip {
7+ url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz";
8+ sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31";
9+ };
1010
11− buildInputs = [ ocaml findlib ocamlbuild ];
11+ buildInputs = [ ocaml findlib ocamlbuild ];
1212
13− propagatedBuildInputs = [ lwt react ];
13+ propagatedBuildInputs = [ lwt react ];
1414
15− createFindlibDestdir = true;
15+ createFindlibDestdir = true;
1616
17− meta = {
18− description = "Helpers for using React with Lwt";
19− inherit (lwt.meta) homepage license maintainers;
17+ meta = {
18+ description = "Helpers for using React with Lwt";
19+ inherit (lwt.meta) homepage license maintainers;
2020 inherit (ocaml.meta) platforms;
21− };
21+ };
2222}
pkgs/development/ocaml-modules/num/default.nix+21−21
@@ -1,31 +1,31 @@
11{ stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, withStatic ? false }:
22
33stdenv.mkDerivation rec {
4− version = "1.1";
5− name = "ocaml${ocaml.version}-num-${version}";
6− src = fetchFromGitHub {
7− owner = "ocaml";
8− repo = "num";
9− rev = "v${version}";
10− sha256 = "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0";
11− };
4+ version = "1.1";
5+ name = "ocaml${ocaml.version}-num-${version}";
6+ src = fetchFromGitHub {
7+ owner = "ocaml";
8+ repo = "num";
9+ rev = "v${version}";
10+ sha256 = "0a4mhxgs5hi81d227aygjx35696314swas0vzy3ig809jb7zq4h0";
11+ };
1212
13− patches = [ (fetchpatch {
14− url = "https://github.com/ocaml/num/commit/6d4c6d476c061298e6385e8a0864f083194b9307.patch";
15− sha256 = "18zlvb5n327q8y3c52js5dvyy29ssld1l53jqng8m9w1k24ypi0b";
16− })
17− ] ++ lib.optional withStatic ./enable-static.patch;
13+ patches = [ (fetchpatch {
14+ url = "https://github.com/ocaml/num/commit/6d4c6d476c061298e6385e8a0864f083194b9307.patch";
15+ sha256 = "18zlvb5n327q8y3c52js5dvyy29ssld1l53jqng8m9w1k24ypi0b";
16+ })
17+ ] ++ lib.optional withStatic ./enable-static.patch;
1818
19− nativeBuildInputs = [ ocaml findlib ];
19+ nativeBuildInputs = [ ocaml findlib ];
2020 buildInputs = [ ocaml findlib ];
2121
22− createFindlibDestdir = true;
22+ createFindlibDestdir = true;
2323
2424
25− meta = {
26− description = "Legacy Num library for arbitrary-precision integer and rational arithmetic";
27− license = lib.licenses.lgpl21;
28− inherit (ocaml.meta) platforms;
29− inherit (src.meta) homepage;
30− };
25+ meta = {
26+ description = "Legacy Num library for arbitrary-precision integer and rational arithmetic";
27+ license = lib.licenses.lgpl21;
28+ inherit (ocaml.meta) platforms;
29+ inherit (src.meta) homepage;
30+ };
3131}
pkgs/development/ocaml-modules/ocp-ocamlres/default.nix+19−19
@@ -5,26 +5,26 @@ then throw "ocp-ocamlres is not available for OCaml ${ocaml.version}"
55else
66
77stdenv.mkDerivation rec {
8− name = "ocaml${ocaml.version}-ocp-ocamlres-${version}";
9− version = "0.4";
10− src = fetchFromGitHub {
11− owner = "OCamlPro";
12− repo = "ocp-ocamlres";
13− rev = "v${version}";
14− sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn";
15− };
8+ name = "ocaml${ocaml.version}-ocp-ocamlres-${version}";
9+ version = "0.4";
10+ src = fetchFromGitHub {
11+ owner = "OCamlPro";
12+ repo = "ocp-ocamlres";
13+ rev = "v${version}";
14+ sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn";
15+ };
1616
17− buildInputs = [ ocaml findlib astring pprint ];
18− createFindlibDestdir = true;
17+ buildInputs = [ ocaml findlib astring pprint ];
18+ createFindlibDestdir = true;
1919
20− installFlags = [ "BINDIR=$(out)/bin" ];
21− preInstall = "mkdir -p $out/bin";
20+ installFlags = [ "BINDIR=$(out)/bin" ];
21+ preInstall = "mkdir -p $out/bin";
2222
23− meta = {
24− description = "A simple tool and library to embed files and directories inside OCaml executables";
25− license = lib.licenses.lgpl3Plus;
26− homepage = "https://www.typerex.org/ocp-ocamlres.html";
27− maintainers = [ lib.maintainers.vbgl ];
28− inherit (ocaml.meta) platforms;
29− };
23+ meta = {
24+ description = "A simple tool and library to embed files and directories inside OCaml executables";
25+ license = lib.licenses.lgpl3Plus;
26+ homepage = "https://www.typerex.org/ocp-ocamlres.html";
27+ maintainers = [ lib.maintainers.vbgl ];
28+ inherit (ocaml.meta) platforms;
29+ };
3030}
pkgs/development/ocaml-modules/ocplib-json-typed/default.nix+16−16
@@ -1,22 +1,22 @@
11{ lib, buildDunePackage, fetchFromGitHub, uri }:
22
33buildDunePackage rec {
4− pname = "ocplib-json-typed";
5− version = "0.7.1";
6− useDune2 = true;
7− src = fetchFromGitHub {
8− owner = "OCamlPro";
9− repo = "ocplib-json-typed";
10− rev = "v${version}";
11− sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q";
12− };
4+ pname = "ocplib-json-typed";
5+ version = "0.7.1";
6+ useDune2 = true;
7+ src = fetchFromGitHub {
8+ owner = "OCamlPro";
9+ repo = "ocplib-json-typed";
10+ rev = "v${version}";
11+ sha256 = "1gv0vqqy9lh7isaqg54b3lam2sh7nfjjazi6x7zn6bh5f77g1p5q";
12+ };
1313
14− propagatedBuildInputs = [ uri ];
14+ propagatedBuildInputs = [ uri ];
1515
16− meta = {
17− description = "A collection of type-aware JSON utilities for OCaml";
18− license = lib.licenses.lgpl21;
19− maintainers = [ lib.maintainers.vbgl ];
20− inherit (src.meta) homepage;
21− };
16+ meta = {
17+ description = "A collection of type-aware JSON utilities for OCaml";
18+ license = lib.licenses.lgpl21;
19+ maintainers = [ lib.maintainers.vbgl ];
20+ inherit (src.meta) homepage;
21+ };
2222}
pkgs/development/ocaml-modules/octavius/default.nix+14−14
@@ -4,21 +4,21 @@ if !lib.versionAtLeast ocaml.version "4.03"
44then throw "octavius is not available for OCaml ${ocaml.version}" else
55
66stdenv.mkDerivation {
7− name = "ocaml${ocaml.version}-octavius-0.2.0";
8− src = fetchurl {
9− url = "https://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz";
10− sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml";
11− };
7+ name = "ocaml${ocaml.version}-octavius-0.2.0";
8+ src = fetchurl {
9+ url = "https://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz";
10+ sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml";
11+ };
1212
13− buildInputs = [ ocaml findlib ocamlbuild topkg ];
13+ buildInputs = [ ocaml findlib ocamlbuild topkg ];
1414
15− inherit (topkg) buildPhase installPhase;
15+ inherit (topkg) buildPhase installPhase;
1616
17− meta = {
18− description = "Ocamldoc comment syntax parser";
19− homepage = "https://github.com/ocaml-doc/octavius";
20− license = lib.licenses.isc;
21− maintainers = [ lib.maintainers.vbgl ];
22− inherit (ocaml.meta) platforms;
23− };
17+ meta = {
18+ description = "Ocamldoc comment syntax parser";
19+ homepage = "https://github.com/ocaml-doc/octavius";
20+ license = lib.licenses.isc;
21+ maintainers = [ lib.maintainers.vbgl ];
22+ inherit (ocaml.meta) platforms;
23+ };
2424}
pkgs/development/ocaml-modules/opium/default.nix+4−4
@@ -14,19 +14,19 @@
1414}:
1515
1616buildDunePackage {
17− pname = "opium";
18− inherit (opium_kernel) version src meta minimumOCamlVersion;
17+ pname = "opium";
18+ inherit (opium_kernel) version src meta minimumOCamlVersion;
1919
2020 useDune2 = true;
2121
2222 doCheck = true;
2323
24− buildInputs = [
24+ buildInputs = [
2525 ppx_sexp_conv ppx_fields_conv
2626 alcotest
2727 ];
2828
29− propagatedBuildInputs = [
29+ propagatedBuildInputs = [
3030 opium_kernel cmdliner cohttp-lwt-unix magic-mime logs stringext
3131 ];
3232}
pkgs/development/ocaml-modules/ppx_derivers/default.nix+14−14
@@ -1,22 +1,22 @@
11{ lib, fetchFromGitHub, buildDunePackage }:
22
33buildDunePackage rec {
4− pname = "ppx_derivers";
5− version = "1.2.1";
4+ pname = "ppx_derivers";
5+ version = "1.2.1";
66
77 minimumOCamlVersion = "4.02";
88
9− src = fetchFromGitHub {
10− owner = "diml";
11− repo = pname;
12− rev = version;
13− sha256 = "0yqvqw58hbx1a61wcpbnl9j30n495k23qmyy2xwczqs63mn2nkpn";
14− };
9+ src = fetchFromGitHub {
10+ owner = "diml";
11+ repo = pname;
12+ rev = version;
13+ sha256 = "0yqvqw58hbx1a61wcpbnl9j30n495k23qmyy2xwczqs63mn2nkpn";
14+ };
1515
16− meta = {
17− description = "Shared [@@deriving] plugin registry";
18− license = lib.licenses.bsd3;
19− maintainers = [ lib.maintainers.vbgl ];
20− inherit (src.meta) homepage;
21− };
16+ meta = {
17+ description = "Shared [@@deriving] plugin registry";
18+ license = lib.licenses.bsd3;
19+ maintainers = [ lib.maintainers.vbgl ];
20+ inherit (src.meta) homepage;
21+ };
2222}
pkgs/development/ocaml-modules/ppxfind/default.nix+15−15
@@ -1,27 +1,27 @@
11{ stdenv, lib, buildDunePackage, fetchurl, ocaml, ocaml-migrate-parsetree }:
22
33buildDunePackage (rec {
4− pname = "ppxfind";
5− version = "1.4";
6− src = fetchurl {
7− url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz";
8− sha256 = "0wa9vcrc26kirc2cqqs6kmarbi8gqy3dgdfiv9y7nzsgy1liqacq";
9− };
4+ pname = "ppxfind";
5+ version = "1.4";
6+ src = fetchurl {
7+ url = "https://github.com/diml/ppxfind/releases/download/${version}/ppxfind-${version}.tbz";
8+ sha256 = "0wa9vcrc26kirc2cqqs6kmarbi8gqy3dgdfiv9y7nzsgy1liqacq";
9+ };
1010
11− minimumOCamlVersion = "4.03";
12− useDune2 = true;
11+ minimumOCamlVersion = "4.03";
12+ useDune2 = true;
1313
14− buildInputs = [ ocaml-migrate-parsetree ];
14+ buildInputs = [ ocaml-migrate-parsetree ];
1515
1616 # Don't run the native `strip' when cross-compiling.
1717 dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
1818
19− meta = {
20− homepage = "https://github.com/diml/ppxfind";
21− description = "ocamlfind ppx tool";
22− license = lib.licenses.bsd3;
23− maintainers = [ lib.maintainers.vbgl ];
24− };
19+ meta = {
20+ homepage = "https://github.com/diml/ppxfind";
21+ description = "ocamlfind ppx tool";
22+ license = lib.licenses.bsd3;
23+ maintainers = [ lib.maintainers.vbgl ];
24+ };
2525} // (
2626if lib.versions.majorMinor ocaml.version == "4.04" then {
2727 dontStrip = true;
pkgs/development/ocaml-modules/rresult/default.nix+15−15
@@ -1,24 +1,24 @@
11{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }:
22
33stdenv.mkDerivation rec {
4− name = "ocaml${ocaml.version}-rresult-${version}";
5− version = "0.6.0";
6− src = fetchurl {
7− url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz";
8− sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86";
9− };
4+ name = "ocaml${ocaml.version}-rresult-${version}";
5+ version = "0.6.0";
6+ src = fetchurl {
7+ url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz";
8+ sha256 = "1k69a3gvrk7f2cshwjzvk7818f0bwxhacgd14wxy6d4gmrggci86";
9+ };
1010
11− buildInputs = [ ocaml findlib ocamlbuild topkg ];
11+ buildInputs = [ ocaml findlib ocamlbuild topkg ];
1212
1313 propagatedBuildInputs = [ result ];
1414
15− inherit (topkg) buildPhase installPhase;
15+ inherit (topkg) buildPhase installPhase;
1616
17− meta = {
18− license = lib.licenses.isc;
19− homepage = "https://erratique.ch/software/rresult";
20− description = "Result value combinators for OCaml";
21− maintainers = [ lib.maintainers.vbgl ];
22− inherit (ocaml.meta) platforms;
23− };
17+ meta = {
18+ license = lib.licenses.isc;
19+ homepage = "https://erratique.ch/software/rresult";
20+ description = "Result value combinators for OCaml";
21+ maintainers = [ lib.maintainers.vbgl ];
22+ inherit (ocaml.meta) platforms;
23+ };
2424}
pkgs/development/ocaml-modules/webbrowser/default.nix+17−17
@@ -3,24 +3,24 @@
33}:
44
55stdenv.mkDerivation rec {
6− name = "ocaml${ocaml.version}-webbrowser-${version}";
7− version = "0.6.1";
8− src = fetchurl {
9− url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz";
10− sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3";
11− };
6+ name = "ocaml${ocaml.version}-webbrowser-${version}";
7+ version = "0.6.1";
8+ src = fetchurl {
9+ url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz";
10+ sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3";
11+ };
1212
13− nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
14− buildInputs = [];
15− propagatedBuildInputs = [ astring bos cmdliner rresult ];
13+ nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ];
14+ buildInputs = [];
15+ propagatedBuildInputs = [ astring bos cmdliner rresult ];
1616
17− inherit (topkg) buildPhase installPhase;
17+ inherit (topkg) buildPhase installPhase;
1818
19− meta = {
20− description = "Open and reload URIs in browsers from OCaml";
21− homepage = "https://erratique.ch/software/webbrowser";
22− license = lib.licenses.isc;
23− maintainers = [ lib.maintainers.vbgl ];
24− inherit (ocaml.meta) platforms;
25− };
19+ meta = {
20+ description = "Open and reload URIs in browsers from OCaml";
21+ homepage = "https://erratique.ch/software/webbrowser";
22+ license = lib.licenses.isc;
23+ maintainers = [ lib.maintainers.vbgl ];
24+ inherit (ocaml.meta) platforms;
25+ };
2626}