diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3e54fa8d76d..3ef3780f9e7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3591,8 +3591,7 @@ with pkgs; lesspipe = callPackage ../tools/misc/lesspipe { }; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { - ffmpeg = ffmpeg_2; - ocamlPackages = ocaml-ng.ocamlPackages_4_02; + ffmpeg = ffmpeg-full; }; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; @@ -21277,10 +21276,7 @@ with pkgs; libpoly = callPackage ../applications/science/logic/poly {}; - prooftree = (with ocaml-ng.ocamlPackages_4_01_0; - callPackage ../applications/science/logic/prooftree { - camlp5 = camlp5_transitional; - }); + prooftree = ocamlPackages.callPackage ../applications/science/logic/prooftree { }; prover9 = callPackage ../applications/science/logic/prover9 { }; |