diff options
Diffstat (limited to 'pkgs/development/tools/ocaml')
17 files changed, 15 insertions, 10 deletions
diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 22104d3d4dc0..5522406c7e74 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = { description = "A stub code generator and COM binding for Objective Caml"; + mainProgram = "camlidl"; homepage = "https://xavierleroy.org/camlidl/"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.roconnor ]; diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 2f057ada92b9..f5b002c59e64 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -7,6 +7,7 @@ let meta = with lib; { description = "The C preprocessor for OCaml"; + mainProgram = "cppo"; longDescription = '' Cppo is an equivalent of the C preprocessor targeted at the OCaml language and its variants. ''; diff --git a/pkgs/development/tools/ocaml/crunch/default.nix b/pkgs/development/tools/ocaml/crunch/default.nix index d7b4d64096ca..8a9e91b55432 100644 --- a/pkgs/development/tools/ocaml/crunch/default.nix +++ b/pkgs/development/tools/ocaml/crunch/default.nix @@ -25,6 +25,7 @@ buildDunePackage rec { meta = { homepage = "https://github.com/mirage/ocaml-crunch"; description = "Convert a filesystem into a static OCaml module"; + mainProgram = "ocaml-crunch"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index c404144b05a2..796410828f77 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -58,6 +58,7 @@ in buildDunePackage rec { meta = with lib; { description = "Release dune packages in opam"; + mainProgram = "dune-release"; homepage = "https://github.com/ocamllabs/dune-release"; changelog = "https://github.com/tarides/dune-release/blob/${version}/CHANGES.md"; license = licenses.isc; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 65f8c7eda3ca..0d2d3b7d5324 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dune.build/"; description = "A composable build system"; + mainProgram = "dune"; changelog = "https://github.com/ocaml/dune/raw/${version}/CHANGES.md"; maintainers = [ lib.maintainers.vbgl lib.maintainers.marsam ]; license = lib.licenses.mit; diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 82b677175469..b168e7e13c3c 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dune.build/"; description = "A composable build system"; + mainProgram = "dune"; changelog = "https://github.com/ocaml/dune/raw/${version}/CHANGES.md"; maintainers = [ lib.maintainers.vbgl lib.maintainers.marsam ]; license = lib.licenses.mit; diff --git a/pkgs/development/tools/ocaml/merlin/4.x.nix b/pkgs/development/tools/ocaml/merlin/4.x.nix index fb6282054c50..2a3eb8e52eec 100644 --- a/pkgs/development/tools/ocaml/merlin/4.x.nix +++ b/pkgs/development/tools/ocaml/merlin/4.x.nix @@ -23,6 +23,7 @@ let "4.13.1" = "4.7-413"; "4.14.0" = "4.14-414"; "4.14.1" = "4.14-414"; + "4.14.2" = "4.14-414"; "5.0.0" = "4.14-500"; "5.1.0" = "4.14-501"; "5.1.1" = "4.14-501"; diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix index 89af62ed70e6..2d572364005a 100644 --- a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix +++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -16,6 +16,7 @@ buildDunePackage rec { meta = with lib; { description = "Reads config files for merlin"; + mainProgram = "dot-merlin-reader"; homepage = "https://github.com/ocaml/merlin"; license = licenses.mit; maintainers = [ maintainers.hongchangwu ]; diff --git a/pkgs/development/tools/ocaml/obelisk/default.nix b/pkgs/development/tools/ocaml/obelisk/default.nix index 938fa24374af..2775f72d79d1 100644 --- a/pkgs/development/tools/ocaml/obelisk/default.nix +++ b/pkgs/development/tools/ocaml/obelisk/default.nix @@ -18,6 +18,7 @@ ocamlPackages.buildDunePackage rec { meta = { description = "A simple tool which produces pretty-printed output from a Menhir parser file (.mly)"; + mainProgram = "obelisk"; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; homepage = "https://github.com/Lelio-Brun/Obelisk"; diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index 57b457bff293..b5c506ad9b82 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -17,6 +17,7 @@ with ocamlPackages; buildDunePackage rec { homepage = "https://www.typerex.org/ocaml-top.html"; license = lib.licenses.gpl3; description = "A simple cross-platform OCaml code editor built for top-level evaluation"; + mainProgram = "ocaml-top"; maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index 649e1bcd3559..6fd31d54d999 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -21,6 +21,7 @@ buildDunePackage rec { meta = with lib; { homepage = "https://www.typerex.org/ocp-indent.html"; description = "A customizable tool to indent OCaml code"; + mainProgram = "ocp-indent"; license = licenses.gpl3; maintainers = [ maintainers.jirkamarsik ]; }; diff --git a/pkgs/development/tools/ocaml/opaline/default.nix b/pkgs/development/tools/ocaml/opaline/default.nix index b6bc9c9b9f6f..e8fbae0f241b 100644 --- a/pkgs/development/tools/ocaml/opaline/default.nix +++ b/pkgs/development/tools/ocaml/opaline/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "OPAm Light INstaller Engine"; + mainProgram = "opaline"; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; diff --git a/pkgs/development/tools/ocaml/opam-publish/default.nix b/pkgs/development/tools/ocaml/opam-publish/default.nix index dec119bc762c..b18b3e6707be 100644 --- a/pkgs/development/tools/ocaml/opam-publish/default.nix +++ b/pkgs/development/tools/ocaml/opam-publish/default.nix @@ -28,6 +28,7 @@ buildDunePackage rec { meta = with lib; { homepage = "https://github.com/ocaml-opam/${pname}"; description = "A tool to ease contributions to opam repositories"; + mainProgram = "opam-publish"; license = with licenses; [ lgpl21Only ocamlLgplLinkingException ]; maintainers = with maintainers; [ niols ]; }; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 4f85fc52343a..a60b12667fa7 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -122,11 +122,6 @@ in stdenv.mkDerivation { outputs = [ "out" "installer" ]; setOutputFlags = false; - # Work around https://github.com/NixOS/nixpkgs/issues/166205. - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; - }; - # change argv0 to "opam" as a workaround for # https://github.com/ocaml/opam/issues/2142 postInstall = '' diff --git a/pkgs/development/tools/ocaml/opam/installer.nix b/pkgs/development/tools/ocaml/opam/installer.nix index 9b3b7a5617ba..a56621267df3 100644 --- a/pkgs/development/tools/ocaml/opam/installer.nix +++ b/pkgs/development/tools/ocaml/opam/installer.nix @@ -13,5 +13,6 @@ ocamlPackages.buildDunePackage { meta = opam.meta // { description = "Handle (un)installation from opam install files"; + mainProgram = "opam-installer"; }; } diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index 77c574cb9321..412a1a30e70d 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -112,11 +112,6 @@ print <<'EOF'; outputs = [ "out" "installer" ]; setOutputFlags = false; - # Work around https://github.com/NixOS/nixpkgs/issues/166205. - env = lib.optionalAttrs stdenv.cc.isClang { - NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; - }; - # change argv0 to "opam" as a workaround for # https://github.com/ocaml/opam/issues/2142 postInstall = '' diff --git a/pkgs/development/tools/ocaml/opam2json/default.nix b/pkgs/development/tools/ocaml/opam2json/default.nix index a3ca535d3f86..844e6f816134 100644 --- a/pkgs/development/tools/ocaml/opam2json/default.nix +++ b/pkgs/development/tools/ocaml/opam2json/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = platforms.all; description = "convert opam file syntax to JSON"; + mainProgram = "opam2json"; maintainers = [ maintainers.balsoft ]; license = licenses.gpl3; homepage = "https://github.com/tweag/opam2json"; |