colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: add strictDeps = true to most packages depending on ocaml

Browse Source
This commit is contained in:
Ulrik Strid 2022-04-04 13:57:15 +02:00
parent c53a63adf1
commit 376e9ceead
35 changed files with 189 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/llpp/default.nix
View File

@ -19,8 +19,10 @@ stdenv.mkDerivation rec {
src = ./fix-build-bash.patch;
});
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ocaml mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ];
strictDeps = true;
nativeBuildInputs = [ makeWrapper ocaml ];
buildInputs = [ mupdf libX11 libGLU libGL freetype zlib gumbo jbig2dec openjpeg libjpeg lcms2 harfbuzz ];
dontStrip = true;

10
pkgs/applications/networking/p2p/mldonkey/default.nix
View File

@ -27,13 +27,9 @@ stdenv.mkDerivation rec {
'${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4'
'';
buildInputs = (with ocamlPackages; [
ocaml
camlp4
num
]) ++ [
zlib
];
strictDeps = true;
nativeBuildInputs = with ocamlPackages; [ ocaml camlp4];
buildInputs = (with ocamlPackages; [ num ]) ++ [ zlib ];
meta = {
broken = stdenv.isDarwin;

6
pkgs/applications/networking/sync/unison/default.nix
View File

@ -23,9 +23,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-taA8eZ/wOe9uMccXVYfe34/XzWgqYKA3tLZnIOahOrQ=";
};
nativeBuildInputs = [ makeWrapper ]
strictDeps = true;
nativeBuildInputs = [ makeWrapper ocamlPackages.ocaml ]
++ lib.optional enableX11 copyDesktopItems;
buildInputs = [ ocamlPackages.ocaml ncurses ];
buildInputs = [ ncurses ];
preBuild = lib.optionalString enableX11 ''
sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk}"/lib/ocaml/*/site-lib/lablgtk2)|" src/Makefile.OCaml

4
pkgs/applications/science/logic/abella/default.nix
View File

@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-/eOiebMFHgrurtrSHPlgZO3xmmxBOUmyAzswXZLd3Yc=";
};
buildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]);
strictDeps = true;
nativeBuildInputs = [ rsync ] ++ (with ocamlPackages; [ ocaml ocamlbuild findlib ]);
installPhase = ''
mkdir -p $out/bin

4
pkgs/applications/science/logic/cryptoverif/default.nix
View File

