diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 73 |
1 files changed, 51 insertions, 22 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c36817b8f2d..87239aaeba8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -751,11 +751,6 @@ with pkgs; inherit (darwin) DarwinTools; }; - rtthost = callPackage ../development/tools/rust/rtthost { - inherit (darwin.apple_sdk.frameworks) AppKit; - inherit (darwin) DarwinTools; - }; - mix2nix = callPackage ../development/tools/mix2nix { elixir = elixir_1_14; }; @@ -1889,7 +1884,9 @@ with pkgs; grizzly = callPackage ../tools/misc/grizzly { }; - guestfs-tools = callPackage ../tools/virtualization/guestfs-tools { }; + guestfs-tools = callPackage ../tools/virtualization/guestfs-tools { + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; fabs = callPackage ../tools/backup/fabs { }; @@ -2093,7 +2090,9 @@ with pkgs; supercronic = callPackage ../tools/system/supercronic { }; - supermin = callPackage ../tools/virtualization/supermin { }; + supermin = callPackage ../tools/virtualization/supermin { + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; sx-go = callPackage ../tools/security/sx-go { }; @@ -5397,7 +5396,9 @@ with pkgs; ### TOOLS/TYPESETTING/TEX - advi = callPackage ../tools/typesetting/tex/advi { }; + advi = callPackage ../tools/typesetting/tex/advi { + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; auctex = callPackage ../tools/typesetting/tex/auctex { }; @@ -9975,6 +9976,7 @@ with pkgs; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { ffmpeg = ffmpeg-full; + ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; linuxwave = callPackage ../tools/audio/linuxwave { }; @@ -15690,7 +15692,9 @@ with pkgs; coffeescript = callPackage ../development/compilers/coffeescript { }; - comby = callPackage ../development/tools/comby { }; + comby = callPackage ../development/tools/comby { + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; inherit (coqPackages_8_17) compcert; @@ -16334,6 +16338,7 @@ with pkgs; fsharp = callPackage ../development/compilers/fsharp { }; fstar = callPackage ../development/compilers/fstar { + ocamlPackages = ocaml-ng.ocamlPackages_4_14; z3 = z3_4_8_5; }; @@ -16400,7 +16405,9 @@ with pkgs; inherit (emacs.pkgs.melpaStablePackages) irony; }; - heptagon = callPackage ../development/compilers/heptagon { }; + heptagon = callPackage ../development/compilers/heptagon { + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; holo-build = callPackage ../tools/package-management/holo-build { }; @@ -16889,7 +16896,9 @@ with pkgs; rgbds = callPackage ../development/compilers/rgbds { }; - rml = callPackage ../development/compilers/rml { }; + rml = callPackage ../development/compilers/rml { + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; rgxg = callPackage ../tools/text/rgxg { }; @@ -17299,7 +17308,7 @@ with pkgs; }; teyjus = callPackage ../development/compilers/teyjus { - inherit (ocamlPackages) buildDunePackage; + inherit (ocaml-ng.ocamlPackages_4_14) buildDunePackage; }; thrust = callPackage ../development/tools/thrust { @@ -18024,7 +18033,9 @@ with pkgs; sparkleshare = callPackage ../applications/version-management/sparkleshare { }; - spark2014 = callPackage ../development/libraries/ada/spark2014 { }; + spark2014 = callPackage ../development/libraries/ada/spark2014 { + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { inherit (darwin) libobjc; @@ -18879,7 +18890,9 @@ with pkgs; # Does not actually depend on Qt 5 inherit (plasma5Packages) extra-cmake-modules; - coccinelle = callPackage ../development/tools/misc/coccinelle { }; + coccinelle = callPackage ../development/tools/misc/coccinelle { + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; cpptest = callPackage ../development/libraries/cpptest { }; @@ -19147,6 +19160,7 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; + ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; fly = callPackage ../development/tools/continuous-integration/fly { }; @@ -22438,7 +22452,7 @@ with pkgs; libbacktrace = callPackage ../development/libraries/libbacktrace { }; libbap = callPackage ../development/libraries/libbap { - inherit (ocaml-ng.ocamlPackages) bap ocaml findlib ctypes; + inherit (ocaml-ng.ocamlPackages_4_14) bap ocaml findlib ctypes; }; libbaseencode = callPackage ../development/libraries/libbaseencode { }; @@ -22910,6 +22924,7 @@ with pkgs; libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix { }; libguestfs = callPackage ../development/libraries/libguestfs { autoreconfHook = buildPackages.autoreconfHook264; + ocamlPackages = ocaml-ng.ocamlPackages_4_14; }; libguestfs-with-appliance = libguestfs.override { appliance = libguestfs-appliance; @@ -32452,7 +32467,9 @@ with pkgs; electron = electron_19; }; - jackline = callPackage ../applications/networking/instant-messengers/jackline { }; + jackline = callPackage ../applications/networking/instant-messengers/jackline { + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; jay = callPackage ../applications/window-managers/jay { }; @@ -34468,7 +34485,9 @@ with pkgs; opusTools = callPackage ../applications/audio/opus-tools { }; - orpie = callPackage ../applications/misc/orpie { }; + orpie = callPackage ../applications/misc/orpie { + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; osmo = callPackage ../applications/office/osmo { }; @@ -36136,7 +36155,9 @@ with pkgs; virt-viewer = callPackage ../applications/virtualization/virt-viewer { }; - virt-top = callPackage ../applications/virtualization/virt-top { }; + virt-top = callPackage ../applications/virtualization/virt-top { + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; virt-what = callPackage ../applications/virtualization/virt-what { }; @@ -39449,7 +39470,9 @@ with pkgs; crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { }; - cubicle = callPackage ../applications/science/logic/cubicle { }; + cubicle = callPackage ../applications/science/logic/cubicle { + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; cvc3 = callPackage ../applications/science/logic/cvc3 { gmp = lib.overrideDerivation gmp (_: { dontDisableStatic = true; }); @@ -39577,7 +39600,9 @@ with pkgs; proverif = callPackage ../applications/science/logic/proverif { }; - satallax = callPackage ../applications/science/logic/satallax { }; + satallax = callPackage ../applications/science/logic/satallax { + inherit (ocaml-ng.ocamlPackages_4_14) ocaml; + }; saw-tools = callPackage ../applications/science/logic/saw-tools { }; @@ -39927,7 +39952,9 @@ with pkgs; perl = perl536; }; - megam = callPackage ../applications/science/misc/megam { }; + megam = callPackage ../applications/science/misc/megam { + inherit (ocaml-ng.ocamlPackages_4_14) ocaml; + }; netlogo = callPackage ../applications/science/misc/netlogo { }; @@ -41029,7 +41056,9 @@ with pkgs; sanoid = callPackage ../tools/backup/sanoid { }; - satysfi = callPackage ../tools/typesetting/satysfi { }; + satysfi = callPackage ../tools/typesetting/satysfi { + ocamlPackages = ocaml-ng.ocamlPackages_4_14; + }; sc-controller = python3Packages.callPackage ../misc/drivers/sc-controller { inherit libusb1; # Shadow python.pkgs.libusb1. |