diff options
author | Malo Bourgon <mbourgon@gmail.com> | 2022-05-17 17:57:46 -0700 |
---|---|---|
committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-05-20 10:13:29 +0200 |
commit | ba54ba93161b96a3f5a9f0072be2930bcd4dd4e8 (patch) | |
tree | 2012c5c5aac887ef0f6065fa5fa95a558de12688 /pkgs/development/ocaml-modules | |
parent | ef3bf2e60285d3f3299755c28a55918440d5c300 (diff) | |
download | nixpkgs-ba54ba93161b96a3f5a9f0072be2930bcd4dd4e8.tar nixpkgs-ba54ba93161b96a3f5a9f0072be2930bcd4dd4e8.tar.gz nixpkgs-ba54ba93161b96a3f5a9f0072be2930bcd4dd4e8.tar.bz2 nixpkgs-ba54ba93161b96a3f5a9f0072be2930bcd4dd4e8.tar.lz nixpkgs-ba54ba93161b96a3f5a9f0072be2930bcd4dd4e8.tar.xz nixpkgs-ba54ba93161b96a3f5a9f0072be2930bcd4dd4e8.tar.zst nixpkgs-ba54ba93161b96a3f5a9f0072be2930bcd4dd4e8.zip |
ocamlPackages: add meta.mainProgram to packages with multiple executables
where none of the executables match the package's `name` or `pname`, and one of the executables is the obvious `mainProgram`.
Diffstat (limited to 'pkgs/development/ocaml-modules')
14 files changed, 28 insertions, 16 deletions
diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 52287277276..4f87715a74a 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -75,7 +75,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; homepage = "https://github.com/BinaryAnalysisPlatform/bap/"; - maintainers = [ maintainers.maurer ]; license = licenses.mit; + maintainers = [ maintainers.maurer ]; + mainProgram = "bap"; }; } diff --git a/pkgs/development/ocaml-modules/dns/cli.nix b/pkgs/development/ocaml-modules/dns/cli.nix index 6e149180642..f9fc8e21d2b 100644 --- a/pkgs/development/ocaml-modules/dns/cli.nix +++ b/pkgs/development/ocaml-modules/dns/cli.nix @@ -44,5 +44,6 @@ buildDunePackage { meta = dns.meta // { description = "Unix command line utilities using uDNS"; + mainProgram = "odns"; }; } diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/pkgs/development/ocaml-modules/earley/default.nix index c7b2d09d667..0d365c8036d 100644 --- a/pkgs/development/ocaml-modules/earley/default.nix +++ b/pkgs/development/ocaml-modules/earley/default.nix @@ -21,8 +21,9 @@ buildDunePackage rec { meta = { description = "Parser combinators based on Earley Algorithm"; + homepage = "https://github.com/rlepigre/ocaml-earley"; license = lib.licenses.cecill-b; maintainers = [ lib.maintainers.vbgl ]; - homepage = "https://github.com/rlepigre/ocaml-earley"; + mainProgram = "pa_ocaml"; }; } diff --git a/pkgs/development/ocaml-modules/hxd/default.nix b/pkgs/development/ocaml-modules/hxd/default.nix index 0b05a83dd7e..7840bb4ff19 100644 --- a/pkgs/development/ocaml-modules/hxd/default.nix +++ b/pkgs/development/ocaml-modules/hxd/default.nix @@ -35,5 +35,6 @@ buildDunePackage rec { homepage = "https://github.com/dinosaure/hxd"; license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; + mainProgram = "hxd.xxd"; }; } diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix index 580db48769e..a2debdaf492 100644 --- a/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/pkgs/development/ocaml-modules/imagelib/default.nix @@ -21,8 +21,9 @@ buildDunePackage rec { meta = { description = "Image formats such as PNG and PPM in OCaml"; + homepage = "https://github.com/rlepigre/ocaml-imagelib"; license = lib.licenses.lgpl3; maintainers = [ lib.maintainers.vbgl ]; - homepage = "https://github.com/rlepigre/ocaml-imagelib"; + mainProgram = "imagetool"; }; } diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 7eb94bc188a..f82548b1883 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -37,12 +37,11 @@ stdenv.mkDerivation { dontStrip = true; meta = with lib; { - inherit (ocaml.meta) platforms; - maintainers = with maintainers; [ - maggesi roconnor vbgl - ]; - homepage = "http://lablgtk.forge.ocamlcore.org/"; description = "An OCaml interface to GTK"; + homepage = "http://lablgtk.forge.ocamlcore.org/"; license = licenses.lgpl21Plus; + maintainers = with maintainers; [ maggesi roconnor vbgl ]; + mainProgram = "lablgtk2"; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 09f505c0e25..fc1ecb5e076 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -31,10 +31,11 @@ buildDunePackage rec { ''; meta = { - homepage = "https://github.com/realworldocaml/mdx"; description = "Executable OCaml code blocks inside markdown files"; + homepage = "https://github.com/realworldocaml/mdx"; changelog = "https://github.com/realworldocaml/mdx/raw/${version}/CHANGES.md"; license = lib.licenses.isc; maintainers = [ lib.maintainers.romildo ]; + mainProgram = "ocaml-mdx"; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix index 012f3b61ff3..d3606330019 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix @@ -9,7 +9,7 @@ buildDunePackage { doCheck = true; checkInputs = [ ounit fileutils ]; - meta = ocaml_gettext.meta // { + meta = (builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]) // { description = "Internationalization library using camomile (i18n)"; }; diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index 7525a10030e..fa8857f36b3 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -28,5 +28,6 @@ buildDunePackage rec { homepage = "https://github.com/gildor478/ocaml-gettext"; license = licenses.lgpl21; maintainers = [ maintainers.volth ]; + mainProgram = "ocaml-gettext"; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix index 51e902b9140..950ac652e54 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "gettext-stub"; - inherit (ocaml_gettext) src version useDune2 meta; + inherit (ocaml_gettext) src version useDune2; buildInputs = [ dune-configurator ]; @@ -13,4 +13,6 @@ buildDunePackage rec { doCheck = true; checkInputs = [ ounit ]; + + meta = builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ]; } diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix index d084e7f8a62..d5a70406e9c 100644 --- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix +++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix @@ -26,9 +26,10 @@ stdenv.mkDerivation rec { meta = { description = "A simple tool and library to embed files and directories inside OCaml executables"; - license = lib.licenses.lgpl3Plus; homepage = "https://www.typerex.org/ocp-ocamlres.html"; + license = lib.licenses.lgpl3Plus; maintainers = [ lib.maintainers.vbgl ]; + mainProgram = "ocp-ocamlres"; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/pgsolver/default.nix b/pkgs/development/ocaml-modules/pgsolver/default.nix index a1d6fe6486a..6653284ba48 100644 --- a/pkgs/development/ocaml-modules/pgsolver/default.nix +++ b/pkgs/development/ocaml-modules/pgsolver/default.nix @@ -15,9 +15,10 @@ buildOasisPackage rec { propagatedBuildInputs = [ tcslib ocaml-sat-solvers ]; meta = { - homepage = "https://github.com/tcsprojects/pgsolver"; description = "A collection of tools for generating, manipulating and - most of all - solving parity games"; + homepage = "https://github.com/tcsprojects/pgsolver"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ mgttlinger ]; + mainProgram = "pgsolver-bin"; }; } diff --git a/pkgs/development/ocaml-modules/rebez/default.nix b/pkgs/development/ocaml-modules/rebez/default.nix index b82c2ba7482..743f94454ee 100644 --- a/pkgs/development/ocaml-modules/rebez/default.nix +++ b/pkgs/development/ocaml-modules/rebez/default.nix @@ -16,7 +16,8 @@ buildDunePackage rec { meta = with lib; { description = "Cubic bezier implementation in Reason / OCaml"; homepage = "https://github.com/jchavarri/rebez/"; - maintainers = with maintainers; [ superherointj ]; license = licenses.mit; + maintainers = with maintainers; [ superherointj ]; + mainProgram = "RebezApp.exe"; }; } diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix index 4e76f0c16d3..46822df31fc 100644 --- a/pkgs/development/ocaml-modules/twt/default.nix +++ b/pkgs/development/ocaml-modules/twt/default.nix @@ -27,10 +27,11 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with lib; { - homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/"; description = "“The Whitespace Thing” for OCaml"; + homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; - platforms = ocaml.meta.platforms or [ ]; + mainProgram = "ocaml+twt"; + inherit (ocaml.meta) platforms; }; } |