Merge pull request #162385 from ulrikstrid/ulrikstrid/ocamlpackages-strict-deps-v2

ocamlPackages treewide: strictDeps all packages

7 files changed, 79 insertions, 65 deletions

diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix
index 411aaece5329..5f61a9660f2a 100644
--- a/pkgs/tools/audio/liquidsoap/full.nix
+++ b/pkgs/tools/audio/liquidsoap/full.nix
@@ -23,70 +23,75 @@ stdenv.mkDerivation {
       --prefix PATH : ${lib.makeBinPath runtimePackages}
   '';
 
-  nativeBuildInputs = [ makeWrapper pkg-config ];
+
+  strictDeps = true;
+
+  nativeBuildInputs =
+    [ makeWrapper pkg-config which
+      ocamlPackages.ocaml ocamlPackages.findlib ocamlPackages.menhir
+    ];
+
   buildInputs = [
-      libjpeg
-      which
-      ocamlPackages.ocaml ocamlPackages.findlib
+    libjpeg
 
-      # Mandatory dependencies
-      ocamlPackages.dtools
-      ocamlPackages.duppy
-      ocamlPackages.mm
-      ocamlPackages.ocaml_pcre
-      ocamlPackages.menhir ocamlPackages.menhirLib
-      ocamlPackages.camomile
-      ocamlPackages.ocurl
-      ocamlPackages.uri
-      ocamlPackages.sedlex
+    # Mandatory dependencies
+    ocamlPackages.dtools
+    ocamlPackages.duppy
+    ocamlPackages.mm
+    ocamlPackages.ocaml_pcre
+    ocamlPackages.menhir ocamlPackages.menhirLib
+    ocamlPackages.camomile
+    ocamlPackages.ocurl
+    ocamlPackages.uri
+    ocamlPackages.sedlex
 
-      # Recommended dependencies
-      ocamlPackages.ffmpeg
+    # Recommended dependencies
+    ocamlPackages.ffmpeg
 
-      # Optional dependencies
-      ocamlPackages.camlimages
-      ocamlPackages.gd4o
-      ocamlPackages.alsa
-      ocamlPackages.ao
-      ocamlPackages.bjack
-      ocamlPackages.cry
-      ocamlPackages.dssi
-      ocamlPackages.faad
-      ocamlPackages.fdkaac
-      ocamlPackages.flac
-      ocamlPackages.frei0r
-      ocamlPackages.gstreamer
-      ocamlPackages.inotify
-      ocamlPackages.ladspa
-      ocamlPackages.lame
-      ocamlPackages.lastfm
-      ocamlPackages.lilv
-      ocamlPackages.lo
-      ocamlPackages.mad
-      ocamlPackages.magic
-      ocamlPackages.ogg
-      ocamlPackages.opus
-      ocamlPackages.portaudio
-      ocamlPackages.pulseaudio
-      ocamlPackages.shine
-      ocamlPackages.samplerate
-      ocamlPackages.soundtouch
-      ocamlPackages.speex
-      ocamlPackages.srt
-      ocamlPackages.ssl
-      ocamlPackages.taglib
-      ocamlPackages.theora
-      ocamlPackages.vorbis
-      ocamlPackages.xmlplaylist
-      ocamlPackages.posix-time2
-      ocamlPackages.tsdl
-      ocamlPackages.tsdl-image
-      ocamlPackages.tsdl-ttf
+    # Optional dependencies
+    ocamlPackages.camlimages
+    ocamlPackages.gd4o
+    ocamlPackages.alsa
+    ocamlPackages.ao
+    ocamlPackages.bjack
+    ocamlPackages.cry
+    ocamlPackages.dssi
+    ocamlPackages.faad
+    ocamlPackages.fdkaac
+    ocamlPackages.flac
+    ocamlPackages.frei0r
+    ocamlPackages.gstreamer
+    ocamlPackages.inotify
+    ocamlPackages.ladspa
+    ocamlPackages.lame
+    ocamlPackages.lastfm
+    ocamlPackages.lilv
+    ocamlPackages.lo
+    ocamlPackages.mad
+    ocamlPackages.magic
+    ocamlPackages.ogg
+    ocamlPackages.opus
+    ocamlPackages.portaudio
+    ocamlPackages.pulseaudio
+    ocamlPackages.shine
+    ocamlPackages.samplerate
+    ocamlPackages.soundtouch
+    ocamlPackages.speex
+    ocamlPackages.srt
+    ocamlPackages.ssl
+    ocamlPackages.taglib
+    ocamlPackages.theora
+    ocamlPackages.vorbis
+    ocamlPackages.xmlplaylist
+    ocamlPackages.posix-time2
+    ocamlPackages.tsdl
+    ocamlPackages.tsdl-image
+    ocamlPackages.tsdl-ttf
 
-      # Undocumented dependencies
-      ocamlPackages.graphics
-      ocamlPackages.cohttp-lwt-unix
-    ];
+    # Undocumented dependencies
+    ocamlPackages.graphics
+    ocamlPackages.cohttp-lwt-unix
+  ];
 
   meta = with lib; {
     description = "Swiss-army knife for multimedia streaming";
diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix
index 0add7340ed5a..2e5ebd1e56a2 100644
--- a/pkgs/tools/misc/bibtex2html/default.nix
+++ b/pkgs/tools/misc/bibtex2html/default.nix
@@ -9,7 +9,9 @@ stdenv.mkDerivation {
     sha256 = "07gzrs4lfrkvbn48cgn2gn6c7cx3jsanakkrb2irj0gmjzfxl96j";
   };
 
-  buildInputs = [ ocaml perl ];
+  strictDeps = true;
+
+  nativeBuildInputs = [ ocaml perl ];
 
   meta = with lib; {
     description = "A collection of tools for translating from BibTeX to HTML";
diff --git a/pkgs/tools/misc/ledit/default.nix b/pkgs/tools/misc/ledit/default.nix
index 18efb8c95285..6070bfb2fafb 100644
--- a/pkgs/tools/misc/ledit/default.nix
+++ b/pkgs/tools/misc/ledit/default.nix
@@ -14,7 +14,9 @@ stdenv.mkDerivation {
     substituteInPlace Makefile --replace /bin/rm rm --replace BINDIR=/usr/local/bin BINDIR=$out/bin
   '';
 
-  buildInputs = [
+  strictDeps = true;
+
+  nativeBuildInputs = [
     ocaml
     camlp5
   ];
diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix
index d1244cc73c47..df8b4933aa69 100644
--- a/pkgs/tools/misc/wyrd/default.nix
+++ b/pkgs/tools/misc/wyrd/default.nix
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
     substituteInPlace curses/curses.ml --replace 'pp gcc' "pp $CC"
   '';
 
-  buildInputs = [ ocamlPackages.ocaml ncurses remind ocamlPackages.camlp4 ];
+  strictDeps = true;
+  nativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.camlp4  ];
+  buildInputs = [ ncurses remind ];
 
   preferLocalBuild = true;
 
diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix
index a0eb1f75a35d..f03ee980583f 100644
--- a/pkgs/tools/typesetting/hevea/default.nix
+++ b/pkgs/tools/typesetting/hevea/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-XWdZ13AqKVx2oSwbKhoWdUqw7B/+1z/J0LE4tB5yBkg=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = with ocamlPackages; [ ocaml ocamlbuild ];
 
   makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/tools/typesetting/pdfsandwich/default.nix
index 755ac6bb32a3..26037b05664d 100644
--- a/pkgs/tools/typesetting/pdfsandwich/default.nix
+++ b/pkgs/tools/typesetting/pdfsandwich/default.nix
@@ -10,8 +10,9 @@ stdenv.mkDerivation {
     sha256 = "1420c33divch087xrr61lvyf975bapqkgjqaighl581i69nlzsm6";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ ocaml perl ];
+  strictDeps = true;
+
+  nativeBuildInputs = [ makeWrapper ocaml perl ];
   installPhase = ''
     mkdir -p $out/bin
     cp -p pdfsandwich $out/bin
diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
index 3931fe9c3da0..7943457d3815 100644
--- a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
+++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix
@@ -25,12 +25,12 @@ ocamlPackages.buildDunePackage rec {
 
   strictDeps = true;
   nativeBuildInputs = [
-    ocamlPackages.ppx_cstruct
     pkg-config
   ];
 
   buildInputs = [ libdrm ] ++ (with ocamlPackages; [
     dune-configurator
+    ppx_cstruct
     wayland
     cmdliner
     logs