From 412450dcd771addd3b8119b09871fcf416aedb81 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 4 Jan 2021 16:11:20 +0100 Subject: ocamlPackages.mirage-crypto*: 0.8.7 -> 0.8.8 New package: ocamlPackages.mirage-crypto-rng-async --- .../ocaml-modules/mirage-crypto/default.nix | 4 ++-- .../ocaml-modules/mirage-crypto/rng-async.nix | 25 ++++++++++++++++++++++ .../ocaml-modules/mirage-crypto/rng-mirage.nix | 6 ++++-- 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index f963e8e15d08..c2ede31dd3f1 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -4,11 +4,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.8.7"; + version = "0.8.8"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "1gx86h6kk39zq3kvl854jc2ap2755paalp1f7iv8r9js2xnbxfxy"; + sha256 = "19czylfyakckfzzcbqgv9ygl243wix7ak8zkbdcb9hcl2k2shswb"; }; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix new file mode 100644 index 000000000000..e8c8dd06eab5 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-async.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage +, mirage-crypto, mirage-crypto-rng +, dune-configurator, async, logs +}: + +buildDunePackage { + pname = "mirage-crypto-rng-async"; + + inherit (mirage-crypto) useDune2 version minimumOCamlVersion src; + + nativeBuildInputs = [ + dune-configurator + ]; + + propagatedBuildInputs = [ + async + logs + mirage-crypto + mirage-crypto-rng + ]; + + meta = mirage-crypto.meta // { + description = "Feed the entropy source in an Async-friendly way"; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix index 473704d7ea22..5152d3c8ecde 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/rng-mirage.nix @@ -1,5 +1,7 @@ { buildDunePackage, mirage-crypto-rng, duration, cstruct, mirage-runtime -, mirage-time, mirage-clock, mirage-unix, mirage-time-unix, mirage-clock-unix }: +, mirage-time, mirage-clock, mirage-unix, mirage-time-unix, mirage-clock-unix +, logs, lwt +}: buildDunePackage { pname = "mirage-crypto-rng-mirage"; @@ -10,7 +12,7 @@ buildDunePackage { checkInputs = [ mirage-unix mirage-clock-unix mirage-time-unix ]; propagatedBuildInputs = [ duration cstruct mirage-crypto-rng mirage-runtime - mirage-time mirage-clock ]; + mirage-time mirage-clock logs lwt ]; meta = mirage-crypto-rng.meta // { description = "Entropy collection for a cryptographically secure PRNG"; -- cgit v1.2.3 From a2dfc892daf3973d4ae0ff004e758a1e43058dae Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 Dec 2020 16:12:12 +0100 Subject: ocamlPackages.trie: init at 1.0.0 Strict impure trie tree in OCaml --- pkgs/development/ocaml-modules/trie/default.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 pkgs/development/ocaml-modules/trie/default.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/trie/default.nix b/pkgs/development/ocaml-modules/trie/default.nix new file mode 100644 index 000000000000..935f71a5e224 --- /dev/null +++ b/pkgs/development/ocaml-modules/trie/default.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, fetchFromGitHub }: + +buildDunePackage rec { + pname = "trie"; + version = "1.0.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "kandu"; + repo = pname; + rev = version; + sha256 = "0s7p9swjqjsqddylmgid6cv263ggq7pmb734z4k84yfcrgb6kg4g"; + }; + + meta = { + inherit (src.meta) homepage; + license = lib.licenses.mit; + description = "Strict impure trie tree"; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} -- cgit v1.2.3 From 343eb4dc37df38176becee8314ff9bd21e6378a9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 Dec 2020 16:12:47 +0100 Subject: ocamlPackages.mew: init at 0.1.0 A general modal editing engine generator --- pkgs/development/ocaml-modules/mew/default.nix | 27 ++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/development/ocaml-modules/mew/default.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/mew/default.nix b/pkgs/development/ocaml-modules/mew/default.nix new file mode 100644 index 000000000000..819bb020050c --- /dev/null +++ b/pkgs/development/ocaml-modules/mew/default.nix @@ -0,0 +1,27 @@ +{ lib, buildDunePackage, fetchFromGitHub +, result, trie +}: + +buildDunePackage rec { + pname = "mew"; + version = "0.1.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "kandu"; + repo = pname; + rev = version; + sha256 = "0417xsghj92v3xa5q4dk4nzf2r4mylrx2fd18i7cg3nzja65nia2"; + }; + + propagatedBuildInputs = [ result trie ]; + + meta = { + inherit (src.meta) homepage; + license = lib.licenses.mit; + description = "Modal Editing Witch"; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} -- cgit v1.2.3 From 321c46c6e8bea60a16411aef2d866e7846a10d51 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 Dec 2020 16:13:07 +0100 Subject: ocamlPackages.mew_vi: init at 0.5.0 This is a vi-like modal editing engine generator. --- pkgs/development/ocaml-modules/mew_vi/default.nix | 27 +++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/development/ocaml-modules/mew_vi/default.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/mew_vi/default.nix b/pkgs/development/ocaml-modules/mew_vi/default.nix new file mode 100644 index 000000000000..39228585fe3c --- /dev/null +++ b/pkgs/development/ocaml-modules/mew_vi/default.nix @@ -0,0 +1,27 @@ +{ lib, buildDunePackage, fetchFromGitHub +, mew, react +}: + +buildDunePackage rec { + pname = "mew_vi"; + version = "0.5.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "kandu"; + repo = pname; + rev = version; + sha256 = "0lihbf822k5zasl60w5mhwmdkljlq49c9saayrws7g4qc1j353r8"; + }; + + propagatedBuildInputs = [ mew react ]; + + meta = { + inherit (src.meta) homepage; + license = lib.licenses.mit; + description = "Modal Editing Witch, VI interpreter"; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} -- cgit v1.2.3 From 6b0396351eff4b51685d179560884e2a19051bb8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 29 Dec 2020 16:13:17 +0100 Subject: =?UTF-8?q?ocamlPackages.lambdaTerm:=202.0.3=20=E2=86=92=203.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.utop: 2.4.3 → 2.6.0 --- .../ocaml-modules/lambda-term/default.nix | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index f02ff4d29962..0d5babad0428 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl, libev, buildDunePackage, zed, lwt_log, lwt_react }: +{ lib, fetchFromGitHub, buildDunePackage, zed, lwt_log, lwt_react, mew_vi }: buildDunePackage rec { pname = "lambda-term"; - version = "2.0.3"; + version = "3.1.0"; - src = fetchurl { - url = "https://github.com/ocaml-community/lambda-term/releases/download/${version}/lambda-term-${version}.tbz"; - sha256 = "1n1b3ffj41a1lm2315hh870yj9h8gg8g9jcxha6dr3xx8r84np3v"; + useDune2 = true; + + src = fetchFromGitHub { + owner = "ocaml-community"; + repo = pname; + rev = version; + sha256 = "1k0ykiz0vhpyyj9fkss29ajas4fh1xh449j702xkvayqipzj1mkg"; }; - buildInputs = [ libev ]; - propagatedBuildInputs = [ zed lwt_log lwt_react ]; + propagatedBuildInputs = [ zed lwt_log lwt_react mew_vi ]; meta = { description = "Terminal manipulation library for OCaml"; longDescription = '' @@ -28,10 +31,10 @@ buildDunePackage rec { console applications. ''; - homepage = "https://github.com/diml/lambda-term"; - license = stdenv.lib.licenses.bsd3; + inherit (src.meta) homepage; + license = lib.licenses.bsd3; maintainers = [ - stdenv.lib.maintainers.gal_bolle + lib.maintainers.gal_bolle ]; }; } -- cgit v1.2.3 From bd31e667782618cce9801432db759ec69c8e5e6c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 31 Dec 2020 08:21:50 +0100 Subject: ocamlPackages.bisect_ppx-ocamlbuild: remove at 1.4.0 This package is no longer maintained. --- pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix b/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix deleted file mode 100644 index 6a98267d89a5..000000000000 --- a/pkgs/development/ocaml-modules/bisect_ppx-ocamlbuild/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ buildDunePackage, bisect_ppx, ocamlbuild }: - -buildDunePackage { - minimumOCamlVersion = "4.02"; - inherit (bisect_ppx) version src meta; - pname = "bisect_ppx-ocamlbuild"; - propagatedBuildInputs = [ ocamlbuild ]; -} -- cgit v1.2.3 From ccc474d77ba7694976815d60c0f02ae9f4699eb7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 31 Dec 2020 08:28:42 +0100 Subject: =?UTF-8?q?ocamlPackages.bisect=5Fppx:=201.4.0=20=E2=86=92=202.5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/bisect_ppx/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix index ce52c427cd07..eba010819949 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -1,24 +1,27 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, ocaml-migrate-parsetree, ppx_tools_versioned }: +{ lib, fetchFromGitHub, buildDunePackage, cmdliner, ocaml-migrate-parsetree, ppx_tools_versioned }: buildDunePackage rec { pname = "bisect_ppx"; - version = "1.4.0"; + version = "2.5.0"; + + useDune2 = true; src = fetchFromGitHub { owner = "aantron"; repo = "bisect_ppx"; rev = version; - sha256 = "1plhm4pvrhpapz5zaks194ji1fgzmp13y942g10pbn9m7kgkqg4h"; + sha256 = "0w2qd1myvh333jvkf8hgrqzl8ns4xgfggk4frf1ij3jyc7qc0868"; }; buildInputs = [ + cmdliner ocaml-migrate-parsetree ppx_tools_versioned ]; meta = { description = "Code coverage for OCaml"; - license = stdenv.lib.licenses.mpl20; + license = lib.licenses.mit; homepage = "https://github.com/aantron/bisect_ppx"; }; } -- cgit v1.2.3 From 331186b9ac7edc9e9aea1fc692da8880a549e33f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 3 Jan 2021 10:14:22 +0100 Subject: =?UTF-8?q?ocamlPackages.bitstring:=203.1.1=20=E2=86=92=204.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.ppx_bitsring: init at 4.0.1 --- pkgs/development/ocaml-modules/bap/default.nix | 7 ++++++- pkgs/development/ocaml-modules/bitstring/default.nix | 13 +++++++------ pkgs/development/ocaml-modules/bitstring/ppx.nix | 18 ++++++++++++++++++ 3 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/ocaml-modules/bitstring/ppx.nix (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 66b1dd67a9f2..e860ad13d405 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -2,6 +2,7 @@ , ocaml, findlib, ocamlbuild, ocaml_oasis, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp, utop, libxml2, + ppx_bitstring, ppx_tools_versioned, which, makeWrapper, writeText , z3 @@ -40,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which makeWrapper ]; buildInputs = [ ocaml findlib ocamlbuild ocaml_oasis - llvm ppx_tools_versioned + llvm ppx_bitstring ppx_tools_versioned z3 utop libxml2 ]; @@ -63,6 +64,10 @@ stdenv.mkDerivation rec { patches = [ ./dont-add-curses.patch ]; + preConfigure = '' + substituteInPlace oasis/elf --replace bitstring.ppx ppx_bitstring + ''; + configureFlags = [ "--enable-everything ${disableIda}" "--with-llvm-config=${llvm}/bin/llvm-config" ]; BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)"; diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix index 386503039e05..583017d9ddec 100644 --- a/pkgs/development/ocaml-modules/bitstring/default.nix +++ b/pkgs/development/ocaml-modules/bitstring/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, ppx_tools_versioned, ounit }: +{ lib, fetchFromGitHub, buildDunePackage, stdlib-shims }: buildDunePackage rec { pname = "bitstring"; - version = "3.1.1"; + version = "4.0.1"; + + useDune2 = true; src = fetchFromGitHub { owner = "xguerin"; repo = pname; rev = "v${version}"; - sha256 = "1ys8xx174jf8v5sm0lbxvzhdlcs5p0fhy1gvf58gad2g4gvgpvxc"; + sha256 = "1z7jmgljvp52lvn3ml2cp6gssxqp4sikwyjf6ym97cycbcw0fjjm"; }; - buildInputs = [ ppx_tools_versioned ounit ]; - doCheck = true; + propagatedBuildInputs = [ stdlib-shims ]; - meta = with stdenv.lib; { + meta = with lib; { description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml"; homepage = "https://github.com/xguerin/bitstring"; license = licenses.lgpl21Plus; diff --git a/pkgs/development/ocaml-modules/bitstring/ppx.nix b/pkgs/development/ocaml-modules/bitstring/ppx.nix new file mode 100644 index 000000000000..ee0a8c51f732 --- /dev/null +++ b/pkgs/development/ocaml-modules/bitstring/ppx.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage, ocaml +, bitstring, ppxlib +, ounit +}: + +buildDunePackage rec { + pname = "ppx_bitstring"; + inherit (bitstring) version useDune2 src; + + buildInputs = [ bitstring ppxlib ]; + + doCheck = lib.versionAtLeast ocaml.version "4.08"; + checkInputs = [ ounit ]; + + meta = bitstring.meta // { + description = "Bitstrings and bitstring matching for OCaml - PPX extension"; + }; +} -- cgit v1.2.3 From 90d4109c23da03daeb7dece49f7f16492ae3d96c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 4 Jan 2021 08:43:44 +0100 Subject: =?UTF-8?q?ocamlPackages.lwt=5Fppx:=202.0.1=20=E2=86=92=202.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/eliom/default.nix | 2 ++ pkgs/development/ocaml-modules/lwt/ppx.nix | 15 +++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index de2955e57c92..5d3c53100449 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchzip, which, ocsigen_server, ocaml, lwt_react, opaline, ppx_deriving, findlib +, ppx_tools_versioned , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json , js_of_ocaml-lwt , js_of_ocaml-tyxml @@ -22,6 +23,7 @@ stdenv.mkDerivation rec }; buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline + ppx_tools_versioned ]; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/lwt/ppx.nix b/pkgs/development/ocaml-modules/lwt/ppx.nix index f2707064f2af..2df17844d1a0 100644 --- a/pkgs/development/ocaml-modules/lwt/ppx.nix +++ b/pkgs/development/ocaml-modules/lwt/ppx.nix @@ -1,8 +1,12 @@ -{ fetchzip, buildDunePackage, lwt, ppx_tools_versioned }: +{ fetchzip, buildDunePackage, lwt, ppxlib }: buildDunePackage { pname = "lwt_ppx"; - version = "2.0.1"; + version = "2.0.2"; + + useDune2 = true; + + minimumOCamlVersion = "4.04"; src = fetchzip { # `lwt_ppx` has a different release cycle than Lwt, but it's included in @@ -12,12 +16,11 @@ buildDunePackage { # # This is particularly useful for overriding Lwt without breaking `lwt_ppx`, # as new Lwt releases may contain broken `lwt_ppx` code. - url = "https://github.com/ocsigen/lwt/archive/5.2.0.tar.gz"; - sha256 = "1znw8ckwdmqsnrcgar4g33zgr659l4l904bllrz69bbwdnfmz2x3"; + url = "https://github.com/ocsigen/lwt/archive/5.4.0.tar.gz"; + sha256 = "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d"; }; - - propagatedBuildInputs = [ lwt ppx_tools_versioned ]; + propagatedBuildInputs = [ lwt ppxlib ]; meta = { description = "Ppx syntax extension for Lwt"; -- cgit v1.2.3 From a8be20b31c12df8f1d276359478e293e2083554b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 1 Jan 2021 15:28:06 +0100 Subject: ocamlPackages.ppx_tools_versioned: use dune 2 --- pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix index 958c088cd6a2..5200c13d89fd 100644 --- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "ppx_tools_versioned"; version = "5.4.0"; + useDune2 = true; + src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; -- cgit v1.2.3