From f12b9ea461c3a5c75df219b08f17f9a7856894ae Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Wed, 25 Jan 2023 16:24:28 +0100 Subject: [PATCH] buildDunePackage: default to strictDeps = true --- .../from_md/release-notes/rl-2305.section.xml | 17 ++++++++++++++++- .../doc/manual/release-notes/rl-2305.section.md | 4 +++- pkgs/build-support/ocaml/dune.nix | 2 ++ .../ocaml-modules/atdgen/default.nix | 1 - .../ocaml-modules/bigarray-overlap/default.nix | 2 -- .../ocaml-modules/biniou/default.nix | 2 -- pkgs/development/ocaml-modules/bitv/default.nix | 2 -- .../ocaml-modules/calendar/default.nix | 2 -- .../ocaml-modules/camlimages/default.nix | 2 -- .../ocaml-modules/camomile/default.nix | 2 -- .../ocaml-modules/cfstream/default.nix | 5 ++--- pkgs/development/ocaml-modules/coin/default.nix | 2 -- .../ocaml-modules/digestif/default.nix | 2 -- .../ocaml-modules/dolmen/default.nix | 4 ---- pkgs/development/ocaml-modules/gen/default.nix | 3 --- .../ocaml-modules/graphql_ppx/default.nix | 2 -- .../ocaml-modules/happy-eyeballs/default.nix | 2 -- .../ocaml-modules/happy-eyeballs/lwt.nix | 2 -- .../ocaml-modules/happy-eyeballs/mirage.nix | 2 -- .../ocaml-modules/hidapi/default.nix | 2 -- .../ocaml-modules/inotify/default.nix | 2 -- pkgs/development/ocaml-modules/irmin/ppx.nix | 2 -- .../ocaml-modules/janestreet/0.15.nix | 4 +--- .../ocaml-modules/janestreet/janePackage.nix | 2 -- .../janestreet/janePackage_0_12.nix | 2 -- .../janestreet/janePackage_0_14.nix | 3 +-- .../janestreet/janePackage_0_15.nix | 3 +-- .../ocaml-modules/lambda-term/default.nix | 2 -- pkgs/development/ocaml-modules/lwt/default.nix | 2 -- .../ocaml-modules/merlin-extend/default.nix | 2 -- .../ocaml-modules/mirage-crypto/default.nix | 2 -- .../ocaml-modules/mirage-crypto/pk.nix | 2 -- .../ocaml-modules/mirage-crypto/rng-mirage.nix | 2 -- .../ocaml-modules/ocamlfuse/default.nix | 3 --- .../development/ocaml-modules/odate/default.nix | 2 -- .../development/ocaml-modules/otoml/default.nix | 2 -- .../ocaml-modules/ppx_cstubs/default.nix | 2 -- .../ocaml-modules/ppx_tools/default.nix | 2 -- .../ocaml-modules/psmt2-frontend/default.nix | 2 -- .../development/ocaml-modules/ptmap/default.nix | 2 -- .../ocaml-modules/reactivedata/default.nix | 2 -- .../ocaml-modules/stdcompat/default.nix | 2 -- pkgs/development/ocaml-modules/uuuu/default.nix | 2 -- .../ocaml-modules/yojson/default.nix | 2 -- 44 files changed, 26 insertions(+), 89 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index b8affabb86475..e8fdcf82f664b 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -189,7 +189,22 @@ doInstallCheck is set. (Note that this change will not cause breakage to derivations with strictDeps unset, which are most packages - except python, rust and go packages). + except python, rust, ocaml and go packages). + + + + + buildDunePackage now defaults to + strictDeps = true which means that any + library should go into buildInputs or + checkInputs. Any executable that is run on + the building machine should go into + nativeBuildInputs or + nativeCheckInputs respectively. Example of + executables are ocaml, + findlib and menhir. PPXs + are libraries which are built by dune and should therefore not + go into nativeBuildInputs. diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 96f67673211d1..38cad40fffb65 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -54,7 +54,9 @@ In addition to numerous new and upgraded packages, this release has the followin - `carnix` and `cratesIO` has been removed due to being unmaintained, use alternatives such as [naersk](https://github.com/nix-community/naersk) and [crate2nix](https://github.com/kolloch/crate2nix) instead. -- `checkInputs` have been renamed to `nativeCheckInputs`, because they behave the same as `nativeBuildInputs` when `doCheck` is set. `checkInputs` now denote a new type of dependencies, added to `buildInputs` when `doCheck` is set. As a rule of thumb, `nativeCheckInputs` are tools on `$PATH` used during the tests, and `checkInputs` are libraries which are linked to executables built as part of the tests. Similarly, `installCheckInputs` are renamed to `nativeInstallCheckInputs`, corresponding to `nativeBuildInputs`, and `installCheckInputs` are a new type of dependencies added to `buildInputs` when `doInstallCheck` is set. (Note that this change will not cause breakage to derivations with `strictDeps` unset, which are most packages except python, rust and go packages). +- `checkInputs` have been renamed to `nativeCheckInputs`, because they behave the same as `nativeBuildInputs` when `doCheck` is set. `checkInputs` now denote a new type of dependencies, added to `buildInputs` when `doCheck` is set. As a rule of thumb, `nativeCheckInputs` are tools on `$PATH` used during the tests, and `checkInputs` are libraries which are linked to executables built as part of the tests. Similarly, `installCheckInputs` are renamed to `nativeInstallCheckInputs`, corresponding to `nativeBuildInputs`, and `installCheckInputs` are a new type of dependencies added to `buildInputs` when `doInstallCheck` is set. (Note that this change will not cause breakage to derivations with `strictDeps` unset, which are most packages except python, rust, ocaml and go packages). + +- `buildDunePackage` now defaults to `strictDeps = true` which means that any library should go into `buildInputs` or `checkInputs`. Any executable that is run on the building machine should go into `nativeBuildInputs` or `nativeCheckInputs` respectively. Example of executables are `ocaml`, `findlib` and `menhir`. PPXs are libraries which are built by dune and should therefore not go into `nativeBuildInputs`. - `borgbackup` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.borgbackup.jobs..inhibitsSleep`](#opt-services.borgbackup.jobs._name_.inhibitsSleep). diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index 0a68b73f8956e..ce3b389b9cee3 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation ({ runHook postInstall ''; + strictDeps = true; + } // (builtins.removeAttrs args [ "minimalOCamlVersion" "duneVersion" ]) // { name = "ocaml${ocaml.version}-${pname}-${version}"; diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix index cd56271e655f6..07ee079cae30f 100644 --- a/pkgs/development/ocaml-modules/atdgen/default.nix +++ b/pkgs/development/ocaml-modules/atdgen/default.nix @@ -10,7 +10,6 @@ buildDunePackage { propagatedBuildInputs = [ atdgen-runtime ]; - strictDeps = true; doCheck = true; nativeCheckInputs = [ atd (python3.withPackages (ps: [ ps.jsonschema ]))]; checkInputs = [ alcotest atdgen-codec-runtime ]; diff --git a/pkgs/development/ocaml-modules/bigarray-overlap/default.nix b/pkgs/development/ocaml-modules/bigarray-overlap/default.nix index 80b61e2bdf3e9..2674369f37e08 100644 --- a/pkgs/development/ocaml-modules/bigarray-overlap/default.nix +++ b/pkgs/development/ocaml-modules/bigarray-overlap/default.nix @@ -14,8 +14,6 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; useDune2 = true; - strictDeps = true; - propagatedBuildInputs = [ bigarray-compat ]; nativeBuildInputs = [ findlib pkg-config ]; diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index 22d2b643b279b..2c58a4081401b 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -11,8 +11,6 @@ buildDunePackage rec { propagatedBuildInputs = [ camlp-streams easy-format ]; - strictDeps = true; - meta = { description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; homepage = "https://github.com/ocaml-community/biniou"; diff --git a/pkgs/development/ocaml-modules/bitv/default.nix b/pkgs/development/ocaml-modules/bitv/default.nix index a986a46f29354..25906f1432f06 100644 --- a/pkgs/development/ocaml-modules/bitv/default.nix +++ b/pkgs/development/ocaml-modules/bitv/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook which ocaml findlib ]; - strictDeps = true; - createFindlibDestdir = true; meta = { diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index cf349eeb8bb16..8fd3f5befef93 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -14,8 +14,6 @@ buildDunePackage rec { propagatedBuildInputs = [ re ]; - strictDeps = true; - meta = { inherit (src.meta) homepage; description = "A library for handling dates and times"; diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index a83c7c474ac5d..b6768cfe8c1a8 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -17,8 +17,6 @@ buildDunePackage rec { sha256 = "1m2c76ghisg73dikz2ifdkrbkgiwa0hcmp21f2fm2rkbf02rq3f4"; }; - strictDeps = true; - nativeBuildInputs = [ cppo ]; buildInputs = [ dune-configurator graphics lablgtk stdio ]; diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index e5fe670213129..ea2a653936821 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -15,8 +15,6 @@ buildDunePackage rec { nativeBuildInputs = [ cppo ]; - strictDeps = true; - configurePhase = '' runHook preConfigure ocaml configure.ml --share $out/share/camomile diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix index aeedb414a3bb8..b39cb471e4cb6 100644 --- a/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/pkgs/development/ocaml-modules/cfstream/default.nix @@ -17,11 +17,10 @@ buildDunePackage rec { patches = [ ./git_commit.patch ]; - # This currently fails with dune - strictDeps = false; + strictDeps = true; nativeBuildInputs = [ m4 ]; - nativeCheckInputs = [ ounit ]; + checkInputs = [ ounit ]; propagatedBuildInputs = [ core_kernel ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/coin/default.nix b/pkgs/development/ocaml-modules/coin/default.nix index 5996cd7adb612..c9b6ad3128f38 100644 --- a/pkgs/development/ocaml-modules/coin/default.nix +++ b/pkgs/development/ocaml-modules/coin/default.nix @@ -24,8 +24,6 @@ buildDunePackage rec { nativeBuildInputs = [ findlib ]; buildInputs = [ re ]; - strictDeps = true; - doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix index 80ca209b9b12a..75ecb7fc58fbe 100644 --- a/pkgs/development/ocaml-modules/digestif/default.nix +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -15,8 +15,6 @@ buildDunePackage rec { sha256 = "sha256-edNM5ROxFIV+OAqr328UcyGPGwXdflHQOJB3ntAbRmY="; }; - strictDeps = true; - nativeBuildInputs = [ findlib which ocaml pkg-config ]; propagatedBuildInputs = [ eqaf ]; diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index 7a7a14192f9e7..b27efe5019448 100644 --- a/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -7,8 +7,6 @@ buildDunePackage rec { pname = "dolmen"; version = "0.6"; - useDune2 = true; - minimalOCamlVersion = "4.08"; src = fetchurl { @@ -16,8 +14,6 @@ buildDunePackage rec { sha256 = "133l23mwxa9xy340izvk4zp5jqjz2cwsm2innsgs2kg85pd39c41"; }; - strictDeps = true; - nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ menhirLib fmt ]; diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 699af9f5f2048..ee932bffd5e6e 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -16,11 +16,8 @@ buildDunePackage rec { hash = "sha256-YWoVcl2TQoMIgU1LoKL16ia31zJjwAMwuphtSXnhtvw="; }; - strictDeps = true; - buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ seq ]; - nativeCheckInputs = [ qcheck ounit2 ]; checkInputs = [ qcheck ounit2 ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/pkgs/development/ocaml-modules/graphql_ppx/default.nix b/pkgs/development/ocaml-modules/graphql_ppx/default.nix index 003482ca08ab0..9314c1033d4c6 100644 --- a/pkgs/development/ocaml-modules/graphql_ppx/default.nix +++ b/pkgs/development/ocaml-modules/graphql_ppx/default.nix @@ -18,8 +18,6 @@ buildDunePackage rec { sha256 = "sha256-+WJhA2ixZHiSZBoX14dnQKk7JfVAIME4JooNSnhRp44="; }; - strictDeps = true; - nativeBuildInputs = [ reason ]; buildInputs = [ ppxlib reason ]; diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix index d5b0691fdffaf..a3a2a3cff1f94 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix @@ -13,8 +13,6 @@ buildDunePackage rec { hash = "sha256-gR9q4J/DnYJz8oYmk/wy17h4F6wxbllba/gkor5i1nQ="; }; - strictDeps = true; - propagatedBuildInputs = [ domain-name duration diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix b/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix index 9160b9233fa5c..50f1f94557395 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/lwt.nix @@ -19,8 +19,6 @@ buildDunePackage { minimalOCamlVersion = "4.08"; duneVersion = "3"; - strictDeps = true; - buildInputs = [ cmdliner duration diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix index 22f17111e44bd..eb15706efac9f 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/mirage.nix @@ -21,8 +21,6 @@ buildDunePackage { minimalOCamlVersion = "4.08"; duneVersion = "3"; - strictDeps = true; - buildInputs = [ duration ipaddr diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix index b4492f438ccca..68fc506222de6 100644 --- a/pkgs/development/ocaml-modules/hidapi/default.nix +++ b/pkgs/development/ocaml-modules/hidapi/default.nix @@ -13,8 +13,6 @@ buildDunePackage rec { sha256 = "1j7rd7ajrzla76r3sxljx6fb18f4f4s3jd7vhv59l2ilxyxycai2"; }; - strictDeps = true; - minimumOCamlVersion = "4.03"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix index 8a2b0c4150729..2dce9320afd4c 100644 --- a/pkgs/development/ocaml-modules/inotify/default.nix +++ b/pkgs/development/ocaml-modules/inotify/default.nix @@ -18,8 +18,6 @@ buildDunePackage rec { checkInputs = [ ounit2 fileutils ]; - strictDeps = true; - doCheck = true; meta = { diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix index 2e21331c22e6d..83cd5b1d7f5f7 100644 --- a/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -11,8 +11,6 @@ buildDunePackage rec { minimalOCamlVersion = "4.10"; - strictDeps = false; # We must provide nativeCheckInputs as buildInputs because dune builds tests at build time - propagatedBuildInputs = [ ppx_repr ppxlib diff --git a/pkgs/development/ocaml-modules/janestreet/0.15.nix b/pkgs/development/ocaml-modules/janestreet/0.15.nix index 8bf230a182584..7433c116b68fb 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -958,9 +958,7 @@ with self; meta.description = "Yet another implementation of fork&exec and related functionality"; buildInputs = [ jst-config ]; propagatedBuildInputs = [ textutils ]; - nativeCheckInputs = [ ounit ]; - # This currently fails with dune - strictDeps = false; + checkInputs = [ ounit ]; }; shexp = janePackage { diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix index da26875760154..9552268abc2e0 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix @@ -16,8 +16,6 @@ buildDunePackage (args // { sha256 = hash; }; - strictDeps = true; - meta = { license = lib.licenses.asl20; homepage = "https://github.com/janestreet/${pname}"; diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix index 5b9186835701b..d61f1b6d41c2d 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix @@ -16,8 +16,6 @@ buildDunePackage (args // { sha256 = hash; }; - strictDeps = true; - meta = { license = lib.licenses.mit; homepage = "https://github.com/janestreet/${pname}"; diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix index d124baea8972d..e3c3efc9999e8 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix @@ -6,12 +6,11 @@ , minimumOCamlVersion ? "4.08" , doCheck ? true , buildInputs ? [] -, strictDeps ? true , ...}@args: buildDunePackage (args // { useDune2 = true; - inherit version buildInputs strictDeps; + inherit version buildInputs; inherit minimumOCamlVersion; diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix index 678599089946d..7306ce46bf993 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix @@ -6,12 +6,11 @@ , minimumOCamlVersion ? "4.11" , doCheck ? true , buildInputs ? [] -, strictDeps ? true , ...}@args: buildDunePackage (args // { useDune2 = true; - inherit version buildInputs strictDeps; + inherit version buildInputs; inherit minimumOCamlVersion; diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index c073ddf39cd29..a2294822a0cac 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -16,8 +16,6 @@ buildDunePackage rec { duneVersion = if lib.versionAtLeast ocaml.version "4.08" then "3" else "2"; - strictDeps = true; - src = fetchFromGitHub { owner = "ocaml-community"; repo = pname; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 9be06c2e61120..8004cfcd4bb42 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -15,8 +15,6 @@ buildDunePackage rec { sha256 = "sha256-XstKs0tMwliCyXnP0Vzi5WC27HKJGnATUYtbbQmH1TE="; }; - strictDeps = true; - nativeBuildInputs = [ cppo ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ libev ocplib-endian ]; diff --git a/pkgs/development/ocaml-modules/merlin-extend/default.nix b/pkgs/development/ocaml-modules/merlin-extend/default.nix index b295c0eda0f7d..a8ccd2cf4a015 100644 --- a/pkgs/development/ocaml-modules/merlin-extend/default.nix +++ b/pkgs/development/ocaml-modules/merlin-extend/default.nix @@ -11,8 +11,6 @@ buildDunePackage rec { sha256 = "0hvc4mz92x3rl2dxwrhvhzwl4gilnyvvwcqgr45vmdpyjyp3dwn2"; }; - strictDeps = true; - nativeBuildInputs = [ cppo ]; meta = with lib; { diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index ea2780a7ab67b..d5f110948dc93 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -25,8 +25,6 @@ buildDunePackage rec { ocaml-freestanding ]; - strictDeps = true; - meta = with lib; { homepage = "https://github.com/mirage/mirage-crypto"; description = "Simple symmetric cryptography for the modern age"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix index 412eec1011b9a..b79f49c64bd45 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/pk.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/pk.nix @@ -10,8 +10,6 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct mirage-crypto mirage-crypto-rng zarith eqaf sexplib0 ]; - strictDeps = true; - doCheck = true; checkInputs = [ ounit2 randomconv ]; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix index 02eba14c31854..c3703a5a60abb 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix @@ -14,8 +14,6 @@ buildDunePackage rec { propagatedBuildInputs = [ duration cstruct mirage-crypto-rng mirage-runtime mirage-time mirage-clock logs lwt ]; - strictDeps = true; - meta = mirage-crypto-rng.meta // { description = "Entropy collection for a cryptographically secure PRNG"; }; diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 13ac62f645145..1efcbf382dbfd 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -11,9 +11,6 @@ buildDunePackage rec { sha256 = "6nmPXZx38hBGlg+gV9nnlRpPfeSAqDj4zBPcjUNvTRo="; }; - # This currently fails with dune - strictDeps = false; - nativeBuildInputs = [ camlidl ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ camlidl fuse ]; diff --git a/pkgs/development/ocaml-modules/odate/default.nix b/pkgs/development/ocaml-modules/odate/default.nix index 24d2c04c6ca69..a16fbc578d33d 100644 --- a/pkgs/development/ocaml-modules/odate/default.nix +++ b/pkgs/development/ocaml-modules/odate/default.nix @@ -15,8 +15,6 @@ buildDunePackage rec { sha256 = "1dk33lr0g2jnia2gqsm6nnc7nf256qgkm3v30w477gm6y2ppfm3h"; }; - strictDeps = true; - nativeBuildInputs = [ menhir ]; # Ensure compatibility of v0.6 with menhir ≥ 20220210 diff --git a/pkgs/development/ocaml-modules/otoml/default.nix b/pkgs/development/ocaml-modules/otoml/default.nix index 3f06a098d0e16..4a2e605f4cef9 100644 --- a/pkgs/development/ocaml-modules/otoml/default.nix +++ b/pkgs/development/ocaml-modules/otoml/default.nix @@ -19,8 +19,6 @@ buildDunePackage rec { sha256 = "sha256-Xd3fHBN1f+tvgRFCxD/Gz8/lIvezknz7Zy3EtdqoTEM="; }; - strictDeps = true; - nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ menhirLib uutf ]; diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix index c58004b9adca9..88f187cc706a3 100644 --- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix +++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix @@ -42,8 +42,6 @@ buildDunePackage rec { ctypes ]; - strictDeps = true; - meta = with lib; { homepage = "https://github.com/fdopen/ppx_cstubs"; changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md"; diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index d3af0ea154ea8..2d5f73be42b85 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -58,8 +58,6 @@ then inherit pname src meta; inherit (param) version buildInputs nativeBuildInputs; duneVersion = "3"; - - strictDeps = true; } else stdenv.mkDerivation { diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix index 1cb14f75faa89..ef88bdcdab7b8 100644 --- a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix +++ b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix @@ -13,8 +13,6 @@ buildDunePackage rec { minimalOCamlVersion = "4.03"; - strictDeps = true; - nativeBuildInputs = [ menhir ]; meta = { diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/pkgs/development/ocaml-modules/ptmap/default.nix index a3c0eb55f9685..edc9e1c6dcbd2 100644 --- a/pkgs/development/ocaml-modules/ptmap/default.nix +++ b/pkgs/development/ocaml-modules/ptmap/default.nix @@ -14,8 +14,6 @@ buildDunePackage rec { sha256 = "1apk61fc1y1g7x3m3c91fnskvxp6i0vk5nxwvipj56k7x2pzilgb"; }; - strictDeps = true; - buildInputs = [ stdlib-shims ]; propagatedBuildInputs = [ seq ]; diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index 3aafd9807a018..49b1357f54918 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -15,8 +15,6 @@ buildDunePackage rec { propagatedBuildInputs = [ react ]; - strictDeps = true; - meta = with lib; { description = "An OCaml module for functional reactive programming (FRP) based on React"; homepage = "https://github.com/ocsigen/reactiveData"; diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix index b8dcc81bfe7ee..33e93967e192e 100644 --- a/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -12,8 +12,6 @@ buildDunePackage rec { sha256 = "sha256-DKQGd4nnIN6SPls6hcA/2Jvc7ivYNpeMU6rYsVc1ClU="; }; - strictDeps = true; - # Otherwise ./configure script will run and create files conflicting with dune. dontConfigure = true; diff --git a/pkgs/development/ocaml-modules/uuuu/default.nix b/pkgs/development/ocaml-modules/uuuu/default.nix index e84addcac8ba7..4473cd8217c0a 100644 --- a/pkgs/development/ocaml-modules/uuuu/default.nix +++ b/pkgs/development/ocaml-modules/uuuu/default.nix @@ -25,8 +25,6 @@ buildDunePackage rec { buildInputs = [ angstrom ]; - strictDeps = true; - nativeCheckInputs = [ re ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index d191892e67a19..38960dceb5e3d 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -9,8 +9,6 @@ buildDunePackage rec { sha256 = "sha256-h2u284r3OoSilDij2jXkhXxgoUVWpgZSWxSMb9vlRhs="; }; - strictDeps = true; - nativeBuildInputs = [ cppo ]; propagatedBuildInputs = [ seq ];