diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-09 14:51:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-09 14:51:42 +0200 |
commit | ee70b5f4ddc2e17fe91bac268eaccbe511340327 (patch) | |
tree | 986f910d559b007fa445dbb7f0cc0c3828070f35 | |
parent | bea21e5fa998eab952d8c1419b0ea89d7e6d6f24 (diff) | |
parent | c310063eaf929486e8d7b6f1daa84510aae33edd (diff) |
Merge pull request #302798 from vbgl/ocaml-re-dune3
ocamlPackages.janeStreet: remove at 0.11 & more clean-up
9 files changed, 60 insertions, 627 deletions
diff --git a/pkgs/development/ocaml-modules/cfstream/default.nix b/pkgs/development/ocaml-modules/cfstream/default.nix index af721b63a8f9..ba69c40de016 100644 --- a/pkgs/development/ocaml-modules/cfstream/default.nix +++ b/pkgs/development/ocaml-modules/cfstream/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "cfstream"; version = "1.3.2"; - minimalOCamlVersion = "4.04.1"; + minimalOCamlVersion = "4.07"; src = fetchFromGitHub { owner = "biocaml"; diff --git a/pkgs/development/ocaml-modules/janestreet/0.12.nix b/pkgs/development/ocaml-modules/janestreet/0.12.nix index 8d7943af42b6..2ea593e10b44 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.12.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.12.nix @@ -106,6 +106,7 @@ with self; }; ppx_expect = janePackage { + duneVersion = "3"; pname = "ppx_expect"; hash = "1wawsbjfkri4sw52n8xqrzihxc3xfpdicv3ahz83a1rsn4lb8j5q"; meta.description = "Cram like framework for OCaml"; @@ -275,6 +276,7 @@ with self; }; ppx_jane = janePackage { + duneVersion = "3"; pname = "ppx_jane"; hash = "1a2602isqzsh640q20qbmarx0sc316mlsqc3i25ysv2kdyhh0kyw"; meta.description = "Standard Jane Street ppx rewriters"; @@ -282,6 +284,7 @@ with self; }; base_bigstring = janePackage { + duneVersion = "3"; pname = "base_bigstring"; hash = "0rbgyg511847fbnxad40prz2dyp4da6sffzyzl88j18cxqxbh1by"; meta.description = "String type based on [Bigarray], for use in I/O and C-bindings"; @@ -303,15 +306,17 @@ with self; }; core_kernel = janePackage { + duneVersion = "3"; pname = "core_kernel"; - version = "0.12.2"; - hash = "0c85bjvadrb4pmjcg0gjk3bkkgka62r90pjm690mjvcbbv5zjxzj"; + version = "0.12.3"; + hash = "sha256-bDgxuOILAs4FYB8o92ysPHDdEzflZMsU/jk5hB9xfuc="; meta.description = "System-independent part of Core"; buildInputs = [ jst-config ]; propagatedBuildInputs = [ base_bigstring sexplib ]; }; spawn = janePackage { + duneVersion = "3"; pname = "spawn"; version = "0.13.0"; hash = "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf"; @@ -320,6 +325,7 @@ with self; }; core = janePackage { + duneVersion = "3"; pname = "core"; version = "0.12.3"; hash = "1vmjqiafkg45hqfvahx6jnlaww1q4a4215k8znbgprf0qn3zymnj"; @@ -329,6 +335,7 @@ with self; }; async_kernel = janePackage { + duneVersion = "3"; pname = "async_kernel"; hash = "1d9illx7vvpblj1i2r9y0f2yff2fbhy3rp4hhvamq1n9n3lvxmh2"; meta.description = "Monadic concurrency library"; @@ -336,6 +343,7 @@ with self; }; protocol_version_header = janePackage { + duneVersion = "3"; pname = "protocol_version_header"; hash = "14vqhx3r84rlfhcjq52gxdqksckiaswlck9s47g7y2z1lsc17v7r"; meta.description = "Protocol versioning"; @@ -343,6 +351,7 @@ with self; }; async_rpc_kernel = janePackage { + duneVersion = "3"; pname = "async_rpc_kernel"; hash = "1znhqbzx4fp58i7dbcgyv5rx7difbhb5d8cbqzv96yqvbn67lsjk"; meta.description = "Platform-independent core of Async RPC library"; @@ -350,6 +359,7 @@ with self; }; async_unix = janePackage { + duneVersion = "3"; pname = "async_unix"; hash = "09h10rdyykbm88n6r9nb5a22mlb6vcxa04q6hvrcr0kys6qhhqmb"; meta.description = "Monadic concurrency library"; @@ -357,6 +367,7 @@ with self; }; async_extra = janePackage { + duneVersion = "3"; pname = "async_extra"; hash = "10j4mwlyqvf67yrp5dwd857llqjinpnnykmlzw2gpmks9azxk6mh"; meta.description = "Monadic concurrency library"; @@ -364,6 +375,7 @@ with self; }; textutils = janePackage { + duneVersion = "3"; pname = "textutils"; hash = "0302awqihf3abib9mvzvn4g8m364hm6jxry1r3kc01hzybhy9acq"; meta.description = "Text output utilities"; @@ -371,6 +383,7 @@ with self; }; async = janePackage { + duneVersion = "3"; pname = "async"; hash = "0pk7z3h2gi21nfchvmjz2wx516bynf9vgwf84zf5qhvlvqqsmyrx"; meta.description = "Monadic concurrency library"; @@ -378,6 +391,7 @@ with self; }; async_find = janePackage { + duneVersion = "3"; pname = "async_find"; hash = "0qsz9f15s5rlk6za10s810v6nlkdxg2g9p1827lcpa7nhjcpi673"; meta.description = "Directory traversal with Async"; @@ -385,8 +399,10 @@ with self; }; re2 = janePackage { + duneVersion = "3"; pname = "re2"; - hash = "1sw32lb0y501y971ij7287796lvfhs0nfgla895r74ymfks2rcjb"; + version = "0.12.1"; + hash = "sha256-NPQKKUSwckZx4GN4wX2sc0Mn7bes6p79oZrN6xouc6o="; meta.description = "OCaml bindings for RE2, Google's regular expression library"; propagatedBuildInputs = [ core_kernel ]; prePatch = '' @@ -396,6 +412,7 @@ with self; }; shell = janePackage { + duneVersion = "3"; pname = "shell"; hash = "158857rdr6qgglc5iksg0l54jgf51b5lmsw7nlazpxwdwc9fcn5n"; meta.description = "Yet another implementation of fork&exec and related functionality"; @@ -404,6 +421,7 @@ with self; }; async_shell = janePackage { + duneVersion = "3"; pname = "async_shell"; hash = "0cxln9hkc3cy522la9yi9p23qjwl69kqmadsq4lnjh5bxdad06sv"; meta.description = "Shell helpers for Async"; @@ -411,6 +429,7 @@ with self; }; core_bench = janePackage { + duneVersion = "3"; pname = "core_bench"; hash = "00hyzbbj19dkcw0vhfnc8w0ca3zkjriwwvl00ssa0a2g9mygijdm"; meta.description = "Benchmarking library"; @@ -418,6 +437,7 @@ with self; }; core_extended = janePackage { + duneVersion = "3"; pname = "core_extended"; hash = "1gwx66235irpf5krb1r25a3c7w52qhmass8hp7rdv89il9jn49w4"; meta.description = "Extra components that are not as closely vetted or as stable as Core"; @@ -425,6 +445,7 @@ with self; }; sexp_pretty = janePackage { + duneVersion = "3"; pname = "sexp_pretty"; hash = "06hdsaszc5cd7fphiblbn4r1sh36xgjwf2igzr2rvlzqs7jiv2v4"; meta.description = "S-expression pretty-printer"; @@ -432,6 +453,7 @@ with self; }; expect_test_helpers_kernel = janePackage { + duneVersion = "3"; pname = "expect_test_helpers_kernel"; hash = "18ya187y2i2hfxr771sd9vy5jdsa30vhs56yjdhwk06v01b2fzbq"; meta.description = "Helpers for writing expectation tests"; @@ -440,6 +462,7 @@ with self; }; expect_test_helpers = janePackage { + duneVersion = "3"; pname = "expect_test_helpers"; hash = "0ixqck2lnsmz107yw0q2sr8va80skjpldx7lz4ymjiq2vsghk0rb"; meta.description = "Async helpers for writing expectation tests"; @@ -447,6 +470,7 @@ with self; }; patience_diff = janePackage { + duneVersion = "3"; pname = "patience_diff"; hash = "055kd3piadjnplip8c8q99ssh79d4irmhg2wng7aida5pbqp2p9f"; meta.description = "Diff library using Bram Cohen's patience diff algorithm"; @@ -454,6 +478,7 @@ with self; }; ecaml = janePackage { + duneVersion = "3"; pname = "ecaml"; hash = "0n9xi6agc3lgyj2nsi10cbif0xwn57xyaranad9r285rmbxrgjh7"; meta.description = "Library for writing Emacs plugin in OCaml"; diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index b0ab637bfba3..a496c2c73cf9 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -1,589 +1,27 @@ -{ self -, openssl -}: - -with self; +{ }: +# Minimal set of names assumed to be defined by the rest of ocamlPackages { - - ocaml-compiler-libs = janePackage { - pname = "ocaml-compiler-libs"; - hash = "03jds7bszh8wwpfwxb3dg0gyr1j1872wxwx1xqhry5ir0i84bg0s"; - meta.description = "OCaml compiler libraries repackaged"; - }; - - sexplib0 = janePackage { - pname = "sexplib0"; - meta.description = "Library containing the definition of S-expressions and some base converters"; - hash = "07v3ggyss7xhfv14bjk1n87sr42iqwj4cgjiv2lcdfkqk49i2bmi"; - }; - - parsexp = janePackage { - pname = "parsexp"; - hash = "1nyq23s5igd8cf3n4qxprjvhbmb6ighb3fy5mw7hxl0mdgsw5fvz"; - propagatedBuildInputs = [ sexplib0 ]; - meta.description = "S-expression parsing library"; - }; - - sexplib = janePackage { - pname = "sexplib"; - meta.description = "Library for serializing OCaml values to and from S-expressions"; - hash = "1qfl0m04rpcjvc4yw1hzh6r16jpwmap0sa9ax6zjji67dz4szpyb"; - propagatedBuildInputs = [ num parsexp ]; - }; - - base = janePackage { - version = "0.11.1"; - pname = "base"; - hash = "0j6xb4265jr41vw4fjzak6yr8s30qrnzapnc6rl1dxy8bjai0nir"; - propagatedBuildInputs = [ sexplib0 ]; - meta.description = "Full standard library replacement for OCaml"; - }; - - stdio = janePackage { - pname = "stdio"; - hash = "1facajqhvq34g2wrg368y0ajxd6lrj5b3lyzyj0jhdmraxajjcwn"; - propagatedBuildInputs = [ base ]; - meta.description = "Standard IO library for OCaml"; - }; - - configurator = janePackage { - pname = "configurator"; - hash = "0h686630cscav7pil8c3w0gbh6rj4b41dvbnwmicmlkc746q5bfk"; - propagatedBuildInputs = [ stdio ]; - meta.description = "Helper library for gathering system configuration"; - }; - - ppx_compare = janePackage { - pname = "ppx_compare"; - version = "0.11.1"; - hash = "06bq4m1bsm4jlx4g7wh5m99qky7xm4c2g52kaz6pv25hdn5agi2m"; - buildInputs = [ ppxlib ]; - propagatedBuildInputs = [ base ppx_deriving ]; - meta.description = "Generation of comparison functions from types"; - }; - - ppx_sexp_conv = janePackage { - pname = "ppx_sexp_conv"; - version = "0.11.2"; - hash = "0pqwnqy1xp309wvdcaax4lg02yk64lq2w03mbgfvf6ps5ry4gis9"; - propagatedBuildInputs = [ sexplib0 ppxlib ppx_deriving ]; - meta.description = "Generation of S-expression conversion functions from type definitions"; - }; - - variantslib = janePackage { - pname = "variantslib"; - hash = "0hbsk34ghc28h8pzbma923ma2bgnz8lzrgcqqx9bzg161jl4s4r3"; - buildInputs = [ ppxlib ]; - propagatedBuildInputs = [ base ]; - meta.description = "OCaml variants as first class values"; - }; - - ppx_variants_conv = janePackage { - pname = "ppx_variants_conv"; - version = "0.11.1"; - hash = "1yc0gsds5m2nv39zga8nnrca2n75rkqy5dz4xj1635ybz20hhbjd"; - buildInputs = [ ppxlib ]; - propagatedBuildInputs = [ ppx_deriving variantslib ]; - meta.description = "Generation of accessor and iteration functions for OCaml variant types"; - }; - - fieldslib = janePackage { - pname = "fieldslib"; - hash = "1yvjvfax56lmn2lxbykcmhgmxypws1vp9lhnyb8bhbavsv8yc6da"; - propagatedBuildInputs = [ ppxlib ]; - meta.description = "OCaml record fields as first class values"; - }; - - ppx_fields_conv = janePackage { - pname = "ppx_fields_conv"; - hash = "1bb9cmn4js7p3qh8skzyik1pcz6sj1k4xkhf12fg1bjmb5fd0jx1"; - propagatedBuildInputs = [ fieldslib ]; - meta.description = "Generation of accessor and iteration functions for OCaml records"; - }; - - ppx_custom_printf = janePackage { - pname = "ppx_custom_printf"; - hash = "1dvjzvaxhx53jqwrrlxdckwl1azrhs9kvwb48mhgd0jnz65ny726"; - propagatedBuildInputs = [ ppx_sexp_conv ]; - meta.description = "Printf-style format-strings for user-defined string conversion"; - }; - - bin_prot = janePackage { - pname = "bin_prot"; - hash = "1mgbyzsr8h0y4s4j9dv7hsdrxyzhhjww5khwg2spi2my7ia95m0l"; - propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ]; - meta.description = "Binary protocol generator"; - }; - - jane-street-headers = janePackage { - pname = "jane-street-headers"; - hash = "0kij4c7qxrja787f3sm3z6mzr322486h2djrlyhnl66vp8hrv8si"; - meta.description = "Jane Street header files"; - }; - - ppx_here = janePackage { - pname = "ppx_here"; - hash = "04njv8s4n54x9rg0012ymd6y6lrnqprnh0f0f6s0jcp79q7mv43i"; - buildInputs = [ ppxlib ]; - meta.description = "Expands [%here] into its location"; - }; - - ppx_assert = janePackage { - pname = "ppx_assert"; - hash = "0qbdrl0rj0midnb6sdyaz00s0d4nb8zrrdf565lcdsi1rbnyrzan"; - buildInputs = [ ppx_here ]; - propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ]; - meta.description = "Assert-like extension nodes that raise useful errors on failure"; - }; - - ppx_hash = janePackage { - version = "0.11.1"; - pname = "ppx_hash"; - hash = "1p0ic6aijxlrdggpmycj12q3cy9xksbq2vq727215maz4snvlf5p"; - propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ]; - meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions"; - }; - - ppx_inline_test = janePackage { - pname = "ppx_inline_test"; - hash = "11n94fz1asjf5vqdgriv0pvsa5lbfpqcyk525c7816w23vskcvq6"; - buildInputs = [ ppxlib ]; - propagatedBuildInputs = [ base ]; - meta.description = "Syntax extension for writing in-line tests in OCaml code"; - }; - - ppx_sexp_message = janePackage { - pname = "ppx_sexp_message"; - hash = "0d94pf0mrmyp905ncgj4w6cc6zpm4nlib6nclslhgs89pxpzg6a0"; - buildInputs = [ ppx_here ]; - propagatedBuildInputs = [ ppx_sexp_conv ]; - meta.description = "A ppx rewriter for easy construction of s-expressions"; - }; - - typerep = janePackage { - pname = "typerep"; - hash = "00j4by75fl9niqvlpiyw6ymlmlmgfzysm8w25cj5wsfsh4yrgr74"; - propagatedBuildInputs = [ base ]; - meta.description = "Runtime types for OCaml"; - }; - - ppx_typerep_conv = janePackage { - version = "0.11.1"; - pname = "ppx_typerep_conv"; - hash = "0a13dpfrrg0rsm8qni1bh7pqcda30l70z8r6yzi5a64bmwk7g5ah"; - buildInputs = [ ppxlib ]; - propagatedBuildInputs = [ ppx_deriving typerep ]; - meta.description = "Generation of runtime types from type declarations"; - }; - - ppx_js_style = janePackage { - pname = "ppx_js_style"; - hash = "1cwqyrkykc8wi60grbid1w072fcvf7k0hd387jz7mxfw44qyb85g"; - propagatedBuildInputs = [ ppxlib octavius ]; - meta.description = "Code style checker for Jane Street Packages"; - }; - - ppx_enumerate = janePackage { - version = "0.11.1"; - pname = "ppx_enumerate"; - hash = "0spx9k1v7vjjb6sigbfs69yndgq76v114jhxvzjmffw7q989cyhr"; - buildInputs = [ ppxlib ]; - propagatedBuildInputs = [ ppx_deriving ]; - meta.description = "Generate a list containing all values of a finite type"; - }; - - ppx_base = janePackage { - pname = "ppx_base"; - hash = "079caqjbxk1d33hy69017n3dwslqy52alvzjddwpdjb04vjadlk6"; - propagatedBuildInputs = [ ppx_compare ppx_enumerate ppx_hash ppx_js_style ]; - meta.description = "Base set of ppx rewriters"; - }; - - ppx_bench = janePackage { - pname = "ppx_bench"; - hash = "0z98r6y4lpj6dy265m771ylx126hq3v1zjsk74yqvpwwd63gx3jz"; - buildInputs = [ ppxlib ppx_inline_test ]; - meta.description = "Syntax extension for writing in-line benchmarks in OCaml code"; - }; - - ppx_bin_prot = janePackage { - version = "0.11.1"; - pname = "ppx_bin_prot"; - hash = "1h60i75bzvhna1axyn662gyrzhh441l79vl142d235i5x31dmnkz"; - buildInputs = [ ppxlib ppx_here ]; - propagatedBuildInputs = [ bin_prot ]; - meta.description = "Generation of bin_prot readers and writers from types"; - }; - - ppx_expect = janePackage { - pname = "ppx_expect"; - hash = "1g0r67vfw9jr75pybiw4ysfiswlzyfpbj0gl91rx62gqdhjh1pga"; - buildInputs = [ ppx_assert ppx_custom_printf ppx_fields_conv ppx_here ppx_variants_conv re ]; - propagatedBuildInputs = [ fieldslib ppx_compare ppx_inline_test ppx_sexp_conv ]; - meta.description = "Cram like framework for OCaml"; - }; - - ppx_fail = janePackage { - pname = "ppx_fail"; - hash = "0d0xadcl7mhp81kspcd2b0nh75h34w5a6s6j9qskjjbjif87wiix"; - buildInputs = [ ppxlib ppx_here ]; - meta.description = "Add location to calls to failwiths"; - }; - - ppx_let = janePackage { - pname = "ppx_let"; - hash = "1ckzwljlb78cdf6xxd24nddnmsihvjrnq75r1b255aj3xgkzsygx"; - propagatedBuildInputs = [ base ppxlib ]; - meta.description = "Monadic let-bindings"; - }; - - ppx_optcomp = janePackage { - pname = "ppx_optcomp"; - hash = "1rahkjq6vpffs7wdz1crgbxkdnlfkj1i3j12c2andy4fhj49glcm"; - buildInputs = [ ppxlib ]; - propagatedBuildInputs = [ ppx_deriving ]; - meta.description = "Optional compilation for OCaml"; - }; - - ppx_optional = janePackage { - pname = "ppx_optional"; - hash = "0aw3hvrsdjpw4ik7rf15ghak31vhdr1lgpphr18mj76rnlrhirmx"; - propagatedBuildInputs = [ ppxlib ]; - meta.description = "Pattern matching on flat options"; - }; - - ppx_pipebang = janePackage { - pname = "ppx_pipebang"; - hash = "0smgq587amlr3hivbbg153p83dj37w30cssp9cffc0v8kg84lfhr"; - buildInputs = [ ppxlib ]; - meta.description = "A ppx rewriter that inlines reverse application operators |> and |!"; - }; - - ppx_sexp_value = janePackage { - pname = "ppx_sexp_value"; - hash = "107zwb580nrmc0l03dl3y3hf12s3c1vv8b8mz6sa4k5afp3s9nkl"; - buildInputs = [ ppx_here ]; - propagatedBuildInputs = [ ppx_sexp_conv ]; - meta.description = "A ppx rewriter that simplifies building s-expressions from OCaml values"; - }; - - ppx_jane = janePackage { - pname = "ppx_jane"; - hash = "0l1p6llaa60mrc5p9400cqv9yy6h76x5wfq3z1cx5xawy0yz4vlb"; - buildInputs = [ ppxlib ]; - propagatedBuildInputs = [ ppx_assert ppx_base ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_here ppx_let ppx_optcomp ppx_optional ppx_pipebang ppx_sexp_message ppx_sexp_value ppx_typerep_conv ]; - meta.description = "Standard Jane Street ppx rewriters"; - }; - - splittable_random = janePackage { - pname = "splittable_random"; - hash = "1yrvpm6g62f8k6ihccxhfxpvmxbqxhi7p790a8jkdmyfdd1l6z73"; - propagatedBuildInputs = [ ppx_jane ]; - meta.description = "PRNG that can be split into independent streams"; - }; - - core_kernel = janePackage { - version = "0.11.1"; - pname = "core_kernel"; - hash = "1dg7ygy7i64c5gaakb1cp1b26p9ks81vbxmb8fd7jff2q60j2z2g"; - propagatedBuildInputs = [ configurator jane-street-headers sexplib splittable_random ]; - meta.description = "Jane Street's standard library overlay (kernel)"; - }; - - spawn = janePackage { - version = "0.12.0"; - pname = "spawn"; - hash = "0amgj7g9sjlbjivn1mg7yjdmxd21hgp4a0ak2zrm95dmm4gi846i"; - meta.description = "Spawning sub-processes"; - }; - - core = janePackage { - version = "0.11.3"; - pname = "core"; - hash = "0pzl8n09z4f3i7z2wq4cjxfqrr8mj6xcdp7rbg0nxap2zdhjgvrq"; - propagatedBuildInputs = [ core_kernel spawn ]; - meta.description = "Jane Street's standard library overlay"; - }; - - textutils_kernel = janePackage { - pname = "textutils_kernel"; - hash = "0s1ps7h54vgl76pll3y5qa1bw8f4h8wxc8mg8jq6bz8vxvl0dfv4"; - propagatedBuildInputs = [ core_kernel ]; - meta.description = "The subset of textutils using only core_kernel and working in javascript"; - }; - - textutils = janePackage { - pname = "textutils"; - hash = "1jmhpaihnndf4pr8xsk7ws70n4mvv34ry0ggqqpfs3wb2vkcdg6j"; - propagatedBuildInputs = [ core textutils_kernel ]; - meta.description = "Text output utilities"; - }; - - re2 = janePackage { - pname = "re2"; - hash = "0bl65d0nmvr7k1mkkcc4aai86l5qzgn1xxwmszshpwhaz87cqghd"; - propagatedBuildInputs = [ core_kernel ]; - prePatch = '' - substituteInPlace src/re2_c/jbuild --replace 'CXX=g++' 'CXX=c++' - substituteInPlace src/jbuild --replace '(cxx_flags ((:standard \ -pedantic) (-I re2_c/libre2)))' '(cxx_flags ((:standard \ -pedantic) (-I re2_c/libre2) (-x c++)))' - ''; - meta.description = "OCaml bindings for RE2"; - }; - - core_extended = janePackage { - pname = "core_extended"; - hash = "1fvnr6zkpbl48dl7nn3j1dpsrr6bi00iqh282wg5lgdhcsjbc0dy"; - propagatedBuildInputs = [ core re re2 textutils ]; - postPatch = '' - patchShebangs src/discover.sh - ''; - meta.description = "Jane Street Capital's standard library overlay"; - }; - - async_kernel = janePackage { - version = "0.11.1"; - pname = "async_kernel"; - hash = "1ssv0gqbdns6by1wdjrrs35cj1c1n1qcfkxs8hj04b7x89wzvf1q"; - propagatedBuildInputs = [ core_kernel ]; - meta.description = "Jane Street Capital's asynchronous execution library (core)"; - }; - - protocol_version_header = janePackage { - pname = "protocol_version_header"; - hash = "159qmkb0dsfmr1lv2ly50aqszpm24bvrm3sw07n2zhkxgy6q613z"; - propagatedBuildInputs = [ core_kernel ocaml-migrate-parsetree ]; - meta.description = "Protocol aware version negotiation"; - }; - - async_rpc_kernel = janePackage { - pname = "async_rpc_kernel"; - hash = "0wl7kp30qxkalk91q5pja9agsvvmdjvb2q7s3m79dlvwwi11l33y"; - propagatedBuildInputs = [ core_kernel async_kernel protocol_version_header ]; - meta.description = "Platform-independent core of Async RPC library"; - }; - - async_unix = janePackage { - pname = "async_unix"; - hash = "1y5za5fdh0x82zdjigxci9zm9jnpfd2lfgpjcq4rih3s28f16sf7"; - propagatedBuildInputs = [ core async_kernel ]; - meta.description = "Jane Street Capital's asynchronous execution library (unix)"; - }; - - async_extra = janePackage { - version = "0.11.1"; - pname = "async_extra"; - hash = "0dmplvqf41820rm5i0l9bx1xmmdlq8zsszi36y2rkjna8991f7s2"; - propagatedBuildInputs = [ async_rpc_kernel async_unix ]; - meta.description = "Jane Street's asynchronous execution library (extra)"; - }; - - async = janePackage { - pname = "async"; - hash = "1i05hzk4mhzj1mw98b2bdbxhnq03jvhkkkw4d948i6265jzrrbv5"; - propagatedBuildInputs = [ async_extra ]; - meta.description = "Jane Street Capital's asynchronous execution library"; - }; - - async_find = janePackage { - pname = "async_find"; - hash = "0s0qafx74ri1vr2vv3iy1j7s3p6gp7vyg0mw5g17iafk0w6lv2iq"; - propagatedBuildInputs = [ async ]; - meta.description = "Directory traversal with Async"; - }; - - async_interactive = janePackage { - pname = "async_interactive"; - hash = "01rlfcylpiak6a2n6q3chp73cvkhvb65n906dj0flmxmagn7dxd1"; - propagatedBuildInputs = [ async ]; - meta.description = "Utilities for building simple command-line based user interfaces"; - }; - - async_parallel = janePackage { - pname = "async_parallel"; - hash = "0hak8ba3rfzqhz5hz2annqmsv5bkqzdihhafp0f58ryrlskafwag"; - propagatedBuildInputs = [ async ]; - meta.description = "Distributed computing library"; - }; - - async_shell = janePackage { - pname = "async_shell"; - hash = "1jb01ygfnhabsy72xlcg11vp7rr37sg555sm0k3yxl4r5az3y2ay"; - propagatedBuildInputs = [ core_extended async ]; - meta.description = "Shell helpers for Async"; - }; - - sexp_pretty = janePackage { - pname = "sexp_pretty"; - hash = "0xskahjggbwvvb82fn0jp1didxbgpmgks76xhwp9s3vqkhgz6918"; - propagatedBuildInputs = [ ppx_base re sexplib ]; - meta.description = "S-expression pretty-printer"; - }; - - expect_test_helpers_kernel = janePackage { - pname = "expect_test_helpers_kernel"; - hash = "0m113vq4m1xm3wmwa08r6qjc7p5f0y3ss8s4i2z591ycgs2fxzlj"; - propagatedBuildInputs = [ core_kernel sexp_pretty ]; - meta.description = "Helpers for writing expectation tests"; - }; - - expect_test_helpers = janePackage { - pname = "expect_test_helpers"; - hash = "13n6h7mimwkbsjdix96ghfrmxjd036m4h4zgl8qag00aacqclvpi"; - propagatedBuildInputs = [ async expect_test_helpers_kernel ]; - meta.description = "Async helpers for writing expectation tests"; - }; - - cinaps = janePackage { - pname = "cinaps"; - hash = "0f8cx4xkkk4wqpcbvva8kxdndbgawljp17dwppc6zpjpkjl8s84j"; - propagatedBuildInputs = [ re ]; - meta.description = "Trivial Metaprogramming tool using the OCaml toplevel"; - }; - - command_rpc = janePackage { - pname = "command_rpc"; - hash = "111v4km0ds8ixmpmwg9ck36ap97400mqzhijf57kj6wfwgzcmr2g"; - propagatedBuildInputs = [ async ]; - meta.description = "Utilities for Versioned RPC communication with a child process over stdin and stdout"; - }; - - # Deprecated libraries - - ppx_ast = janePackage { - pname = "ppx_ast"; - hash = "125bzswcwr3nb26ss8ydh8z4218c8fi3s2kvgqp1j1fhc5wwzqgj"; - propagatedBuildInputs = [ ppxlib ]; - meta.description = "Deprecated (see ppxlib)"; - }; - - ppx_core = janePackage { - pname = "ppx_core"; - hash = "11hgm9mxig4cm3c827f6dns9mjv3pf8g6skf10x0gw9xnp1dmzmx"; - propagatedBuildInputs = [ ppxlib ]; - meta.description = "Deprecated (see ppxlib)"; - }; - - ppx_driver = janePackage { - pname = "ppx_driver"; - hash = "00kfx6js2kxk57k4v7hiqvwk7h35whgjihnxf75m82rnaf4yzvfi"; - propagatedBuildInputs = [ ppxlib ]; - meta.description = "Deprecated (see ppxlib)"; - }; - - ppx_metaquot = janePackage { - pname = "ppx_metaquot"; - hash = "1vz8bi56jsz8w0894vgbfsfvmdyh5k1dgv45l8vhkks0s7d3ldji"; - propagatedBuildInputs = [ ppxlib ]; - meta.description = "Deprecated (see ppxlib)"; - }; - - ppx_traverse = janePackage { - pname = "ppx_traverse"; - hash = "1p2n5da4mxh9fk4gvxlibc706bs5xwkbppxd1x0ip1vln5pabbq5"; - propagatedBuildInputs = [ ppxlib ]; - meta.description = "Deprecated (see ppxlib)"; - }; - - ppx_traverse_builtins = janePackage { - pname = "ppx_traverse_builtins"; - hash = "0qlf7i8h8k3a9h8nhb0ki3y1knr6wgbm24f1qaqni53fpvzv0pfb"; - propagatedBuildInputs = [ ppxlib ]; - meta.description = "Deprecated (see ppxlib)"; - }; - - ppx_type_conv = janePackage { - pname = "ppx_type_conv"; - hash = "04dbrglqqhkas25cpjz8xhjcbpk141c35qggzw66bn69izczfmaf"; - propagatedBuildInputs = [ ppxlib ]; - meta.description = "Deprecated (see ppxlib)"; - }; - - # Miscellaneous Jane Street packages - - core_bench = janePackage { - pname = "core_bench"; - hash = "10i28ssfdqxxhq0rvnlp581lr1cq2apkhmm8j83fksjkmbxcrasc"; - propagatedBuildInputs = [ core_extended ]; - meta.description = "Micro-benchmarking library for OCaml"; - }; - - csvfields = janePackage { - pname = "csvfields"; - hash = "10zw4fjlniivfdzzz79lnbvcjnhk5y16m1p8mn4xbs23n6mbix0f"; - propagatedBuildInputs = [ core expect_test_helpers ]; - meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv"; - }; - - ecaml = janePackage { - pname = "ecaml"; - hash = "1is5156q59s427x3q5nh9wsi8h1x77670bmyilqxasy39yway7g8"; - propagatedBuildInputs = [ async expect_test_helpers_kernel ]; - meta.description = "Writing Emacs plugin in OCaml"; - }; - - incremental_kernel = janePackage { - version = "0.11.1"; - pname = "incremental_kernel"; - hash = "1qp9dqncx2h0np0rndqaic4dna8f1dlkqnbjfcdhcim5dp2vg4x6"; - propagatedBuildInputs = [ core_kernel ]; - meta.description = "Library for incremental computations depending only on core_kernel"; - }; - - incremental = janePackage { - pname = "incremental"; - hash = "1xchd3v4kj56wixjrsnj7m7l0374cgkzybihs2b62mn65xf6n7ki"; - propagatedBuildInputs = [ core incremental_kernel ]; - meta.description = "Library for incremental computations"; - }; - - incr_map = janePackage { - pname = "incr_map"; - hash = "01vx9aldxpigz5ah9h337xcw73a7r8449v8l2xbralljhs0zglx9"; - propagatedBuildInputs = [ incremental_kernel ]; - meta.description = "Helpers for incremental operations on map like data structures"; - }; - - parsexp_io = janePackage { - pname = "parsexp_io"; - hash = "0rhdl40jiirvv6fhgjk50n8wzs3jly5d8dyyyfgpjgl39mwkjjnb"; - propagatedBuildInputs = [ parsexp ppx_js_style ]; - meta.description = "S-expression parsing library (IO functions)"; - }; - - patience_diff = janePackage { - pname = "patience_diff"; - hash = "0q7a64fgg97qcd6d8c45gyz63x5vq004axxqvvfg92b8f3x2plx4"; - propagatedBuildInputs = [ core_kernel ]; - meta.description = "Tool and library implementing patience diff"; - }; - - posixat = janePackage { - pname = "posixat"; - hash = "04rs4sl0r4rg9m6l9kkqkmc4n87sv4a4w9ibq4zsjk9j4n6r2df8"; - propagatedBuildInputs = [ ppx_optcomp ppx_sexp_conv sexplib ]; - meta.description = "Binding to the posix *at functions"; - }; - - rpc_parallel = janePackage { - pname = "rpc_parallel"; - hash = "13dx59x73i8mkwv2qkh8gx6kk8arlvghj57k1jdscdmzmyqc9gvn"; - propagatedBuildInputs = [ async ]; - meta.description = "Type-safe library for building parallel applications"; - }; - - shexp = janePackage { - version = "0.11.1"; - pname = "shexp"; - hash = "06yssp7bsmabaxvw9bqxyrsji1gkvl7if5adba3v6h4kilqy7rqg"; - propagatedBuildInputs = [ posixat spawn ]; - meta.description = "Process library and s-expression based shell"; - }; - - topological_sort = janePackage { - pname = "topological_sort"; - hash = "1qnz5b1rs45lsl1ycxd1lglpmh8444gy5khhdp5fvxy987zkzklz"; - propagatedBuildInputs = [ core_kernel ]; - meta.description = "Topological sort algorithm"; - }; + async = null; + async_kernel = null; + async_unix = null; + base = null; + core = null; + core_bench = null; + core_kernel = null; + ocaml-compiler-libs = null; + ppx_custom_printf = null; + ppx_expect = null; + ppx_hash = null; + ppx_here = null; + ppx_inline_test = null; + ppx_jane = null; + ppx_js_style = null; + ppx_let = null; + ppx_optcomp = null; + ppx_sexp_conv = null; + sexplib0 = null; + sexplib = null; + spawn = null; + stdio = null; } diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix deleted file mode 100644 index f4cef99046ad..000000000000 --- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.11.0" }: - -{ pname, version ? defaultVersion, hash, buildInputs ? [], ...}@args: - -buildDunePackage (args // { - inherit version buildInputs; - - duneVersion = "1"; - - minimalOCamlVersion = "4.04"; - - src = fetchFromGitHub { - owner = "janestreet"; - repo = pname; - rev = "v${version}"; - sha256 = hash; - }; - - meta = { - license = lib.licenses.asl20; - homepage = "https://github.com/janestreet/${pname}"; - } // args.meta; -}) diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix index 5ab455ddff3e..e5a79ba598f4 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix @@ -1,11 +1,9 @@ { lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.12.0" }: -{ pname, version ? defaultVersion, hash, ...}@args: +{ pname, version ? defaultVersion, duneVersion ? "1", hash, ...}@args: buildDunePackage (args // { - inherit version; - - duneVersion = "1"; + inherit version duneVersion; minimalOCamlVersion = "4.07"; diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index 80d408f1e350..0998b5d6a134 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -17,6 +17,7 @@ let param = { }; "0.13.0" = { sha256 = "sha256-geHz0whQDg5/YQjVsN2iuHlkClwh7z3Eqb2QOBzuOdk="; + min_version = "4.07"; max_version = "4.11"; useDune2 = false; OMP = [ ocaml-migrate-parsetree ]; diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 2f5d2cd603b3..eaab20f7f2e7 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -13,7 +13,7 @@ let version_sha = if lib.versionAtLeast ocaml.version "4.08" }; in -buildDunePackage (rec { +buildDunePackage rec { pname = "re"; version = version_sha.version; @@ -34,6 +34,4 @@ buildDunePackage (rec { |