alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

ocamlPackages: add meta.mainProgram to packages with multiple executables

Browse source 
where none of the executables match the package's `name` or `pname`, and
one of the executables is the obvious `mainProgram`.
This commit is contained in:
Malo Bourgon 2022-05-17 17:57:46 -07:00 committed by Vincent Laporte
parent ef3bf2e602
commit ba54ba9316
23 changed files with 53 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/ocaml-modules/bap/default.nix
View file

@ -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";
};
}

1
pkgs/development/ocaml-modules/dns/cli.nix
View file

@ -44,5 +44,6 @@ buildDunePackage {
meta = dns.meta // {
description = "Unix command line utilities using uDNS";
mainProgram = "odns";
};
}

3
pkgs/development/ocaml-modules/earley/default.nix
View file

@ -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";
};
}

1
pkgs/development/ocaml-modules/hxd/default.nix
View file

@ -35,5 +35,6 @@ buildDunePackage rec {
homepage = "https://github.com/dinosaure/hxd";
license = licenses.mit;
maintainers = [ maintainers.sternenseemann ];
mainProgram = "hxd.xxd";
};
}

3
pkgs/development/ocaml-modules/imagelib/default.nix
View file

@ -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";
};
}

9
pkgs/development/ocaml-modules/lablgtk/default.nix
View file

@ -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;
};
}

3
pkgs/development/ocaml-modules/mdx/default.nix
View file

@ -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";
};
}

2
pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix
View file

@ -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)";
};

1
pkgs/development/ocaml-modules/ocaml-gettext/default.nix
View file

@ -28,5 +28,6 @@ buildDunePackage rec {
homepage = "https://github.com/gildor478/ocaml-gettext";
license = licenses.lgpl21;
maintainers = [ maintainers.volth ];
mainProgram = "ocaml-gettext";
};
}

4
pkgs/development/ocaml-modules/ocaml-gettext/stub.nix
View file

@ -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" ];
}

3
pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
View file

@ -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;
};
}

3
pkgs/development/ocaml-modules/pgsolver/default.nix
View file

@ -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";
};
}

3
pkgs/development/ocaml-modules/rebez/default.nix
View file

@ -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";
};
}

5
pkgs/development/ocaml-modules/twt/default.nix
View file

@ -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;
};
}

4
pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
View file

@ -15,7 +15,7 @@ buildDunePackage rec {
sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik";
};
inherit (js_of_ocaml-compiler) meta;
buildInputs = [ camlp4 ocsigen_deriving ];
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
}

3
pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
View file

@ -21,8 +21,9 @@ buildDunePackage rec {
meta = {
description = "Compiler from OCaml bytecode to Javascript";
homepage = "https://ocsigen.org/js_of_ocaml/";
license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.vbgl ];
homepage = "https://ocsigen.org/js_of_ocaml/";
mainProgram = "js_of_ocaml";
};
}

4
pkgs/development/tools/ocaml/js_of_ocaml/default.nix
View file

@ -5,9 +5,11 @@
buildDunePackage {
pname = "js_of_ocaml";
inherit (js_of_ocaml-compiler) version src meta useDune2;
inherit (js_of_ocaml-compiler) version src useDune2;
buildInputs = [ ppxlib ];
propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
}

4
pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
View file

@ -5,9 +5,11 @@
buildDunePackage {
pname = "js_of_ocaml-lwt";
inherit (js_of_ocaml-compiler) version src meta useDune2;
inherit (js_of_ocaml-compiler) version src useDune2;
buildInputs = [ js_of_ocaml-ppx ];
propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
}

4
pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
View file

@ -6,8 +6,10 @@
buildDunePackage {
pname = "js_of_ocaml-ppx";
inherit (js_of_ocaml-compiler) version src meta useDune2;
inherit (js_of_ocaml-compiler) version src useDune2;
buildInputs = [ js_of_ocaml ];
propagatedBuildInputs = [ ppxlib ];
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
}

4
pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
View file

@ -5,7 +5,9 @@
buildDunePackage {
pname = "js_of_ocaml-ppx_deriving_json";
inherit (js_of_ocaml-compiler) version src meta useDune2;
inherit (js_of_ocaml-compiler) version src useDune2;
propagatedBuildInputs = [ js_of_ocaml ppxlib ];
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
}

4
pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
View file

@ -6,9 +6,11 @@
buildDunePackage {
pname = "js_of_ocaml-tyxml";
inherit (js_of_ocaml-compiler) version src meta useDune2;
inherit (js_of_ocaml-compiler) version src useDune2;
buildInputs = [ js_of_ocaml-ppx ];
propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ];
meta = builtins.removeAttrs js_of_ocaml-compiler.meta [ "mainProgram" ];
}

5
pkgs/development/tools/ocaml/ocamlbuild/default.nix
View file

@ -31,10 +31,11 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
homepage = "https://github.com/ocaml/ocamlbuild/";
description = "A build system with builtin rules to easily build most OCaml projects";
homepage = "https://github.com/ocaml/ocamlbuild/";
license = licenses.lgpl2;
inherit (ocaml.meta) platforms;
maintainers = with maintainers; [ vbgl ];
mainProgram = "ocamlbuild";
inherit (ocaml.meta) platforms;
};
}

5
pkgs/development/tools/ocaml/ocp-build/default.nix
View file

@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
preInstall = "mkdir -p $out/bin";
meta = with lib; {
homepage = "https://www.typerex.org/ocp-build.html";
description = "A build tool for OCaml";
longDescription = ''
ocp-build is a build system for OCaml application, based on simple
@ -33,8 +32,10 @@ stdenv.mkDerivation rec {
the number of cores and the automatically-inferred dependencies
between source files.
'';
homepage = "https://www.typerex.org/ocp-build.html";
license = licenses.gpl3;
platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers.jirkamarsik ];
mainProgram = "ocp-build";
inherit (ocaml.meta) platforms;
};
}