From b1de4bf60f955ed59adb2d8878eb0b5d55fb1b4e Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 9 May 2022 10:30:27 -0700 Subject: [PATCH] ocamlPackages: add meta.mainProgram to many packages --- pkgs/development/ocaml-modules/biniou/default.nix | 5 +++-- pkgs/development/ocaml-modules/jsonm/default.nix | 1 + pkgs/development/ocaml-modules/omd/default.nix | 1 + pkgs/development/ocaml-modules/piqi-ocaml/default.nix | 3 ++- pkgs/development/ocaml-modules/ppx_bap/default.nix | 3 ++- pkgs/development/ocaml-modules/uuidm/default.nix | 3 ++- pkgs/development/ocaml-modules/uunf/default.nix | 3 ++- pkgs/development/ocaml-modules/uuseg/default.nix | 3 ++- pkgs/development/ocaml-modules/uutf/default.nix | 3 ++- pkgs/development/ocaml-modules/xmlm/default.nix | 5 +++-- pkgs/development/ocaml-modules/yojson/default.nix | 1 + pkgs/development/tools/ocaml/findlib/default.nix | 8 +++----- pkgs/development/tools/ocaml/oasis/default.nix | 7 +++---- 13 files changed, 27 insertions(+), 19 deletions(-) diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index 75725f13551..ff3b8769935 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -22,9 +22,10 @@ buildDunePackage rec { ''; meta = { - inherit (src.meta) homepage; description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - maintainers = [ lib.maintainers.vbgl ]; + inherit (src.meta) homepage; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; + mainProgram = "bdump"; }; } diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index 2b9c9918382..d29b19b3b40 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://erratique.ch/software/jsonm"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ vbgl ]; + mainProgram = "jsontrip"; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/omd/default.nix b/pkgs/development/ocaml-modules/omd/default.nix index b9797e257ab..cfb743cc982 100644 --- a/pkgs/development/ocaml-modules/omd/default.nix +++ b/pkgs/development/ocaml-modules/omd/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ocaml/omd"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; + mainProgram = "omd"; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 8c0276bc9a7..39869765349 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -28,9 +28,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://piqi.org"; description = "Universal schema language and a collection of tools built around it. These are the ocaml bindings"; + homepage = "https://piqi.org"; license = licenses.asl20; maintainers = [ maintainers.maurer ]; + mainProgram = "piqic-ocaml"; }; } diff --git a/pkgs/development/ocaml-modules/ppx_bap/default.nix b/pkgs/development/ocaml-modules/ppx_bap/default.nix index f0a223c3db7..b1229643ae6 100644 --- a/pkgs/development/ocaml-modules/ppx_bap/default.nix +++ b/pkgs/development/ocaml-modules/ppx_bap/default.nix @@ -44,8 +44,9 @@ buildDunePackage rec { meta = { description = "The set of ppx rewriters for BAP"; - license = lib.licenses.mit; inherit (src.meta) homepage; + license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; + mainProgram = "ppx-bap"; }; } diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 336d66cb0a6..7df1c588dd3 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { description = "An OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122"; homepage = "https://erratique.ch/software/uuidm"; license = licenses.bsd3; - platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.maurer ]; + mainProgram = "uuidtrip"; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index b61a60c2a37..d69c22db802 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -32,8 +32,9 @@ stdenv.mkDerivation { meta = with lib; { description = "An OCaml module for normalizing Unicode text"; homepage = webpage; - inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; + mainProgram = "unftrip"; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 42642d2dc24..9d19de1c3ce 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An OCaml library for segmenting Unicode text"; homepage = webpage; - inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; + mainProgram = "usegtrip"; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index c76eac45b35..62ac1fc7c1c 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -26,8 +26,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Non-blocking streaming Unicode codec for OCaml"; homepage = "https://erratique.ch/software/uutf"; - inherit (ocaml.meta) platforms; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; + mainProgram = "utftrip"; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index d989b281cad..34878cb30bb 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -27,8 +27,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An OCaml streaming codec to decode and encode the XML data format"; homepage = webpage; - platforms = ocaml.meta.platforms or []; - maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; + maintainers = [ maintainers.vbgl ]; + mainProgram = "xmltrip"; + platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index 2be9ce1b021..03b01c43776 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -18,5 +18,6 @@ buildDunePackage rec { homepage = "https://github.com/ocaml-community/${pname}"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; + mainProgram = "ydump"; }; } diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 44d9782f3ce..5a9b08e20d0 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -54,14 +54,12 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = "http://projects.camlcity.org/projects/findlib.html"; description = "O'Caml library manager"; + homepage = "http://projects.camlcity.org/projects/findlib.html"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ maggesi vbmithr ]; + mainProgram = "ocamlfind"; platforms = ocaml.meta.platforms or []; - maintainers = [ - lib.maintainers.maggesi - lib.maintainers.vbmithr - ]; }; } diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index d35ddbe210b..c550bef7dda 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -39,12 +39,11 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://oasis.forge.ocamlcore.org/"; description = "Configure, build and install system for OCaml projects"; + homepage = "http://oasis.forge.ocamlcore.org/"; license = licenses.lgpl21; + maintainers = with maintainers; [ vbgl maggesi ]; + mainProgram = "oasis"; platforms = ocaml.meta.platforms or []; - maintainers = with maintainers; [ - vbgl maggesi - ]; }; }