diff options
author | Ulrik Strid <ulrik.strid@outlook.com> | 2022-03-01 16:42:22 +0100 |
---|---|---|
committer | Ulrik Strid <ulrik.strid@outlook.com> | 2023-02-03 08:59:34 +0100 |
commit | c53a63adf11330c66d3f0ed0def74e0dacd2cd2a (patch) | |
tree | a8af7d43c6d03b0399390aef4b25b7d63daa4055 /pkgs/development/tools/ocaml | |
parent | d6ccd7658182294671cdb61ef7c5db46d7e78eb4 (diff) |
ocamlPackages treewide: strictDeps all packages
Diffstat (limited to 'pkgs/development/tools/ocaml')
17 files changed, 51 insertions, 22 deletions
diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 471932ff83f7a..dd25dd864cee5 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -56,7 +56,9 @@ stdenv.mkDerivation rec { inherit (param) sha256; }; - buildInputs = [ which ocaml ocamlbuild ]; + strictDeps = true; + + nativeBuildInputs = [ which ocaml ocamlbuild ]; # build fails otherwise enableParallelBuilding = false; diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 65debca11c231..9d81c46e20c9f 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w"; }; - buildInputs = [ ocaml perl ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml perl ]; prefixKey = "-prefix "; diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 753ef0a836b98..87db3baf0b0e3 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -52,7 +52,9 @@ stdenv.mkDerivation { sha256 = "1xqldjz9risndnabvadw41fdbi5sa2hl4fnqls7j9xfbby1izbg8"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; inherit meta; diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index 7e48203c091e3..7bc1f80c699f6 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -20,10 +20,11 @@ in buildDunePackage rec { sha256 = "sha256-oJ5SL7qNM5izoEpr+nTjbT+YmmNIoy7QgSNse3wNIA4="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] ++ runtimeInputs; buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core rresult logs odoc bos yojson astring fpath ]; - nativeCheckInputs = [ alcotest ] ++ runtimeInputs; + nativeCheckInputs = [ odoc ]; + checkInputs = [ alcotest ] ++ runtimeInputs; doCheck = true; postPatch = '' diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index cec91a02f2093..5faccab938ee8 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -1,5 +1,5 @@ { lib, fetchurl, buildDunePackage -, cmdliner, yojson, ppxlib +, cmdliner, yojson, ppxlib, findlib , menhir, menhirLib }: @@ -17,7 +17,7 @@ buildDunePackage rec { buildInputs = [ cmdliner ppxlib ]; configurePlatforms = []; - propagatedBuildInputs = [ menhirLib yojson ]; + propagatedBuildInputs = [ menhirLib yojson findlib ]; meta = { description = "Compiler from OCaml bytecode to Javascript"; diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix index 8a4dce3422315..4a0a87577cbff 100644 --- a/pkgs/development/tools/ocaml/obuild/default.nix +++ b/pkgs/development/tools/ocaml/obuild/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-dqWP9rwWmr7i3O29v/kipJL01B3qQozaToOFCdfTWZU="; }; - buildInputs = [ ocaml ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml ]; buildPhase = '' patchShebangs ./bootstrap diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index f5853057d8e06..095af7769140e 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -11,7 +11,8 @@ with ocamlPackages; buildDunePackage rec { sha256 = "sha256-ZXnPnPvJmHshkTwYWeBojrgJYAF/R6vUo0XkvVMFSeQ="; }; - buildInputs = [ ncurses ocp-build lablgtk3-sourceview3 ocp-index ]; + nativeBuildInputs = [ ocp-build ]; + buildInputs = [ ncurses lablgtk3-sourceview3 ocp-index ]; configurePhase = '' export TERM=xterm diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index b40c8b42546b7..0ac69f86c90dd 100644 --- a/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; configurePhase = '' substituteInPlace src/ocamlify.ml --replace 'OCamlifyConfig.version' '"0.0.2"' diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index 551a36adaed1b..5b4f7e8e44078 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation { sha256 = "0cgp9qqrq7ayyhddrmqmq1affvfqcn722qiakjq4dkywvp67h4aa"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = !doCheck; + + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; configurePhase = "ocaml setup.ml -configure --prefix $out" + lib.optionalString doCheck " --enable-tests"; diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix index 48b7d840a4f2b..8277f4adb06dc 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256:10xz8jknlmcgnf233nahd04q98ijnxpijhpvb8hl7sv94dgkvpql"; }; - propagatedBuildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; patches = [ ./Makefile.patch ]; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index feb787d24d5d2..de26536eb1c5c 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -19,7 +19,10 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ ocaml findlib cmdliner_1_0 re ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ cmdliner_1_0 re ]; propagatedBuildInputs = [ ncurses ]; preInstall = "mkdir -p $out/bin"; diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index 54e1ee55a7bff..fcb43938112d1 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation rec { pname = "ocsigen-i18n"; version = "3.7.0"; - buildInputs = with ocamlPackages; [ ocaml findlib ppx_tools ]; + strictDeps = true; + + nativeBuildInputs = with ocamlPackages; [ ocaml findlib ]; + buildInputs = with ocamlPackages; [ ppx_tools ]; dontStrip = true; diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index f6c7955c68633..b7d670ce4a7e7 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { sha256 = "sha256-VOFq2KLBbmZCRgHzfpD7p0iyF8yU1tTbyvTiOcpm98Q="; }; - buildInputs = [ ocaml ncurses ]; + strictDeps = true; + + nativeBuildInputs = [ ocaml ]; + buildInputs = [ ncurses ]; meta = { description = "A build system designed for scalability and portability"; diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix index 60804684ccbc8..23a73002e6fe1 100644 --- a/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -47,8 +47,10 @@ in stdenv.mkDerivation { pname = "opam"; version = "1.2.2"; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ curl ncurses ocaml ]; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper unzip curl ocaml ]; + buildInputs = [ ncurses ]; src = srcs.opam; diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index de831fde99f14..1db7ea151fabe 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -79,8 +79,10 @@ in stdenv.mkDerivation { pname = "opam"; version = "2.1.4"; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ curl ncurses ocaml getconf ] + strictDeps = true; + + nativeBuildInputs = [ makeWrapper unzip ocaml curl ]; + buildInputs = [ ncurses getconf ] ++ lib.optionals stdenv.isLinux [ bubblewrap ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index 8929afdef0aba..8b573039d7d87 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -68,8 +68,10 @@ in stdenv.mkDerivation { pname = "opam"; version = "$OPAM_RELEASE"; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ curl ncurses ocaml getconf ] + strictDeps = true; + + nativeBuildInputs = [ makeWrapper unzip ocaml curl ]; + buildInputs = [ ncurses getconf ] ++ lib.optionals stdenv.isLinux [ bubblewrap ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 5d500339ff679..0afaff2649470 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -11,7 +11,7 @@ let version = "2.10.0"; sha256 = "sha256-R10WovnqYcYCrDJnPuIQx2zHaPchSYfXDAaVMsJ4LQA="; duneVersion = "3"; - propagatedBuildInputs = [ lambda-term zed logs ]; + propagatedBuildInputs = [ findlib lambda-term zed logs ]; } else { |