From 045cf7df320db3aa447b7de37454800087d285e6 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 19 Mar 2023 20:36:01 -0300 Subject: [PATCH] ocaml: re-establish alphabetical order to top-level --- pkgs/top-level/ocaml-packages.nix | 748 ++++++++++++++++-------------- 1 file changed, 403 insertions(+), 345 deletions(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 28e3db6d64c99..617281df58a9d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -8,11 +8,7 @@ let { inherit ocaml; - # Libs - - buildOasisPackage = callPackage ../build-support/ocaml/oasis.nix { }; - - buildDunePackage = callPackage ../build-support/ocaml/dune.nix {}; + ### A ### afl-persistent = callPackage ../development/ocaml-modules/afl-persistent { }; @@ -58,28 +54,36 @@ let awa-mirage = callPackage ../development/ocaml-modules/awa/mirage.nix { }; - base64 = callPackage ../development/ocaml-modules/base64 { }; + ### B ### bap = callPackage ../development/ocaml-modules/bap { inherit (pkgs.llvmPackages) llvm; }; + base64 = callPackage ../development/ocaml-modules/base64 { }; + batteries = callPackage ../development/ocaml-modules/batteries { }; + benchmark = callPackage ../development/ocaml-modules/benchmark { }; + bheap = callPackage ../development/ocaml-modules/bheap { }; bigarray-compat = callPackage ../development/ocaml-modules/bigarray-compat { }; bigarray-overlap = callPackage ../development/ocaml-modules/bigarray-overlap { }; - bigstringaf = callPackage ../development/ocaml-modules/bigstringaf { }; - bigstring = callPackage ../development/ocaml-modules/bigstring { }; + bigstringaf = callPackage ../development/ocaml-modules/bigstringaf { }; + bindlib = callPackage ../development/ocaml-modules/bindlib { }; + biniou = callPackage ../development/ocaml-modules/biniou { }; + biocaml = callPackage ../development/ocaml-modules/biocaml { }; + bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { }; + bistro = callPackage ../development/ocaml-modules/bistro { }; bitstring = callPackage ../development/ocaml-modules/bitstring { }; @@ -106,20 +110,24 @@ let bz2 = callPackage ../development/ocaml-modules/bz2 { }; + ### C ### + ca-certs = callPackage ../development/ocaml-modules/ca-certs { }; ca-certs-nss = callPackage ../development/ocaml-modules/ca-certs-nss { }; - carton = callPackage ../development/ocaml-modules/carton { }; + cairo2 = callPackage ../development/ocaml-modules/cairo2 { + inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; + }; - carton-git = callPackage ../development/ocaml-modules/carton/git.nix { }; + calendar = callPackage ../development/ocaml-modules/calendar { }; - carton-lwt = callPackage ../development/ocaml-modules/carton/lwt.nix { - git-binary = pkgs.git; - }; + callipyge = callPackage ../development/ocaml-modules/callipyge { }; camlidl = callPackage ../development/tools/ocaml/camlidl { }; + camlimages = callPackage ../development/ocaml-modules/camlimages { }; + camlp-streams = callPackage ../development/ocaml-modules/camlp-streams { }; camlp4 = @@ -134,33 +142,13 @@ let camlpdf = callPackage ../development/ocaml-modules/camlpdf { }; - calendar = callPackage ../development/ocaml-modules/calendar { }; - camlzip = callPackage ../development/ocaml-modules/camlzip { }; - camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; camomile = if lib.versionOlder "4.02" ocaml.version then callPackage ../development/ocaml-modules/camomile { } else callPackage ../development/ocaml-modules/camomile/0.8.5.nix { }; - - camlimages = callPackage ../development/ocaml-modules/camlimages { }; - - class_group_vdf = callPackage ../development/ocaml-modules/class_group_vdf { }; - - benchmark = callPackage ../development/ocaml-modules/benchmark { }; - - biniou = callPackage ../development/ocaml-modules/biniou { }; - - bisect_ppx = callPackage ../development/ocaml-modules/bisect_ppx { }; - - ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; - - cairo2 = callPackage ../development/ocaml-modules/cairo2 { - inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; - }; - - callipyge = callPackage ../development/ocaml-modules/callipyge { }; + camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; caqti = callPackage ../development/ocaml-modules/caqti { }; @@ -178,6 +166,14 @@ let caqti-type-calendar = callPackage ../development/ocaml-modules/caqti/type-calendar.nix { }; + carton = callPackage ../development/ocaml-modules/carton { }; + + carton-git = callPackage ../development/ocaml-modules/carton/git.nix { }; + + carton-lwt = callPackage ../development/ocaml-modules/carton/lwt.nix { + git-binary = pkgs.git; + }; + cfstream = callPackage ../development/ocaml-modules/cfstream { }; chacha = callPackage ../development/ocaml-modules/chacha { }; @@ -190,9 +186,7 @@ let cil = callPackage ../development/ocaml-modules/cil { }; - cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1_0.nix { }; - - cmdliner_1_1 = callPackage ../development/ocaml-modules/cmdliner/1_1.nix { }; + class_group_vdf = callPackage ../development/ocaml-modules/class_group_vdf { }; # The 1.1.0 release broke a lot of packages and is not compatible with # OCaml < 4.08. @@ -201,6 +195,10 @@ let then cmdliner_1_1 else cmdliner_1_0; + cmdliner_1_0 = callPackage ../development/ocaml-modules/cmdliner/1_0.nix { }; + + cmdliner_1_1 = callPackage ../development/ocaml-modules/cmdliner/1_1.nix { }; + cohttp = callPackage ../development/ocaml-modules/cohttp { }; cohttp-async = callPackage ../development/ocaml-modules/cohttp/async.nix { }; @@ -211,6 +209,8 @@ let cohttp-mirage = callPackage ../development/ocaml-modules/cohttp/mirage.nix { }; + coin = callPackage ../development/ocaml-modules/coin { }; + color = callPackage ../development/ocaml-modules/color { }; conduit = callPackage ../development/ocaml-modules/conduit { }; @@ -223,8 +223,6 @@ let conduit-mirage = callPackage ../development/ocaml-modules/conduit/mirage.nix { }; - coin = callPackage ../development/ocaml-modules/coin { }; - config-file = callPackage ../development/ocaml-modules/config-file { }; containers = callPackage ../development/ocaml-modules/containers { }; @@ -272,6 +270,12 @@ let csv-lwt = callPackage ../development/ocaml-modules/csv/lwt.nix { }; + ctypes = callPackage ../development/ocaml-modules/ctypes { }; + + ctypes_stubs_js = callPackage ../development/ocaml-modules/ctypes_stubs_js { + inherit (pkgs) nodejs; + }; + cudf = callPackage ../development/ocaml-modules/cudf { }; curly = callPackage ../development/ocaml-modules/curly { @@ -280,11 +284,7 @@ let curses = callPackage ../development/ocaml-modules/curses { }; - ctypes = callPackage ../development/ocaml-modules/ctypes { }; - - ctypes_stubs_js = callPackage ../development/ocaml-modules/ctypes_stubs_js { - inherit (pkgs) nodejs; - }; + ### D ### dap = callPackage ../development/ocaml-modules/dap { }; @@ -338,6 +338,8 @@ let dose3 = callPackage ../development/ocaml-modules/dose3 { }; + dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { }; + dscheck = callPackage ../development/ocaml-modules/dscheck { }; dssi = callPackage ../development/ocaml-modules/dssi { }; @@ -390,6 +392,10 @@ let dyn = callPackage ../development/ocaml-modules/dyn { }; + dypgen = callPackage ../development/ocaml-modules/dypgen { }; + + ### E ### + earley = callPackage ../development/ocaml-modules/earley { }; earlybird = callPackage ../development/ocaml-modules/earlybird { }; @@ -414,10 +420,10 @@ let } ); - encore = callPackage ../development/ocaml-modules/encore { }; - emile = callPackage ../development/ocaml-modules/emile { }; + encore = callPackage ../development/ocaml-modules/encore { }; + eqaf = callPackage ../development/ocaml-modules/eqaf { }; erm_xml = callPackage ../development/ocaml-modules/erm_xml { }; @@ -436,6 +442,8 @@ let ezxmlm = callPackage ../development/ocaml-modules/ezxmlm { }; + ### F ### + faad = callPackage ../development/ocaml-modules/faad { }; facile = callPackage ../development/ocaml-modules/facile { }; @@ -457,7 +465,7 @@ let ff-sig = callPackage ../development/ocaml-modules/ff/sig.nix { }; ffmpeg = callPackage ../development/ocaml-modules/ffmpeg { }; - ffmpeg-avutil = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix { + ffmpeg-av = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-av.nix { inherit (pkgs) ffmpeg; inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; }; @@ -465,25 +473,25 @@ let inherit (pkgs) ffmpeg; inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; }; + ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix { + inherit (pkgs) ffmpeg; + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit AudioToolbox AVFoundation Cocoa CoreImage ForceFeedback OpenGL VideoToolbox; + }; ffmpeg-avfilter = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avfilter.nix { inherit (pkgs) ffmpeg; inherit (pkgs.darwin.apple_sdk.frameworks) AppKit CoreImage OpenGL VideoToolbox; }; - ffmpeg-swscale = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix { + ffmpeg-avutil = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avutil.nix { inherit (pkgs) ffmpeg; - inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox; + inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; }; ffmpeg-swresample = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swresample.nix { inherit (pkgs) ffmpeg; inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox; }; - ffmpeg-av = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-av.nix { - inherit (pkgs) ffmpeg; - inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox VideoToolbox; - }; - ffmpeg-avdevice = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-avdevice.nix { + ffmpeg-swscale = callPackage ../development/ocaml-modules/ffmpeg/ffmpeg-swscale.nix { inherit (pkgs) ffmpeg; - inherit (pkgs.darwin.apple_sdk.frameworks) AppKit AudioToolbox AVFoundation Cocoa CoreImage ForceFeedback OpenGL VideoToolbox; + inherit (pkgs.darwin.apple_sdk.frameworks) VideoToolbox; }; fiber = callPackage ../development/ocaml-modules/fiber { }; @@ -512,20 +520,46 @@ let inherit (pkgs) frei0r; }; + frontc = callPackage ../development/ocaml-modules/frontc { }; + functoria = callPackage ../development/ocaml-modules/functoria { }; functoria-runtime = callPackage ../development/ocaml-modules/functoria/runtime.nix { }; functory = callPackage ../development/ocaml-modules/functory { }; + ### G ### + + gapi-ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { }; + gd4o = callPackage ../development/ocaml-modules/gd4o { }; gen = callPackage ../development/ocaml-modules/gen { }; + gen_js_api = callPackage ../development/ocaml-modules/gen_js_api { }; + genspio = callPackage ../development/ocaml-modules/genspio { }; getopt = callPackage ../development/ocaml-modules/getopt { }; + gettext-camomile = callPackage ../development/ocaml-modules/ocaml-gettext/camomile.nix { }; + + gettext-stub = callPackage ../development/ocaml-modules/ocaml-gettext/stub.nix { }; + + gg = callPackage ../development/ocaml-modules/gg { }; + + git = callPackage ../development/ocaml-modules/git { + git-binary = pkgs.git; + }; + + git-mirage = callPackage ../development/ocaml-modules/git/mirage.nix { }; + + git-paf = callPackage ../development/ocaml-modules/git/paf.nix { }; + + git-unix = callPackage ../development/ocaml-modules/git/unix.nix { + git-binary = pkgs.git; + }; + gluten = callPackage ../development/ocaml-modules/gluten { }; gluten-lwt = callPackage ../development/ocaml-modules/gluten/lwt.nix { }; gluten-lwt-unix = callPackage ../development/ocaml-modules/gluten/lwt-unix.nix { }; @@ -536,6 +570,21 @@ let inherit (pkgs) gnuplot; }; + graphics = + if lib.versionOlder "4.09" ocaml.version + then callPackage ../development/ocaml-modules/graphics { } + else null; + + graphql = callPackage ../development/ocaml-modules/graphql { }; + + graphql-cohttp = callPackage ../development/ocaml-modules/graphql/cohttp.nix { }; + + graphql-lwt = callPackage ../development/ocaml-modules/graphql/lwt.nix { }; + + graphql_parser = callPackage ../development/ocaml-modules/graphql/parser.nix { }; + + graphql_ppx = callPackage ../development/ocaml-modules/graphql_ppx { }; + gsl = callPackage ../development/ocaml-modules/gsl { inherit (pkgs) gsl; }; @@ -544,6 +593,8 @@ let inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Foundation; }; + ### H ### + h2 = callPackage ../development/ocaml-modules/h2 { }; hack_parallel = callPackage ../development/ocaml-modules/hack_parallel { }; @@ -559,6 +610,8 @@ let hashcons = callPackage ../development/ocaml-modules/hashcons { }; + hex = callPackage ../development/ocaml-modules/hex { }; + hidapi = callPackage ../development/ocaml-modules/hidapi { }; higlo = callPackage ../development/ocaml-modules/higlo { }; @@ -571,10 +624,20 @@ let http-mirage-client = callPackage ../development/ocaml-modules/http-mirage-client { }; + httpaf = callPackage ../development/ocaml-modules/httpaf { }; + + httpaf-lwt-unix = callPackage ../development/ocaml-modules/httpaf/lwt-unix.nix { }; + hxd = callPackage ../development/ocaml-modules/hxd { }; + ### I ### + imagelib = callPackage ../development/ocaml-modules/imagelib { }; + index = callPackage ../development/ocaml-modules/index { }; + + inifiles = callPackage ../development/ocaml-modules/inifiles { }; + inotify = callPackage ../development/ocaml-modules/inotify { }; integers = callPackage ../development/ocaml-modules/integers { }; @@ -589,57 +652,6 @@ let ipaddr-sexp = callPackage ../development/ocaml-modules/ipaddr/sexp.nix { }; - iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; - - iter = callPackage ../development/ocaml-modules/iter { }; - - javalib = callPackage ../development/ocaml-modules/javalib { }; - - dypgen = callPackage ../development/ocaml-modules/dypgen { }; - - gapi-ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { }; - - gen_js_api = callPackage ../development/ocaml-modules/gen_js_api { }; - - gg = callPackage ../development/ocaml-modules/gg { }; - - git = callPackage ../development/ocaml-modules/git { - git-binary = pkgs.git; - }; - - git-mirage = callPackage ../development/ocaml-modules/git/mirage.nix { }; - - git-paf = callPackage ../development/ocaml-modules/git/paf.nix { }; - - git-unix = callPackage ../development/ocaml-modules/git/unix.nix { - git-binary = pkgs.git; - }; - - graphics = - if lib.versionOlder "4.09" ocaml.version - then callPackage ../development/ocaml-modules/graphics { } - else null; - - graphql = callPackage ../development/ocaml-modules/graphql { }; - - graphql-cohttp = callPackage ../development/ocaml-modules/graphql/cohttp.nix { }; - - graphql-lwt = callPackage ../development/ocaml-modules/graphql/lwt.nix { }; - - graphql_parser = callPackage ../development/ocaml-modules/graphql/parser.nix { }; - - graphql_ppx = callPackage ../development/ocaml-modules/graphql_ppx { }; - - hex = callPackage ../development/ocaml-modules/hex { }; - - httpaf = callPackage ../development/ocaml-modules/httpaf { }; - - httpaf-lwt-unix = callPackage ../development/ocaml-modules/httpaf/lwt-unix.nix { }; - - index = callPackage ../development/ocaml-modules/index { }; - - inifiles = callPackage ../development/ocaml-modules/inifiles { }; - iri = callPackage ../development/ocaml-modules/iri { }; irmin = callPackage ../development/ocaml-modules/irmin { }; @@ -670,6 +682,59 @@ let irmin-watcher = callPackage ../development/ocaml-modules/irmin-watcher { }; + iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; + + iter = callPackage ../development/ocaml-modules/iter { }; + + ### J ### + + # Jane Street + janePackage = + if lib.versionOlder "4.10.2" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/janePackage_0_15.nix {} + else if lib.versionOlder "4.08" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/janePackage_0_14.nix {} + else if lib.versionOlder "4.07" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/janePackage_0_12.nix {} + else callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; + + janeStreet = + if lib.versionOlder "4.10.2" ocaml.version + then import ../development/ocaml-modules/janestreet/0.15.nix { + inherit self; + inherit (pkgs) bash fetchpatch fzf lib openssl zstd; + } + else if lib.versionOlder "4.08" ocaml.version + then import ../development/ocaml-modules/janestreet/0.14.nix { + inherit self; + inherit (pkgs) fetchpatch lib openssl zstd; + } + else if lib.versionOlder "4.07" ocaml.version + then import ../development/ocaml-modules/janestreet/0.12.nix { + self = self // { + ppxlib = ppxlib.override { version = "0.8.1"; }; + }; + inherit (pkgs) openssl; + } + else import ../development/ocaml-modules/janestreet { + self = self // { + ppxlib = ppxlib.override { version = "0.8.1"; }; + }; + inherit (pkgs) openssl; + }; + + janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { + self = self.janeStreet_0_9_0; + super = self // { + janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix { + defaultVersion = "0.9.0"; + }; + }; + inherit (pkgs) stdenv lib openssl; + }; + + javalib = callPackage ../development/ocaml-modules/javalib { }; + jingoo = callPackage ../development/ocaml-modules/jingoo { }; js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { }; @@ -688,18 +753,22 @@ let js_of_ocaml-tyxml = callPackage ../development/tools/ocaml/js_of_ocaml/tyxml.nix {}; - jsonm = callPackage ../development/ocaml-modules/jsonm { }; - json-data-encoding = callPackage ../development/ocaml-modules/json-data-encoding { }; json-data-encoding-bson = callPackage ../development/ocaml-modules/json-data-encoding/bson.nix { }; - junit = callPackage ../development/ocaml-modules/junit { }; - junit_ounit = callPackage ../development/ocaml-modules/junit/ounit.nix { }; + jsonm = callPackage ../development/ocaml-modules/jsonm { }; + + jsonrpc = callPackage ../development/ocaml-modules/ocaml-lsp/jsonrpc.nix { }; + + junit = callPackage ../development/ocaml-modules/junit { }; junit_alcotest = callPackage ../development/ocaml-modules/junit/alcotest.nix { }; + junit_ounit = callPackage ../development/ocaml-modules/junit/ounit.nix { }; jwto = callPackage ../development/ocaml-modules/jwto { }; + ### K ### + kafka = callPackage ../development/ocaml-modules/kafka { }; kafka_lwt = callPackage ../development/ocaml-modules/kafka/lwt.nix { }; @@ -708,13 +777,9 @@ let kicadsch = callPackage ../development/ocaml-modules/kicadsch { }; - lablgl = callPackage ../development/ocaml-modules/lablgl { }; - - lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { }; + ### L ### - lablgtk3-gtkspell3 = callPackage ../development/ocaml-modules/lablgtk3/gtkspell3.nix { }; - - lablgtk3-sourceview3 = callPackage ../development/ocaml-modules/lablgtk3/sourceview3.nix { }; + lablgl = callPackage ../development/ocaml-modules/lablgl { }; lablgtk = callPackage ../development/ocaml-modules/lablgtk { inherit (pkgs.gnome2) libgnomecanvas gtksourceview; @@ -725,6 +790,12 @@ let then callPackage ../development/ocaml-modules/lablgtk-extras { } else callPackage ../development/ocaml-modules/lablgtk-extras/1.4.nix { }; + lablgtk3 = callPackage ../development/ocaml-modules/lablgtk3 { }; + + lablgtk3-gtkspell3 = callPackage ../development/ocaml-modules/lablgtk3/gtkspell3.nix { }; + + lablgtk3-sourceview3 = callPackage ../development/ocaml-modules/lablgtk3/sourceview3.nix { }; + labltk = callPackage ../development/ocaml-modules/labltk { inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }; @@ -733,12 +804,12 @@ let ladspa = callPackage ../development/ocaml-modules/ladspa { }; + lambda-term = callPackage ../development/ocaml-modules/lambda-term { }; + lambdapi = callPackage ../development/ocaml-modules/lambdapi { }; lambdasoup = callPackage ../development/ocaml-modules/lambdasoup { }; - lambda-term = callPackage ../development/ocaml-modules/lambda-term { }; - lame = callPackage ../development/ocaml-modules/lame { inherit (pkgs) lame; }; @@ -777,6 +848,8 @@ let lru = callPackage ../development/ocaml-modules/lru { }; + lsp = callPackage ../development/ocaml-modules/ocaml-lsp/lsp.nix { }; + lua-ml = callPackage ../development/ocaml-modules/lua-ml { }; lustre-v6 = callPackage ../development/ocaml-modules/lustre-v6 { }; @@ -793,16 +866,12 @@ let lwt-canceler = callPackage ../development/ocaml-modules/lwt-canceler { }; - ocaml_lwt = lwt; - lwt_camlp4 = callPackage ../development/ocaml-modules/lwt/camlp4.nix { }; lwt-dllist = callPackage ../development/ocaml-modules/lwt-dllist { }; lwt-exit = callPackage ../development/ocaml-modules/lwt-exit { }; - lwt-watcher = callPackage ../development/ocaml-modules/lwt-watcher { }; - lwt_log = callPackage ../development/ocaml-modules/lwt_log { }; lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { }; @@ -811,6 +880,10 @@ let lwt_ssl = callPackage ../development/ocaml-modules/lwt_ssl { }; + lwt-watcher = callPackage ../development/ocaml-modules/lwt-watcher { }; + + ### M ### + macaddr = callPackage ../development/ocaml-modules/macaddr { }; macaddr-cstruct = callPackage ../development/ocaml-modules/macaddr/cstruct.nix { }; @@ -852,8 +925,6 @@ let merlin-lib = callPackage ../development/tools/ocaml/merlin/lib.nix { }; - dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { }; - metrics = callPackage ../development/ocaml-modules/metrics { }; metrics-influx = callPackage ../development/ocaml-modules/metrics/influx.nix { }; @@ -980,6 +1051,8 @@ let mustache = callPackage ../development/ocaml-modules/mustache { }; + ### N ### + netchannel = callPackage ../development/ocaml-modules/netchannel { }; nonstd = callPackage ../development/ocaml-modules/nonstd { }; @@ -1002,97 +1075,88 @@ let then callPackage ../development/ocaml-modules/num {} else null; - parmap = callPackage ../development/ocaml-modules/parmap { }; - - ocamlbuild = - if lib.versionOlder "4.03" ocaml.version then - callPackage ../development/tools/ocaml/ocamlbuild { } - else - null; + ### O ### - ocamlc-loc = callPackage ../development/ocaml-modules/ocamlc-loc { }; + ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { }; ocaml_expat = - if lib.versionAtLeast ocaml.version "4.02" - then callPackage ../development/ocaml-modules/expat { } - else callPackage ../development/ocaml-modules/expat/0.9.nix { }; - - frontc = callPackage ../development/ocaml-modules/frontc { }; - - ocamlformat-rpc-lib = callPackage ../development/ocaml-modules/ocamlformat-rpc-lib { }; - - ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { }; + if lib.versionAtLeast ocaml.version "4.02" + then callPackage ../development/ocaml-modules/expat { } + else callPackage ../development/ocaml-modules/expat/0.9.nix { }; ocaml-freestanding = callPackage ../development/ocaml-modules/ocaml-freestanding { }; ocaml_gettext = callPackage ../development/ocaml-modules/ocaml-gettext { }; - gettext-camomile = callPackage ../development/ocaml-modules/ocaml-gettext/camomile.nix { }; - - gettext-stub = callPackage ../development/ocaml-modules/ocaml-gettext/stub.nix { }; - - ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; - ocamlgraph_gtk = callPackage ../development/ocaml-modules/ocamlgraph/gtk.nix { }; - ocaml_libvirt = callPackage ../development/ocaml-modules/ocaml-libvirt { inherit (pkgs.darwin.apple_sdk.frameworks) Foundation AppKit; }; - ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; - - ocamline = callPackage ../development/ocaml-modules/ocamline { }; - - jsonrpc = callPackage ../development/ocaml-modules/ocaml-lsp/jsonrpc.nix { }; - lsp = callPackage ../development/ocaml-modules/ocaml-lsp/lsp.nix { }; ocaml-lsp = callPackage ../development/ocaml-modules/ocaml-lsp { }; + ocaml_lwt = lwt; + ocaml-migrate-parsetree = ocaml-migrate-parsetree-1-8; ocaml-migrate-parsetree-1-8 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix { }; ocaml-migrate-parsetree-2 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix { }; - ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; - ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { }; ocaml_mysql = callPackage ../development/ocaml-modules/mysql { }; - ocamlnet = callPackage ../development/ocaml-modules/ocamlnet { }; - ocaml_oasis = callPackage ../development/tools/ocaml/oasis { }; ocaml_pcre = callPackage ../development/ocaml-modules/pcre {}; ocaml-print-intf = callPackage ../development/ocaml-modules/ocaml-print-intf { }; - ocaml-recovery-parser = callPackage ../development/tools/ocaml/ocaml-recovery-parser { }; - - pgocaml = callPackage ../development/ocaml-modules/pgocaml {}; - - pgocaml_ppx = callPackage ../development/ocaml-modules/pgocaml/ppx.nix {}; + ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { }; ocaml-r = callPackage ../development/ocaml-modules/ocaml-r { }; - ocaml-sat-solvers = callPackage ../development/ocaml-modules/ocaml-sat-solvers { }; - - ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { }; + ocaml-recovery-parser = callPackage ../development/tools/ocaml/ocaml-recovery-parser { }; - ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { }; + ocaml-sat-solvers = callPackage ../development/ocaml-modules/ocaml-sat-solvers { }; ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { }; ocaml-syntax-shims = callPackage ../development/ocaml-modules/ocaml-syntax-shims { }; + ocaml-version = callPackage ../development/ocaml-modules/ocaml-version { }; + ocaml-vdom = callPackage ../development/ocaml-modules/ocaml-vdom { }; - syslog = callPackage ../development/ocaml-modules/syslog { }; + ocamlbuild = + if lib.versionOlder "4.03" ocaml.version + then callPackage ../development/tools/ocaml/ocamlbuild { } + else null; - syslog-message = callPackage ../development/ocaml-modules/syslog-message { }; + ocamlc-loc = callPackage ../development/ocaml-modules/ocamlc-loc { }; - ocaml-version = callPackage ../development/ocaml-modules/ocaml-version { }; + ocamlformat-rpc-lib = callPackage ../development/ocaml-modules/ocamlformat-rpc-lib { }; + + ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { }; + + ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; + ocamlgraph_gtk = callPackage ../development/ocaml-modules/ocamlgraph/gtk.nix { }; + + ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; + + ocamline = callPackage ../development/ocaml-modules/ocamline { }; + + ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; + + ocamlnet = callPackage ../development/ocaml-modules/ocamlnet { }; + + ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { }; + + ocamlsdl = callPackage ../development/ocaml-modules/ocamlsdl { }; + + ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { }; ocf = callPackage ../development/ocaml-modules/ocf { }; @@ -1128,12 +1192,16 @@ let octavius = callPackage ../development/ocaml-modules/octavius { }; + ocurl = callPackage ../development/ocaml-modules/ocurl { }; + odate = callPackage ../development/ocaml-modules/odate { }; odoc = callPackage ../development/ocaml-modules/odoc { }; odoc-parser = callPackage ../development/ocaml-modules/odoc-parser { }; + ogg = callPackage ../development/ocaml-modules/ogg { }; + ojs = callPackage ../development/ocaml-modules/gen_js_api/ojs.nix { }; omd = callPackage ../development/ocaml-modules/omd { }; @@ -1174,15 +1242,17 @@ let otr = callPackage ../development/ocaml-modules/otr { }; - owee = callPackage ../development/ocaml-modules/owee { }; + ounit = callPackage ../development/ocaml-modules/ounit { }; - owl-base = callPackage ../development/ocaml-modules/owl-base { }; + ounit2 = callPackage ../development/ocaml-modules/ounit2 { }; + + owee = callPackage ../development/ocaml-modules/owee { }; owl = callPackage ../development/ocaml-modules/owl { }; - ounit = callPackage ../development/ocaml-modules/ounit { }; + owl-base = callPackage ../development/ocaml-modules/owl-base { }; - ounit2 = callPackage ../development/ocaml-modules/ounit2 { }; + ### P ### paf = callPackage ../development/ocaml-modules/paf { }; @@ -1190,6 +1260,10 @@ let paf-le = callPackage ../development/ocaml-modules/paf/le.nix { }; + parany = callPackage ../development/ocaml-modules/parany { }; + + parmap = callPackage ../development/ocaml-modules/parmap { }; + parse-argv = callPackage ../development/ocaml-modules/parse-argv { }; path_glob = callPackage ../development/ocaml-modules/path_glob { }; @@ -1200,6 +1274,10 @@ let pecu = callPackage ../development/ocaml-modules/pecu { }; + pgocaml = callPackage ../development/ocaml-modules/pgocaml {}; + + pgocaml_ppx = callPackage ../development/ocaml-modules/pgocaml/ppx.nix {}; + pgsolver = callPackage ../development/ocaml-modules/pgsolver { }; phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { }; @@ -1214,6 +1292,10 @@ let inherit (pkgs) coreutils imagemagick; }; + portaudio = callPackage ../development/ocaml-modules/portaudio { + inherit (pkgs) portaudio; + }; + posix-base = callPackage ../development/ocaml-modules/posix/base.nix { }; posix-socket = callPackage ../development/ocaml-modules/posix/socket.nix { }; @@ -1228,114 +1310,12 @@ let pp = callPackage ../development/ocaml-modules/pp { }; + pprint = callPackage ../development/ocaml-modules/pprint { }; + ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { }; - ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; - - pratter = callPackage ../development/ocaml-modules/pratter { }; - - psmt2-frontend = callPackage ../development/ocaml-modules/psmt2-frontend { }; - - psq = callPackage ../development/ocaml-modules/psq { }; - - ptime = callPackage ../development/ocaml-modules/ptime { }; - - pulseaudio = callPackage ../development/ocaml-modules/pulseaudio { - inherit (pkgs) pulseaudio; - }; - - pure-splitmix = callPackage ../development/ocaml-modules/pure-splitmix { }; - - resource-pooling = callPackage ../development/ocaml-modules/resource-pooling { }; - - repr = callPackage ../development/ocaml-modules/repr { }; - - result = callPackage ../development/ocaml-modules/ocaml-result { }; - - rock = callPackage ../development/ocaml-modules/rock { }; - - rusage = callPackage ../development/ocaml-modules/rusage { }; - - sail = callPackage ../development/ocaml-modules/sail { }; - - samplerate = callPackage ../development/ocaml-modules/samplerate { }; - - secp256k1 = callPackage ../development/ocaml-modules/secp256k1 { - inherit (pkgs) secp256k1; - }; - - secp256k1-internal = callPackage ../development/ocaml-modules/secp256k1-internal { }; - - seq = callPackage ../development/ocaml-modules/seq { }; - - shine = callPackage ../development/ocaml-modules/shine { - inherit (pkgs) shine; - }; - - simple-diff = callPackage ../development/ocaml-modules/simple-diff { }; - - sosa = callPackage ../development/ocaml-modules/sosa { }; - - soundtouch = callPackage ../development/ocaml-modules/soundtouch { - inherit (pkgs) soundtouch; - }; - - spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; - - speex = callPackage ../development/ocaml-modules/speex { - inherit (pkgs) speex; - }; - - tar-unix = callPackage ../development/ocaml-modules/tar/unix.nix { }; - - tar = callPackage ../development/ocaml-modules/tar { }; - - tcpip = callPackage ../development/ocaml-modules/tcpip { }; - - timed = callPackage ../development/ocaml-modules/timed { }; - - tiny_httpd = callPackage ../development/ocaml-modules/tiny_httpd { }; - - tsort = callPackage ../development/ocaml-modules/tsort { }; - - tuntap = callPackage ../development/ocaml-modules/tuntap { }; - - tyxml = callPackage ../development/ocaml-modules/tyxml { }; - - tyxml-lwd = callPackage ../development/ocaml-modules/lwd/tyxml-lwd.nix { }; - - ulex = callPackage ../development/ocaml-modules/ulex { }; - - tls = callPackage ../development/ocaml-modules/tls { }; - - tls-async = callPackage ../development/ocaml-modules/tls/async.nix { }; - - tls-lwt = callPackage ../development/ocaml-modules/tls/lwt.nix { }; - - tls-mirage = callPackage ../development/ocaml-modules/tls/mirage.nix { }; - - torch = callPackage ../development/ocaml-modules/torch { - inherit (pkgs.python3Packages) torch; - }; - - ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { }; - - ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { }; - - ocurl = callPackage ../development/ocaml-modules/ocurl { }; - - ogg = callPackage ../development/ocaml-modules/ogg { }; - - parany = callPackage ../development/ocaml-modules/parany { }; - - portaudio = callPackage ../development/ocaml-modules/portaudio { - inherit (pkgs) portaudio; - }; - - pprint = callPackage ../development/ocaml-modules/pprint { }; - ppx_blob = callPackage ../development/ocaml-modules/ppx_blob { }; ppx_cstruct = callPackage ../development/ocaml-modules/cstruct/ppx.nix { }; @@ -1346,22 +1326,21 @@ let ppx_deriving = callPackage ../development/ocaml-modules/ppx_deriving {}; + ppx_deriving_cmdliner = callPackage ../development/ocaml-modules/ppx_deriving_cmdliner {}; + ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {}; ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { }; - ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {}; - ppx_deriving_yaml = callPackage ../development/ocaml-modules/ppx_deriving_yaml {}; - ppx_deriving_cmdliner = callPackage ../development/ocaml-modules/ppx_deriving_cmdliner {}; + ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {}; ppx_gen_rec = callPackage ../development/ocaml-modules/ppx_gen_rec {}; ppx_import = callPackage ../development/ocaml-modules/ppx_import {}; - ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { - }; + ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { }; ppx_repr = callPackage ../development/ocaml-modules/repr/ppx.nix { }; @@ -1376,6 +1355,10 @@ let ppx_yojson_conv_lib = callPackage ../development/ocaml-modules/ppx_yojson_conv_lib {}; + ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; + + pratter = callPackage ../development/ocaml-modules/pratter { }; + prettym = callPackage ../development/ocaml-modules/prettym { }; printbox = callPackage ../development/ocaml-modules/printbox { }; @@ -1388,22 +1371,38 @@ let promise_jsoo = callPackage ../development/ocaml-modules/promise_jsoo { }; + psmt2-frontend = callPackage ../development/ocaml-modules/psmt2-frontend { }; + + psq = callPackage ../development/ocaml-modules/psq { }; + + ptime = callPackage ../development/ocaml-modules/ptime { }; + ptmap = callPackage ../development/ocaml-modules/ptmap { }; ptset = callPackage ../development/ocaml-modules/ptset { }; + pulseaudio = callPackage ../development/ocaml-modules/pulseaudio { + inherit (pkgs) pulseaudio; + }; + + pure-splitmix = callPackage ../development/ocaml-modules/pure-splitmix { }; + pyml = callPackage ../development/ocaml-modules/pyml { }; + ### Q ### + + qcheck = callPackage ../development/ocaml-modules/qcheck { }; + qcheck-alcotest = callPackage ../development/ocaml-modules/qcheck/alcotest.nix { }; qcheck-core = callPackage ../development/ocaml-modules/qcheck/core.nix { }; qcheck-ounit = callPackage ../development/ocaml-modules/qcheck/ounit.nix { }; - qcheck = callPackage ../development/ocaml-modules/qcheck { }; - qtest = callPackage ../development/ocaml-modules/qtest { }; + ### R ### + randomconv = callPackage ../development/ocaml-modules/randomconv { }; rdbg = callPackage ../development/ocaml-modules/rdbg { }; @@ -1422,7 +1421,9 @@ let reperf = callPackage ../development/ocaml-modules/reperf { }; - rfc7748 = callPackage ../development/ocaml-modules/rfc7748 { }; + repr = callPackage ../development/ocaml-modules/repr { }; + + resource-pooling = callPackage ../development/ocaml-modules/resource-pooling { }; resto = callPackage ../development/ocaml-modules/resto { }; resto-acl = callPackage ../development/ocaml-modules/resto/acl.nix { }; @@ -1433,9 +1434,15 @@ let resto-directory = callPackage ../development/ocaml-modules/resto/directory.nix { }; resto-json = callPackage ../development/ocaml-modules/resto/json.nix { }; + result = callPackage ../development/ocaml-modules/ocaml-result { }; + + rfc7748 = callPackage ../development/ocaml-modules/rfc7748 { }; + ringo = callPackage ../development/ocaml-modules/ringo { }; ringo-lwt = callPackage ../development/ocaml-modules/ringo/lwt.nix { }; + rock = callPackage ../development/ocaml-modules/rock { }; + rope = callPackage ../development/ocaml-modules/rope { }; rosetta = callPackage ../development/ocaml-modules/rosetta { }; @@ -1448,22 +1455,58 @@ let rresult = callPackage ../development/ocaml-modules/rresult { }; + rusage = callPackage ../development/ocaml-modules/rusage { }; + + ### S ### + safepass = callPackage ../development/ocaml-modules/safepass { }; + sail = callPackage ../development/ocaml-modules/sail { }; + + samplerate = callPackage ../development/ocaml-modules/samplerate { }; + + sawja = callPackage ../development/ocaml-modules/sawja { }; + + secp256k1 = callPackage ../development/ocaml-modules/secp256k1 { + inherit (pkgs) secp256k1; + }; + + secp256k1-internal = callPackage ../development/ocaml-modules/secp256k1-internal { }; + sedlex = callPackage ../development/ocaml-modules/sedlex { }; semaphore-compat = callPackage ../development/ocaml-modules/semaphore-compat { }; semver = callPackage ../development/ocaml-modules/semver { }; + seq = callPackage ../development/ocaml-modules/seq { }; + sha = callPackage ../development/ocaml-modules/sha { }; shared-memory-ring = callPackage ../development/ocaml-modules/shared-memory-ring { }; shared-memory-ring-lwt = callPackage ../development/ocaml-modules/shared-memory-ring/lwt.nix { }; + shine = callPackage ../development/ocaml-modules/shine { + inherit (pkgs) shine; + }; + + simple-diff = callPackage ../development/ocaml-modules/simple-diff { }; + sodium = callPackage ../development/ocaml-modules/sodium { }; + sosa = callPackage ../development/ocaml-modules/sosa { }; + + soundtouch = callPackage ../development/ocaml-modules/soundtouch { + inherit (pkgs) soundtouch; + }; + + spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { }; + + speex = callPackage ../development/ocaml-modules/speex { + inherit (pkgs) speex; + }; + spelll = callPackage ../development/ocaml-modules/spelll { }; srt = callPackage ../development/ocaml-modules/srt { @@ -1474,6 +1517,8 @@ let stdcompat = callPackage ../development/ocaml-modules/stdcompat { }; + stdint = callPackage ../development/ocaml-modules/stdint { }; + stdlib-shims = callPackage ../development/ocaml-modules/stdlib-shims { }; stdune = callPackage ../development/ocaml-modules/stdune { }; @@ -1482,10 +1527,22 @@ let stringext = callPackage ../development/ocaml-modules/stringext { }; + syslog = callPackage ../development/ocaml-modules/syslog { }; + + syslog-message = callPackage ../development/ocaml-modules/syslog-message { }; + + ### T ### + taglib = callPackage ../development/ocaml-modules/taglib { inherit (pkgs) taglib; }; + tar = callPackage ../development/ocaml-modules/tar { }; + + tar-unix = callPackage ../development/ocaml-modules/tar/unix.nix { }; + + tcpip = callPackage ../development/ocaml-modules/tcpip { }; + tcslib = callPackage ../development/ocaml-modules/tcslib { }; telegraml = callPackage ../development/ocaml-modules/telegraml { }; @@ -1504,10 +1561,26 @@ let theora = callPackage ../development/ocaml-modules/theora { }; + timed = callPackage ../development/ocaml-modules/timed { }; + + tiny_httpd = callPackage ../development/ocaml-modules/tiny_httpd { }; + + tls = callPackage ../development/ocaml-modules/tls { }; + + tls-async = callPackage ../development/ocaml-modules/tls/async.nix { }; + + tls-lwt = callPackage ../development/ocaml-modules/tls/lwt.nix { }; + + tls-mirage = callPackage ../development/ocaml-modules/tls/mirage.nix { }; + toml = callPackage ../development/ocaml-modules/toml { }; topkg = callPackage ../development/ocaml-modules/topkg { }; + torch = callPackage ../development/ocaml-modules/torch { + inherit (pkgs.python3Packages) torch; + }; + trie = callPackage ../development/ocaml-modules/trie { }; tsdl = callPackage ../development/ocaml-modules/tsdl { @@ -1520,50 +1593,65 @@ let tsdl-ttf = callPackage ../development/ocaml-modules/tsdl-ttf { }; + tsort = callPackage ../development/ocaml-modules/tsort { }; + + tuntap = callPackage ../development/ocaml-modules/tuntap { }; + twt = callPackage ../development/ocaml-modules/twt { }; + tyxml = callPackage ../development/ocaml-modules/tyxml { }; + + tyxml-lwd = callPackage ../development/ocaml-modules/lwd/tyxml-lwd.nix { }; + + ### U ### + uchar = callPackage ../development/ocaml-modules/uchar { }; uecc = callPackage ../development/ocaml-modules/uecc { }; - unix-errno = callPackage ../development/ocaml-modules/unix-errno { }; + ulex = callPackage ../development/ocaml-modules/ulex { }; - utop = callPackage ../development/tools/ocaml/utop { }; + unionFind = callPackage ../development/ocaml-modules/unionFind { }; - uuidm = callPackage ../development/ocaml-modules/uuidm { }; + unix-errno = callPackage ../development/ocaml-modules/unix-errno { }; - sawja = callPackage ../development/ocaml-modules/sawja { }; + unstrctrd = callPackage ../development/ocaml-modules/unstrctrd { }; - stdint = callPackage ../development/ocaml-modules/stdint { }; + uri = callPackage ../development/ocaml-modules/uri { }; - unionFind = callPackage ../development/ocaml-modules/unionFind { }; + uri-sexp = callPackage ../development/ocaml-modules/uri/sexp.nix { }; - unstrctrd = callPackage ../development/ocaml-modules/unstrctrd { }; + utop = callPackage ../development/tools/ocaml/utop { }; uucd = callPackage ../development/ocaml-modules/uucd { }; + uucp = callPackage ../development/ocaml-modules/uucp { }; - uunf = callPackage ../development/ocaml-modules/uunf { }; - uri = callPackage ../development/ocaml-modules/uri { }; + uuidm = callPackage ../development/ocaml-modules/uuidm { }; - uri-sexp = callPackage ../development/ocaml-modules/uri/sexp.nix { }; + uunf = callPackage ../development/ocaml-modules/uunf { }; uuseg = callPackage ../development/ocaml-modules/uuseg { }; + uutf = callPackage ../development/ocaml-modules/uutf { }; uuuu = callPackage ../development/ocaml-modules/uuuu { }; + ### V ### + vchan = callPackage ../development/ocaml-modules/vchan { }; vector = callPackage ../development/ocaml-modules/vector { }; vg = callPackage ../development/ocaml-modules/vg { }; + visitors = callPackage ../development/ocaml-modules/visitors { }; + vlq = callPackage ../development/ocaml-modules/vlq { }; vorbis = callPackage ../development/ocaml-modules/vorbis { }; - visitors = callPackage ../development/ocaml-modules/visitors { }; + ### W ### wasm = callPackage ../development/ocaml-modules/wasm { }; @@ -1575,26 +1663,30 @@ let wtf8 = callPackage ../development/ocaml-modules/wtf8 { }; + ### X ### + x509 = callPackage ../development/ocaml-modules/x509 { }; xdg = callPackage ../development/ocaml-modules/xdg { }; xenstore = callPackage ../development/ocaml-modules/xenstore { }; + xenstore-tool = callPackage ../development/ocaml-modules/xenstore-tool { }; + xenstore_transport = callPackage ../development/ocaml-modules/xenstore_transport { }; - xenstore-tool = callPackage ../development/ocaml-modules/xenstore-tool { }; + xml-light = callPackage ../development/ocaml-modules/xml-light { }; xmlm = callPackage ../development/ocaml-modules/xmlm { }; xmlplaylist = callPackage ../development/ocaml-modules/xmlplaylist { }; - xml-light = callPackage ../development/ocaml-modules/xml-light { }; - xtmpl = callPackage ../development/ocaml-modules/xtmpl { }; xtmpl_ppx = callPackage ../development/ocaml-modules/xtmpl/ppx.nix { }; + ### Y ### + yaml = callPackage ../development/ocaml-modules/yaml { }; yaml-sexp = callPackage ../development/ocaml-modules/yaml/yaml-sexp.nix { }; @@ -1605,6 +1697,8 @@ let yuujinchou = callPackage ../development/ocaml-modules/yuujinchou { }; + ### Z ### + z3 = callPackage ../development/ocaml-modules/z3 { inherit (pkgs) z3; }; @@ -1617,60 +1711,24 @@ let zmq-lwt = callPackage ../development/ocaml-modules/zmq/lwt.nix { }; - # Jane Street + ### Exceptional packages kept out of order ### - janePackage = - if lib.versionOlder "4.10.2" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/janePackage_0_15.nix {} - else if lib.versionOlder "4.08" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/janePackage_0_14.nix {} - else if lib.versionOlder "4.07" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/janePackage_0_12.nix {} - else callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; + # Libs - janeStreet = - if lib.versionOlder "4.10.2" ocaml.version - then import ../development/ocaml-modules/janestreet/0.15.nix { - inherit self; - inherit (pkgs) bash fetchpatch fzf lib openssl zstd; - } - else if lib.versionOlder "4.08" ocaml.version - then import ../development/ocaml-modules/janestreet/0.14.nix { - inherit self; - inherit (pkgs) fetchpatch lib openssl zstd; - } - else if lib.versionOlder "4.07" ocaml.version - then import ../development/ocaml-modules/janestreet/0.12.nix { - self = self // { - ppxlib = ppxlib.override { version = "0.8.1"; }; - }; - inherit (pkgs) openssl; - } - else import ../development/ocaml-modules/janestreet { - self = self // { - ppxlib = ppxlib.override { version = "0.8.1"; }; - }; - inherit (pkgs) openssl; - }; + buildDunePackage = callPackage ../build-support/ocaml/dune.nix { }; - janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { - self = self.janeStreet_0_9_0; - super = self // { - janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix { - defaultVersion = "0.9.0"; - }; - }; - inherit (pkgs) stdenv lib openssl; - }; - - # Apps / from all-packages + buildOasisPackage = callPackage ../build-support/ocaml/oasis.nix { }; - ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; + # Apps from all-packages, to be eventually removed google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; hol_light = callPackage ../applications/science/logic/hol_light { }; + ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; + + ### End ### + })).overrideScope' liftJaneStreet; in let inherit (pkgs) callPackage; in rec