@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256-F5eVN5ATYo9Ivpi2eYh96ktuTWUeoqgWMR4BqHu8EFs=";
};
buildInputs = [ ocaml ];
strictDeps = true;
nativeBuildInputs = [ ocaml ];
/* Fix up the frontend to load the 'default' cryptoverif library
** from under $out/libexec. By default, it expects to find the files

6
pkgs/applications/science/logic/ekrhyper/default.nix
View File

@ -9,10 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-fEe0DIMGj7wO+79/BZf45kykgyTXpbZJsyFSt31XqpM=";
};
buildInputs = [
ocaml
perl
];
strictDeps = true;
nativeBuildInputs = [ ocaml perl ];
setSourceRoot = "export sourceRoot=$(echo */ekrh/src/)";
preInstall = "export INSTALLDIR=$out";
postInstall = ''for i in "$out/casc"/*; do ln -s "$i" "$out/bin/ekrh-casc-$(basename $i)"; done '';

4
pkgs/applications/science/logic/hol_light/default.nix
View File

@ -38,7 +38,9 @@ stdenv.mkDerivation {
})
];
buildInputs = [ ocaml camlp5 ];
strictDeps = true;
nativeBuildInputs = [ ocaml camlp5 ];
propagatedBuildInputs = [ num ];
installPhase = ''

5
pkgs/applications/science/logic/iprover/default.nix
View File

@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "0lik8p7ayhjwpkln1iwf0ri84ramhch74j5nj6z7ph6wfi92pgg8";
};
buildInputs = [ ocaml eprover zlib ];
strictDeps = true;
nativeBuildInputs = [ ocaml eprover ];
buildInputs = [ zlib ];
preConfigure = "patchShebangs .";

6
pkgs/applications/science/logic/leo2/default.nix
View File

@ -9,8 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "sha256:1b2q7vsz6s9ighypsigqjm1mzjiq3xgnz5id5ssb4rh9zm190r82";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ eprover ocaml camlp4 perl zlib ];
strictDeps = true;
nativeBuildInputs = [ makeWrapper eprover ocaml camlp4 perl ];
buildInputs = [ zlib ];
patches = [ (fetchpatch {
url = "https://github.com/niklasso/minisat/commit/7eb6015313561a2586032574788fcb133eeaa19f.patch";

7
pkgs/applications/science/logic/ott/default.nix
View File

@ -11,8 +11,11 @@ stdenv.mkDerivation rec {
hash = "sha256-GzeEiok5kigcmfqf/K/UxvlKkl55zy0vOyiRZ2HyMiE=";
};
nativeBuildInputs = [ pkg-config opaline ];
buildInputs = with ocamlPackages; [ ocaml findlib ocamlgraph ];
strictDeps = true;
nativeBuildInputs = [ pkg-config opaline ] ++ (with ocamlPackages; [ findlib ocaml ]);
buildInputs = with ocamlPackages; [ ocamlgraph ];
installTargets = "ott.install";

7
pkgs/applications/science/logic/prooftree/default.nix
View File

@ -9,9 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "0z1z4wqbqwgppkh2bm89fgy07a0y2m6g4lvcyzs09sm1ysklk2dh";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses ] ++ (with ocamlPackages; [
ocaml findlib camlp5 lablgtk ]);
strictDeps = true;
nativeBuildInputs = [ pkg-config ] ++ (with ocamlPackages; [ ocaml findlib camlp5 ]);
buildInputs = [ ncurses ] ++ (with ocamlPackages; [ lablgtk ]);
dontAddPrefix = true;
configureFlags = [ "--prefix" "$(out)" ];

4
pkgs/applications/science/logic/proverif/default.nix
View File

@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
sha256 = "sha256:0xgwnp59779xc40sb7ck8rmfn620pilxyq79l3bymj9m7z0mwvm9";
};
buildInputs = with ocamlPackages; [ ocaml findlib ];
strictDeps = true;
nativeBuildInputs = with ocamlPackages; [ ocaml findlib ];
buildPhase = "./build -nointeract";
installPhase = ''

7
pkgs/applications/science/logic/satallax/default.nix
View File

@ -3,8 +3,11 @@ stdenv.mkDerivation rec {
pname = "satallax";
version = "2.7";
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ ocaml zlib which eprover coq ];
strictDeps = true;
nativeBuildInputs = [ makeWrapper ocaml which eprover coq ];
buildInputs = [ zlib ];
src = fetchurl {
url = "https://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${pname}-${version}.tar.gz";
sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib";

4
pkgs/applications/science/logic/statverif/default.nix
View File

@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
sha256 = "113jjhi1qkcggbsmbw8fa9ln8vs7vy2r288szks7rn0jjn0wxmbw";
};
buildInputs = [ ocaml ];
strictDeps = true;
nativeBuildInputs = [ ocaml ];
patchPhase = "patch -p1 < ${pf-patch}";
buildPhase = "./build";

4
pkgs/applications/science/logic/tlaplus/tlaps.nix
View File

@ -17,7 +17,9 @@ stdenv.mkDerivation rec {
sha256 = "c296998acd14d5b93a8d5be7ee178007ef179957465966576bda26944b1b7fca";
};
buildInputs = [ ocaml isabelle cvc3 perl wget which ];
strictDeps = true;
nativeBuildInputs = [ ocaml isabelle cvc3 perl wget which ];
installPhase = ''
mkdir -pv "$out"

10
pkgs/applications/science/logic/why3/default.nix
View File

@ -10,8 +10,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-vNR7WeiSvg+763GcovoZBFDfncekJMeqNegP4fVw06I=";
};
strictDeps = true;
nativeBuildInputs = with ocamlPackages; [
ocaml findlib menhir
# Coq Support
coqPackages.coq
];
buildInputs = with ocamlPackages; [
ocaml findlib ocamlgraph zarith menhir
ocamlgraph zarith
# Emacs compilation of why3.el
emacs
# Documentation

6
pkgs/applications/science/logic/z3/default.nix
View File

@ -29,8 +29,10 @@ let common = { version, sha256, patches ? [ ] }:
sha256 = sha256;
};
nativeBuildInputs = optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
buildInputs = [ python ]
strictDeps = true;
nativeBuildInputs = [ python ]
++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames
++ optional javaBindings jdk
++ optionals ocamlBindings [ ocaml findlib ]
;

4
pkgs/applications/version-management/monotone-viz/default.nix
View File

@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
version = "1.0.2";
pname = "monotone-viz";
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 camlp4];
nativeBuildInputs = [ pkg-config makeWrapper ocaml camlp4 ];
buildInputs = [ lablgtk libgnomecanvas glib graphviz_2_0 ];
src = fetchurl {
url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz";
sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk";

6
pkgs/applications/virtualization/virt-top/default.nix
View File

@ -16,14 +16,14 @@ stdenv.mkDerivation rec {
autoreconfHook
pkg-config
getopt
ocamlPackages.ocaml
ocamlPackages.findlib
];
buildInputs = with ocamlPackages; [
ocamlPackages.ocaml
calendar
curses
findlib
gettext-stub
ocaml
ocaml_libvirt
] ++ [ libxml2 ];

5
pkgs/development/compilers/mezzo/default.nix
View File

@ -22,7 +22,10 @@ stdenv.mkDerivation {
sha256 = "0yck5r6di0935s3iy2mm9538jkf77ssr789qb06ms7sivd7g3ip6";
};
buildInputs = [ ocaml findlib ocamlbuild yojson menhir menhirLib ulex pprint fix functory ];
strictDeps = true;
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ yojson menhir menhirLib ulex pprint fix functory ];
# Sets warning 3 as non-fatal
prePatch = lib.optionalString (check-ocaml-version "4.02") ''

5
pkgs/development/compilers/obliv-c/default.nix
View File

@ -1,8 +1,11 @@
{ lib, stdenv, libgcrypt, fetchFromGitHub, ocamlPackages, perl }:
stdenv.mkDerivation rec {
pname = "obliv-c";
version = "0.0pre20210621";
buildInputs = [ perl ]
strictDeps = true;
nativeBuildInputs = [ perl ]
++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]);
propagatedBuildInputs = [ libgcrypt ];
src = fetchFromGitHub {

11
pkgs/development/compilers/reason/default.nix
View File

@ -12,19 +12,20 @@ stdenv.mkDerivation rec {
sha256 = "sha256-etzEXbILje+CrfJxIhH7jthEMoSJdS6O33QoG8HrLvI=";
};
strictDeps = true;
nativeBuildInputs = [
makeWrapper
menhir
];
buildInputs = [
ocaml
menhir
cppo
dune_3
findlib
];
buildInputs = [
fix
menhir
menhirSdk
ocaml
ppxlib
utop
] ++ lib.optional (lib.versionOlder ocaml.version "4.07") ncurses;

6
pkgs/development/coq-modules/compcert/default.nix
View File

@ -27,8 +27,10 @@ let compcert = mkCoqDerivation rec {
"3.11".sha256 = "sha256-ZISs/ZAJVWtxp9+Sg5qV5Rss1gI9hK769GnBfawLa6A=";
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = with ocamlPackages; [ ocaml findlib menhir menhirLib ] ++ [ coq coq2html ];
strictDeps = true;
nativeBuildInputs = with ocamlPackages; [ makeWrapper ocaml findlib menhir coq coq2html ];
buildInputs = with ocamlPackages; [ menhirLib ];
propagatedBuildInputs = [ flocq ];
enableParallelBuilding = true;

8
pkgs/development/interpreters/eff/default.nix
View File

@ -15,10 +15,14 @@ stdenv.mkDerivation rec {
substituteInPlace setup.ml --replace js_of_ocaml.ocamlbuild js_of_ocaml-ocamlbuild
'';
buildInputs = [ which ] ++ (with ocamlPackages; [
ocaml findlib ocamlbuild menhir js_of_ocaml js_of_ocaml-ocamlbuild
strictDeps = true;
nativeBuildInputs = [ which ] ++ (with ocamlPackages; [
ocaml findlib ocamlbuild menhir
]);
buildInputs = with ocamlPackages; [ js_of_ocaml js_of_ocaml-ocamlbuild ];
doCheck = true;
checkTarget = "test";

2
pkgs/development/ocaml-modules/ocaml-gettext/stub.nix
View File

@ -12,7 +12,7 @@ buildDunePackage rec {
doCheck = true;
nativeCheckInputs = [ ounit ];
checkInputs = [ ounit ];
meta = builtins.removeAttrs ocaml_gettext.meta [ "mainProgram" ];
}

4
pkgs/development/ocaml-modules/ppx_import/default.nix
View File

@ -25,8 +25,6 @@ buildDunePackage rec {
pname = "ppx_import";
inherit version;
useDune2 = true;
minimalOCamlVersion = "4.05";
src = fetchurl {
@ -38,7 +36,7 @@ buildDunePackage rec {
ppxlib
];
nativeCheckInputs = [
checkInputs = [
ounit
ppx_deriving
ppx_sexp_conv

5
pkgs/development/tools/analysis/flow/default.nix
View File

@ -18,7 +18,10 @@ stdenv.mkDerivation rec {
install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow
'';
buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2 dtoa fileutils core_kernel sedlex ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec visitors wtf8 ])
strictDeps = true;
nativeBuildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild ];
buildInputs = with ocamlPackages; [ ocaml-migrate-parsetree-2 dtoa fileutils core_kernel sedlex ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec visitors wtf8 ]
++ lib.optionals stdenv.isDarwin [ CoreServices ];
meta = with lib; {

7
pkgs/development/tools/analysis/frama-c/default.nix
View File

@ -44,13 +44,14 @@ stdenv.mkDerivation rec {
};
preConfigure = lib.optionalString stdenv.cc.isClang "configureFlagsArray=(\"--with-cpp=clang -E -C\")";
postConfigure = "patchShebangs src/plugins/value/gen-api.sh";
nativeBuildInputs = [ autoconf wrapGAppsHook ];
strictDeps = true;
nativeBuildInputs = [ autoconf wrapGAppsHook ] ++ (with ocamlPackages; [ ocaml findlib ]);
buildInputs = with ocamlPackages; [
ncurses ocaml findlib ltl2ba ocamlgraph yojson menhirLib camlzip
ncurses ltl2ba ocamlgraph yojson menhirLib camlzip
lablgtk3 lablgtk3-sourceview3 coq graphviz zarith apron why3 mlgmpidl doxygen
ppx_deriving ppx_import
gdk-pixbuf

5
pkgs/development/tools/java/sawjap/default.nix
View File

@ -10,7 +10,10 @@ stdenv.mkDerivation {
prePatch = "cd test";
buildInputs = [ ocaml findlib sawja ];
strictDeps = true;
nativeBuildInputs = [ ocaml findlib ];
buildInputs = [ sawja ];
buildPhase = ''
runHook preBuild

127
pkgs/tools/audio/liquidsoap/full.nix
View File

@ -23,71 +23,76 @@ stdenv.mkDerivation {
--prefix PATH : ${lib.makeBinPath runtimePackages}
'';
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = [
libjpeg
which
ocamlPackages.ocaml ocamlPackages.findlib
# Mandatory dependencies
ocamlPackages.dtools
ocamlPackages.duppy
ocamlPackages.mm
ocamlPackages.ocaml_pcre
ocamlPackages.menhir ocamlPackages.menhirLib
ocamlPackages.camomile
ocamlPackages.ocurl
ocamlPackages.uri
ocamlPackages.sedlex
strictDeps = true;
# 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
# Undocumented dependencies
ocamlPackages.graphics
ocamlPackages.cohttp-lwt-unix
nativeBuildInputs =
[ makeWrapper pkg-config which
ocamlPackages.ocaml ocamlPackages.findlib ocamlPackages.menhir
];
buildInputs = [
libjpeg
# 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
# 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
];
meta = with lib; {
description = "Swiss-army knife for multimedia streaming";
homepage = "https://www.liquidsoap.info/";

4
pkgs/tools/misc/bibtex2html/default.nix
View File

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

4
pkgs/tools/misc/ledit/default.nix
View File

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

4
pkgs/tools/misc/wyrd/default.nix
View File

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

2
pkgs/tools/typesetting/hevea/default.nix
View File

@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-XWdZ13AqKVx2oSwbKhoWdUqw7B/+1z/J0LE4tB5yBkg=";
};
strictDeps = true;
nativeBuildInputs = with ocamlPackages; [ ocaml ocamlbuild ];
makeFlags = [ "PREFIX=$(out)" ];

5
pkgs/tools/typesetting/pdfsandwich/default.nix
View File

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