diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet')
8 files changed, 117 insertions, 88 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.13.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.13.nix index b92027a65a0d..9ab45aa5b30d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.13.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.13.nix @@ -6,6 +6,7 @@ , ppxlib , re , openssl +, zarith }: rec { @@ -392,6 +393,13 @@ rec { propagatedBuildInputs = [ async ]; }; + async_interactive = janePackage { + pname = "async_interactive"; + hash = "1ma24pi3hqzrs1k12sc0aarhf42fap8nl1h7id6k01wp6s3yqi5d"; + meta.description = "Utilities for building simple command-line based user interfaces"; + propagatedBuildInputs = [ async ]; + }; + re2 = janePackage { pname = "re2"; hash = "0hmizznlzilynn5kh6149bbpkfw2l0xi7zi1y1fxfww2ma3wpim0"; @@ -477,6 +485,85 @@ rec { propagatedBuildInputs = [ async expect_test_helpers_kernel ]; }; + posixat = janePackage { + pname = "posixat"; + hash = "122fmd6v7fhiiivkxra539b5w3p5xkkd8mcjzvyb2msyq5zc6xa2"; + propagatedBuildInputs = [ ppx_optcomp ppx_sexp_conv ]; + meta.description = "Binding to the posix *at functions"; + }; + + shexp = janePackage { + pname = "shexp"; + hash = "0zdcyix0gdn4xmvbjzhbig63xw9jnw8ixj3ngs6g4k2vk77rs0gk"; + propagatedBuildInputs = [ posixat spawn ]; + meta.description = "Process library and s-expression based shell"; + }; + + csvfields = janePackage { + pname = "csvfields"; + hash = "19pnq9m9lkdgqfy9l21w779d6c8djr1dvvjq7r9kbgfwb04symmr"; + propagatedBuildInputs = [ core expect_test_helpers ]; + meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv"; + }; + + sexp_diff_kernel = janePackage { + pname = "sexp_diff_kernel"; + hash = "125gssd24vfcfbkpjlqbxijlc4jyw2n0wv1cnddcfvpn1f7cghzb"; + propagatedBuildInputs = [ core_kernel ]; + meta.description = "Code for computing the diff of two sexps"; + }; + + sexp_macro = janePackage { + pname = "sexp_macro"; + hash = "1rqs2r2ihwsqzgnqsdr0db6dqzz4q6s9hi1hvnwf0cb2vnkhsjln"; + propagatedBuildInputs = [ async sexplib ]; + meta.description = "Sexp macros"; + }; + + sexp_select = janePackage { + pname = "sexp_select"; + hash = "02yckmin937scqs2i45r2qqp56rqa6j2q04nfhnnxvn3bkb0qnb1"; + propagatedBuildInputs = [ base ppx_jane ]; + meta.description = "A library to use CSS-style selectors to traverse sexp trees"; + }; + + sexp = janePackage { + pname = "sexp"; + hash = "0cqp6syc4ap2nxgg1mvwwz2pmib48kp3gigzpjwh20wr38qq0p1r"; + propagatedBuildInputs = [ + async + core + csvfields + re2 + sexp_diff_kernel + sexp_macro + sexp_pretty + sexp_select + ]; + patches = ./sexp.patch; + meta.description = "S-expression swiss knife"; + }; + + zarith_stubs_js = janePackage { + pname = "zarith_stubs_js"; + hash = "0dldnf85rfyx8z63qjly9n8plj8nnkw4i5zrj5vbm7s2wjcfjzj1"; + meta.description = "Javascripts stubs for the Zarith library"; + }; + + bignum = janePackage { + pname = "bignum"; + hash = "0qldyl5mhlffnyps7n9y8qykm0ylrdiw5ii8zlww82zmmpp8zv5x"; + propagatedBuildInputs = [ core_kernel zarith zarith_stubs_js ]; + meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals"; + }; + + delimited_parsing = janePackage { + pname = "delimited_parsing"; + hash = "0siz746q28241wk0sv435lfvvips7sl151z5a1sbqanr3lm4s17w"; + propagatedBuildInputs = [ async core_extended ]; + meta.description = "Parsing of character (e.g., comma) separated and fixed-width values"; + }; + ### Packages at version 0.11, with dependencies at version 0.12 configurator = janePackage { diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix index 837504f9a7fe..25b498bb7da0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix @@ -529,14 +529,6 @@ rec { meta.description = "Writing Emacs plugin in OCaml"; }; - email_message = janePackage { - pname = "email_message"; - hash = "131jd72k4s8cdbgg6gyg7w5v8mphdlvdx4fgvh8d9a1m7kkvbxfg"; - propagatedBuildInputs = [ async angstrom core_extended cryptokit magic-mime ounit ]; - patches = [ ./email-message-angstrom-0.14.patch ]; - meta.description = "E-mail message parser"; - }; - incremental_kernel = janePackage { version = "0.11.1"; pname = "incremental_kernel"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch deleted file mode 100644 index 624a3e5334b2..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/email_address/src/email_address.ml b/email_address/src/email_address.ml -index 7470273..d070465 100644 ---- a/email_address/src/email_address.ml -+++ b/email_address/src/email_address.ml -@@ -38,7 +38,7 @@ module Stable = struct - let of_string ?default_domain input_str = - let open Core_kernel in - let open! Int.Replace_polymorphic_compare in -- match Angstrom.parse_string Email_address_parser_stable_v1.email_only input_str with -+ match Angstrom.parse_string ~consume:Prefix Email_address_parser_stable_v1.email_only input_str with - | Error error -> - Or_error.error_s [%message - "Failed to parse email address" -@@ -104,7 +104,7 @@ module T = Stable.V1.With_comparator - include T - - let list_of_string ?default_domain input_str = -- match Angstrom.parse_string Email_address_parser_stable_v1.email_list_only input_str with -+ match Angstrom.parse_string ~consume:Prefix Email_address_parser_stable_v1.email_list_only input_str with - | Error error -> - Or_error.error_s [%message - "Failed to parse email address(es)" diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-core.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-core.nix deleted file mode 100644 index c5789ee9cfb4..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-core.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, buildOcamlJane, ppx_tools}: - -buildOcamlJane { - name = "ppx_core"; - hash = "0df7vyai488lfkyh8szw2hvn22jsyrkfvq1b91j1s0g0y27nnfax"; - propagatedBuildInputs = - [ ppx_tools ]; - - meta = with stdenv.lib; { - description = "PPX standard library"; - maintainers = [ maintainers.maurer ]; - license = licenses.asl20; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix deleted file mode 100644 index b4fb9ec7602f..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, buildOcamlJane, - ppx_core, ppx_optcomp}: - -buildOcamlJane { - name = "ppx_driver"; - hash = "19cpfdn1n36vl5l9d6h7c61ffn0wmiipprn5by0354i5aywj8gpn"; - propagatedBuildInputs = - [ ppx_core ppx_optcomp ]; - - meta = with stdenv.lib; { - description = "A driver is an executable created from a set of OCaml AST transformers linked together with a command line frontend"; - maintainers = [ maintainers.maurer ]; - license = licenses.asl20; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix deleted file mode 100644 index 4f55a6c4eacb..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix +++ /dev/null @@ -1,14 +0,0 @@ -{stdenv, buildOcamlJane, - ppx_core, ppx_driver, ppx_here, ppx_tools}: - -buildOcamlJane { - name = "ppx_fail"; - hash = "1ms5axpc0zg469zj4799nz3wwxi6rmmyvqj52dy03crmpj71s18l"; - propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_tools ]; - - meta = with stdenv.lib; { - description = "Syntax extension that makes failwith include a position"; - maintainers = [ maintainers.maurer ]; - license = licenses.asl20; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix deleted file mode 100644 index bf36dfab5cb0..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix +++ /dev/null @@ -1,15 +0,0 @@ -{stdenv, buildOcamlJane, - ppx_core, ppx_deriving, ppx_driver, ppx_tools}: - -buildOcamlJane { - name = "ppx_type_conv"; - hash = "0gv0mqwn97dwrfm6rj442565y8dz7kiq8s8vadnhywrl7j4znqyq"; - propagatedBuildInputs = - [ ppx_core ppx_deriving ppx_driver ppx_tools ]; - - meta = with stdenv.lib; { - description = "The type_conv library factors out functionality needed by different preprocessors that generate code from type specifications"; - maintainers = [ maintainers.maurer ]; - license = licenses.asl20; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/sexp.patch b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/sexp.patch new file mode 100644 index 000000000000..e56ce6508db1 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/janestreet/sexp.patch @@ -0,0 +1,30 @@ +diff --git a/lazy_list/src/dune b/lazy_list/src/dune +index f1650ad..df90914 100644 +--- a/lazy_list/src/dune ++++ b/lazy_list/src/dune +@@ -1,2 +1,3 @@ + (library (name lazy_list) (libraries core_kernel) ++ (public_name sexp.lazy_list) + (preprocess (pps ppx_jane))) +\ No newline at end of file +diff --git a/sexp_app/pattern/dune b/sexp_app/pattern/dune +index b7d2c3b..baf136b 100644 +--- a/sexp_app/pattern/dune ++++ b/sexp_app/pattern/dune +@@ -1,4 +1,5 @@ + (library (name sexp_app_pattern) (libraries core re2 sexplib str) ++ (public_name sexp.sexp_app_pattern) + (preprocess (pps ppx_jane))) + + (ocamllex lexer) +diff --git a/sexp_app/src/dune b/sexp_app/src/dune +index b91ff40..a07a4e7 100644 +--- a/sexp_app/src/dune ++++ b/sexp_app/src/dune +@@ -1,4 +1,5 @@ + (library (name sexp_app) (libraries core lazy_list re2 sexplib str) ++ (public_name sexp.sexp_app) + (preprocess (pps ppx_jane -allow-unannotated-ignores))) + + (ocamllex csv_lexeme) +\ No newline at end of file |