diff options
| author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
|---|---|---|
| committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
| commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
| tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/development/ocaml-modules | |
| parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
| parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) | |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/ocaml-modules')
139 files changed, 1099 insertions, 483 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/angstrom-async/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/angstrom-async/default.nix index ac900a8dd186..60e774918d5d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/angstrom-async/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/angstrom-async/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "angstrom-async"; - inherit (angstrom) version src; + inherit (angstrom) version useDune2 src; minimumOCamlVersion = "4.04.1"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix index d249c4512914..eb4de44d7a6e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "angstrom-lwt-unix"; - inherit (angstrom) version src; + inherit (angstrom) version useDune2 src; minimumOCamlVersion = "4.03"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/angstrom-unix/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/angstrom-unix/default.nix index 0d4ab400dd3e..134c161d266f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/angstrom-unix/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/angstrom-unix/default.nix @@ -3,7 +3,7 @@ buildDunePackage rec { pname = "angstrom-unix"; - inherit (angstrom) version src; + inherit (angstrom) version useDune2 src; minimumOCamlVersion = "4.03"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix index 75eb2255ee78..749a043e739e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,8 +1,9 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, result, bigstringaf, ppx_let }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, result, bigstringaf, ppx_let }: buildDunePackage rec { pname = "angstrom"; version = "0.15.0"; + useDune2 = true; minimumOCamlVersion = "4.04"; @@ -14,6 +15,7 @@ buildDunePackage rec { }; checkInputs = [ alcotest ppx_let ]; + buildInputs = [ ocaml-syntax-shims ]; propagatedBuildInputs = [ bigstringaf result ]; doCheck = lib.versionAtLeast ocaml.version "4.05"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix index 0da1ab74e199..79c4d8a50024 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix @@ -13,8 +13,21 @@ stdenv.mkDerivation rec { buildInputs = [ perl gmp mpfr ppl ocaml findlib camlidl ]; propagatedBuildInputs = [ mlgmpidl ]; - prefixKey = "-prefix "; - preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; + outputs = [ "out" "bin" "dev" ]; + + configurePhase = '' + runHook preConfigure + ./configure -prefix $out + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs + runHook postConfigure + ''; + + postInstall = '' + mkdir -p $dev/lib + mv $out/lib/ocaml $dev/lib/ + mkdir -p $bin + mv $out/bin $bin/ + ''; meta = { license = stdenv.lib.licenses.lgpl21; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 556c749011fa..ddc181a49928 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -6,11 +6,13 @@ buildDunePackage rec { minimumOCamlVersion = "4.05"; pname = "asn1-combinators"; - version = "0.2.3"; + version = "0.2.4"; + + useDune2 = true; src = fetchurl { url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz"; - sha256 = "1z73hc17f5m2i4bfxw0g94fsri67f8vha812mm8klz4ggs8y7d6r"; + sha256 = "09rn5wwqhwg7x51b9ycl15s7007hgha6lwaz2bpw85fr70jq3i9r"; }; propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix index b63601608919..f790a87e22c5 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix @@ -1,12 +1,25 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: -stdenv.mkDerivation rec { - version = "0.8.3"; - name = "ocaml${ocaml.version}-astring-${version}"; +let + # Use astring 0.8.3 for OCaml < 4.05 + param = + if stdenv.lib.versionAtLeast ocaml.version "4.05" + then { + version = "0.8.5"; + sha256 = "1ykhg9gd3iy7zsgyiy2p9b1wkpqg9irw5pvcqs3sphq71iir4ml6"; + } else { + version = "0.8.3"; + sha256 = "0ixjwc3plrljvj24za3l9gy0w30lsbggp8yh02lwrzw61ls4cri0"; + }; +in + +stdenv.mkDerivation { + name = "ocaml${ocaml.version}-astring-${param.version}"; + inherit (param) version; src = fetchurl { - url = "https://erratique.ch/software/astring/releases/astring-${version}.tbz"; - sha256 = "0ixjwc3plrljvj24za3l9gy0w30lsbggp8yh02lwrzw61ls4cri0"; + url = "https://erratique.ch/software/astring/releases/astring-${param.version}.tbz"; + inherit (param) sha256; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix index b2e3e0c5e74d..de0bc13e2833 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix @@ -1,25 +1,17 @@ -{ lib, fetchpatch, fetchzip, buildDunePackage, alcotest, bos }: - -let version = "3.2.0"; in +{ lib, fetchurl, buildDunePackage, alcotest, bos, dune-configurator }: buildDunePackage rec { pname = "base64"; - inherit version; - - src = fetchzip { - url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz"; - sha256 = "1ilw3zj0w6cq7i4pvr8m2kv5l5f2y9aldmv72drlwwns013b1gwy"; - }; + version = "3.4.0"; - minimumOCamlVersion = "4.03"; + useDune2 = true; - buildInputs = [ bos ]; + src = fetchurl { + url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-v${version}.tbz"; + sha256 = "0d0n5gd4nkdsz14jnxq13f1f7rzxmndg5xql039a8wfppmazd70w"; + }; - # Fix test-suite for alcotest ≥ 1.0 - patches = [(fetchpatch { - url = "https://github.com/mirage/ocaml-base64/commit/8d334d02aa52875158fae3e2fb8fe0a5596598d0.patch"; - sha256 = "0lvqdp98qavpzis1wgwh3ijajq79hq47898gsrk37fpyjbrdzf5q"; - })]; + buildInputs = [ bos dune-configurator ]; doCheck = true; checkInputs = [ alcotest ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix index 43fc0696e2e7..87622ab0fbf0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,22 +1,15 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, qtest, num }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: -let version = "3.1.0"; in +let version = "3.2.0"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-batteries-${version}"; src = fetchurl { url = "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v${version}/batteries-${version}.tar.gz"; - sha256 = "0bq1np3ai3r559s3vivn45yid25fwz76rvbmsg30j57j7cyr3jqm"; + sha256 = "0a77njgc6c6kz4rpwqgmnii7f1na6hzsa55nqqm3dndhq9xh628w"; }; - # Fix a test case - patches = [(fetchpatch { - url = "https://github.com/ocaml-batteries-team/batteries-included/commit/7cbd9617d4efa5b3d647b1cc99d9a25fa01ac6dd.patch"; - sha256 = "0q4kq10psr7n1xdv4rspk959n1a5mk9524pzm5v68ab2gkcgm8sk"; - - })]; - buildInputs = [ ocaml findlib ocamlbuild ]; checkInputs = [ qtest ]; propagatedBuildInputs = [ num ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix index 9f6810379aef..852459c2bac1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bigstringaf/default.nix @@ -2,7 +2,9 @@ buildDunePackage rec { pname = "bigstringaf"; - version = "0.6.0"; + version = "0.7.0"; + + useDune2 = true; minimumOCamlVersion = "4.03"; @@ -10,7 +12,7 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "04b088vrqzmxsyan9f9nr8721bxip4b930cgvb5zkbbmrw3ylmwc"; + sha256 = "1q1sqxzdnlrpl95ccrhl7lwy3zswgd9rbn19ildclh0lyi2vazbj"; }; checkInputs = [ alcotest ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix index be62a1c6d2cd..b7cab4cef6d1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { pname = "biocaml"; version = "0.10.1"; - owner = "biocaml"; + useDune2 = true; minimumOCamlVersion = "4.07"; src = fetchFromGitHub { - inherit owner; + owner = "biocaml"; repo = pname; rev = "v${version}"; sha256 = "1f19nc8ld0iv45jjnsvaah3ddj88s2n9wj8mrz726kzg85cfr8xj"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix index 9603f283ee4f..78ca63ab90c2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix @@ -5,6 +5,9 @@ buildDunePackage rec { pname = "bistro"; version = "0.5.0"; + + useDune2 = true; + src = fetchFromGitHub { owner = "pveber"; repo = pname; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bitstring/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bitstring/default.nix index 2f413d37352c..386503039e05 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bitstring/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/bitstring/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "bitstring"; - version = "3.0.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "xguerin"; repo = pname; rev = "v${version}"; - sha256 = "0r49qax7as48jgknzaq6p9rbpmrvnmlic713wzz5bj60j5h0396f"; + sha256 = "1ys8xx174jf8v5sm0lbxvzhdlcs5p0fhy1gvf58gad2g4gvgpvxc"; }; buildInputs = [ ppx_tools_versioned ounit ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix new file mode 100644 index 000000000000..65b411c52d52 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ca-certs/default.nix @@ -0,0 +1,29 @@ +{ lib, buildDunePackage, fetchurl +, bos, fpath, rresult, ptime, mirage-crypto, x509, astring, logs +}: + +buildDunePackage rec { + pname = "ca-certs"; + version = "0.1.3"; + + minimumOCamlVersion = "4.07"; + + src = fetchurl { + url = "https://github.com/mirage/ca-certs/releases/download/v${version}/ca-certs-v${version}.tbz"; + sha256 = "0jpghxjp2n8wx6ig0d2x87ycaql6mb92w8ai3xh3jb288m7g02zn"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ bos fpath rresult ptime mirage-crypto x509 astring logs ]; + + # tests need access to network and systemwide ca cert chain + doCheck = false; + + meta = with lib; { + description = "Detect root CA certificates from the operating system"; + maintainers = [ maintainers.sternenseemann ]; + license = licenses.isc; + homepage = "https://github.com/mirage/ca-certs"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix index 5874e7a52d35..ba36cfa05b99 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/camlimages/default.nix @@ -1,8 +1,10 @@ -{ lib, fetchFromGitLab, buildDunePackage, dune-configurator, cppo, lablgtk, stdio }: +{ lib, fetchFromGitLab, buildDunePackage, dune-configurator, cppo +, graphics, lablgtk, stdio +}: buildDunePackage rec { pname = "camlimages"; - version = "5.0.3"; + version = "5.0.4"; useDune2 = true; @@ -12,10 +14,10 @@ buildDunePackage rec { owner = "camlspotter"; repo = pname; rev = version; - sha256 = "1ng9pkvrzlibfyf97iqvmbsqcykz8v1ln106xhq9nigih5i68zyd"; + sha256 = "1m2c76ghisg73dikz2ifdkrbkgiwa0hcmp21f2fm2rkbf02rq3f4"; }; - buildInputs = [ dune-configurator cppo lablgtk stdio ]; + buildInputs = [ dune-configurator cppo graphics lablgtk stdio ]; meta = with lib; { branch = "5.0"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix index 731dd476c5d7..810099810470 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/checkseum/default.nix @@ -1,19 +1,21 @@ -{ lib, fetchurl, buildDunePackage +{ lib, fetchurl, buildDunePackage, dune-configurator , bigarray-compat, optint -, cmdliner, fmt, rresult +, fmt, rresult , alcotest }: buildDunePackage rec { - version = "0.1.1"; + version = "0.2.1"; pname = "checkseum"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/checkseum/releases/download/v${version}/checkseum-v${version}.tbz"; - sha256 = "0aa2r1l65a5hcgciw6n8r5ij4gpgg0cf9k24isybxiaiz63k94d3"; + sha256 = "1swb44c64pcs4dh9ka9lig6d398qwwkd3kkiajicww6qk7jbh3n5"; }; - buildInputs = [ cmdliner fmt rresult ]; + buildInputs = [ dune-configurator fmt rresult ]; propagatedBuildInputs = [ bigarray-compat optint ]; checkInputs = lib.optionals doCheck [ alcotest ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix index 6cb802e437d7..3fed7c55d452 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cohttp/default.nix @@ -7,6 +7,8 @@ buildDunePackage rec { pname = "cohttp"; version = "2.5.4"; + useDune2 = true; + minimumOCamlVersion = "4.04.1"; src = fetchurl { diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix index 1f261be62022..8357d748ce8f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -8,7 +8,7 @@ else buildDunePackage { pname = "cohttp-lwt"; - inherit (cohttp) version src meta; + inherit (cohttp) version src useDune2 meta; buildInputs = [ uri ppx_sexp_conv ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix index 27b2a329b26e..b800d6b7ba4a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/conduit/default.nix @@ -6,6 +6,7 @@ buildDunePackage rec { pname = "conduit"; version = "2.2.2"; + useDune2 = true; minimumOCamlVersion = "4.07"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix index 9bcd98e06a49..6514586f9d93 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/conduit/lwt.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "conduit-lwt"; - inherit (conduit) version src minimumOCamlVersion; + inherit (conduit) version src useDune2 minimumOCamlVersion; buildInputs = [ ppx_sexp_conv ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix index 9cbaabd9cf1e..3694a7b2941b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix @@ -1,12 +1,14 @@ { buildDunePackage, containers +, dune-configurator , gen, iter, qcheck }: buildDunePackage { pname = "containers-data"; - inherit (containers) src version; + inherit (containers) src version useDune2; + buildInputs = [ dune-configurator ]; doCheck = true; checkInputs = [ gen iter qcheck ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix index 970122dd79f3..c3847acb9594 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix @@ -1,19 +1,23 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml +, dune-configurator , seq , gen, iter, ounit, qcheck, uutf }: buildDunePackage rec { - version = "3.0"; + version = "3.0.1"; pname = "containers"; + useDune2 = true; + src = fetchFromGitHub { owner = "c-cube"; repo = "ocaml-containers"; rev = "v${version}"; - sha256 = "0c75d5csgc68qqbsdz4279nlin111zrjbg4d47k32ska28myvpqn"; + sha256 = "1m19cfcwks3xcj16nqldfb49dg0vdc7by1q1j8bpac3z2mjvks0l"; }; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ seq ]; checkInputs = [ gen iter ounit qcheck uutf ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix index 787854f8e416..13ee99804d8c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cow/default.nix @@ -2,6 +2,7 @@ , uri, xmlm, omd, ezjsonm }: buildDunePackage rec { + useDune2 = true; minimumOCamlVersion = "4.02.3"; version = "2.4.0"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix index 69f8445e2173..272ff72d8c59 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -1,43 +1,29 @@ -{ stdenv, fetchurl, zlib, ocaml, findlib, ocamlbuild, zarith, ncurses }: +{ lib, buildDunePackage, fetchurl, zlib, dune-configurator, zarith, ncurses }: -assert stdenv.lib.versionAtLeast ocaml.version "3.12"; - -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" - then { - version = "1.14"; - url = "https://github.com/xavierleroy/cryptokit/archive/release114.tar.gz"; - sha256 = "0wkh72idkb7dahiwyl94hhbq27cc7x9fnmxkpnbqli6wi8wd7d05"; - inherit zarith; - } else { - version = "1.10"; - url = "http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz"; - sha256 = "1k2f2ixm7jcsgrzn9lz1hm9qqgq71lk9lxy3v3cwsd8xdrj3jrnv"; - zarith = null; - }; -in - -stdenv.mkDerivation { +buildDunePackage { pname = "cryptokit"; - inherit (param) version; + version = "1.16.1"; + + useDune2 = true; src = fetchurl { - inherit (param) url sha256; + url = "https://github.com/xavierleroy/cryptokit/archive/release1161.tar.gz"; + sha256 = "0kzqkk451m69nqi5qiwak0rd0rp5vzi613gcngsiig7dyxwka61c"; }; - buildInputs = [ ocaml findlib ocamlbuild ncurses ]; - propagatedBuildInputs = [ param.zarith zlib ]; + dontConfigure = true; - buildFlags = [ "setup.data" "build" ]; + buildInputs = [ dune-configurator ncurses ]; + propagatedBuildInputs = [ zarith zlib ]; - preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; + doCheck = true; meta = { homepage = "http://pauillac.inria.fr/~xleroy/software.html"; description = "A library of cryptographic primitives for OCaml"; - platforms = ocaml.meta.platforms or []; + license = lib.licenses.lgpl2Only; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix index 01a32fc09a20..acd5d83e4f1e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,14 +1,20 @@ -{ lib, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage, bigarray-compat }: buildDunePackage rec { pname = "cstruct"; - version = "4.0.0"; + version = "5.0.0"; + + useDune2 = true; + + minimumOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-v${version}.tbz"; - sha256 = "1q4fsc2m6d96yf42g3wb3gcnhpnxw800df5mh3yr25pprj8y4m1a"; + sha256 = "1z403q2nkgz5x07j0ypy6q0mk2yxgqbp1jlqkngbajna7124x2pb"; }; + propagatedBuildInputs = [ bigarray-compat ]; + meta = { description = "Access C-like structures directly from OCaml"; license = lib.licenses.isc; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix index 5a10d7cae48d..f340bfcda25e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/lwt.nix @@ -6,7 +6,7 @@ else buildDunePackage { pname = "cstruct-lwt"; - inherit (cstruct) version src meta; + inherit (cstruct) version src useDune2 meta; minimumOCamlVersion = "4.02"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix index 22fe4ac47cf3..feb8feac6b68 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, cstruct, sexplib, ppx_tools_versioned }: +{ lib, buildDunePackage, cstruct, sexplib, ppx_tools_versioned, ppxlib }: if !lib.versionAtLeast (cstruct.version or "1") "3" then cstruct @@ -6,9 +6,9 @@ else buildDunePackage { pname = "ppx_cstruct"; - inherit (cstruct) version src meta; + inherit (cstruct) version src useDune2 meta; minimumOCamlVersion = "4.03"; - propagatedBuildInputs = [ cstruct ppx_tools_versioned sexplib ]; + propagatedBuildInputs = [ cstruct ppx_tools_versioned ppxlib sexplib ]; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix index d0df442013ff..04bb10d6f75e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/sexp.nix @@ -6,7 +6,7 @@ else buildDunePackage rec { pname = "cstruct-sexp"; - inherit (cstruct) version src meta; + inherit (cstruct) version src useDune2 meta; doCheck = lib.versionAtLeast ocaml.version "4.03"; checkInputs = lib.optional doCheck alcotest; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix index 7cb5d6658696..b7e0df0185c1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/cstruct/unix.nix @@ -6,7 +6,7 @@ else buildDunePackage { pname = "cstruct-unix"; - inherit (cstruct) version src meta; + inherit (cstruct) version src useDune2 meta; minimumOCamlVersion = "4.06"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix index e541f0741a6e..8a16dcec343b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ctypes-${version}"; - version = "0.16.0"; + version = "0.17.1"; src = fetchzip { url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "0qh2gfx5682wkk2nm1ybspzz9c2xvlnnf6iv08a89kbwa1hvdqrg"; + sha256 = "16brmdnz7wi2z25qqhd5s5blyq4app6jbv6g9pa4vyg6h0nzbcys"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix index a17ea72140ff..236b9c19c928 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/curly/default.nix @@ -1,25 +1,26 @@ -{ lib, buildDunePackage, fetchFromGitHub, ocaml +{ stdenv, buildDunePackage, fetchurl, ocaml , result, alcotest, cohttp-lwt-unix, odoc, curl }: buildDunePackage rec { pname = "curly"; - version = "unstable-2019-11-14"; + version = "0.2.0"; minimumOCamlVersion = "4.02"; useDune2 = true; - src = fetchFromGitHub { - owner = "rgrinberg"; - repo = pname; - rev = "33a538c89ef8279d4591454a7f699a4183dde5d0"; - sha256 = "10pxbvf5xrsajaxrccxh2lqhgp3yaf61z9w03rvb2mq44nc2dggz"; + src = fetchurl { + url = "https://github.com/rgrinberg/curly/releases/download/${version}/curly-${version}.tbz"; + sha256 = "07vqdrklar0d5i83ip7sjw2c1v18a9m3anw07vmi5ay29pxzal6k"; }; propagatedBuildInputs = [ result ]; checkInputs = [ alcotest cohttp-lwt-unix ]; - # test dependencies are only available for >= 4.05 - doCheck = lib.versionAtLeast ocaml.version "4.05"; + # test dependencies are only available for >= 4.08 + doCheck = stdenv.lib.versionAtLeast ocaml.version "4.08" + # Some test fails in macOS sandbox + # > Fatal error: exception Unix.Unix_error(Unix.EPERM, "bind", "") + && !stdenv.isDarwin; postPatch = '' substituteInPlace src/curly.ml \ diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix index 753f894e0850..a3bf3456ed0d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/decompress/default.nix @@ -7,6 +7,8 @@ buildDunePackage rec { version = "0.9.0"; pname = "decompress"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/decompress/releases/download/v${version}/decompress-v${version}.tbz"; sha256 = "0fryhcvv96vfca51c7kqdn3n3canqsbbvfbi75ya6lca4lmpipbh"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix index d02104decba3..dd8a0f571649 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/digestif/default.nix @@ -1,27 +1,27 @@ -{ lib, fetchurl, fetchpatch, buildDunePackage +{ lib, ocaml, fetchurl, buildDunePackage , bigarray-compat, eqaf, stdlib-shims -, alcotest +, alcotest, astring, bos, findlib, fpath }: buildDunePackage rec { pname = "digestif"; - version = "0.8.0"; + version = "0.9.0"; + + useDune2 = true; src = fetchurl { url = "https://github.com/mirage/digestif/releases/download/v${version}/digestif-v${version}.tbz"; - sha256 = "09g4zngqiw97cljv8ds4m063wcxz3y7c7vzaprsbpjzi0ja5jdcy"; + sha256 = "0vk9prgjp46xs8qizq7szkj6mqjj2ymncs2016bc8zswcdc1a3q4"; }; - # Fix tests with alcotest ≥ 1 - patches = [ (fetchpatch { - url = "https://github.com/mirage/digestif/commit/b65d996c692d75da0a81323253429e07d14b72b6.patch"; - sha256 = "0sf7qglcp19dhs65pwrrc7d9v57icf18jsrhpmvwskx8b4dchfiv"; - })]; - - buildInputs = lib.optional doCheck alcotest; propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ]; - doCheck = true; + checkInputs = [ alcotest astring bos fpath ]; + doCheck = lib.versionAtLeast ocaml.version "4.05"; + + postCheck = '' + ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ test/test_runes.ml + ''; meta = { description = "Simple hash algorithms in OCaml"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/dispatch/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/dispatch/default.nix index 5de61169c365..65baa3dc4982 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/dispatch/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/dispatch/default.nix @@ -1,21 +1,23 @@ -{ lib, buildDunePackage, fetchFromGitHub, alcotest, result }: +{ lib, buildDunePackage, fetchFromGitHub, ocaml, alcotest, result }: buildDunePackage rec { pname = "dispatch"; - version = "0.4.1"; + version = "0.5.0"; + + useDune2 = true; src = fetchFromGitHub { owner = "inhabitedtype"; repo = "ocaml-dispatch"; - rev = "${version}"; - sha256 = "05kb9zcihk50r2haqz8vrlr7kmaka6vrs4j1z500lmnl877as6qr"; + rev = version; + sha256 = "12r39ylbxc297cbwjadhd1ghxnwwcdzfjk68r97wim8hcgzxyxv4"; }; propagatedBuildInputs = [ result ]; - checkInputs = lib.optional doCheck alcotest; + checkInputs = [ alcotest ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.05"; meta = { inherit (src.meta) homepage; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix index 09753c14b35d..21d9d02da4b8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/dns/default.nix @@ -6,6 +6,7 @@ buildDunePackage rec { pname = "dns"; version = "4.6.2"; + useDune2 = true; minimumOCamlVersion = "4.07"; src = fetchurl { diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix index 1c6b59961ef2..8c9dad42fd7a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/duff/default.nix @@ -7,6 +7,9 @@ buildDunePackage rec { pname = "duff"; version = "0.2"; + + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/duff/releases/download/v${version}/duff-v${version}.tbz"; sha256 = "0bi081w4349cqc1n9jsjh1lrcqlnv3nycmvh9fniscv8lz1c0gjq"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix index decbb4117670..b36874d49da6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/earlybird/default.nix @@ -10,6 +10,8 @@ buildDunePackage rec { pname = "earlybird"; version = "0.1.5"; + useDune2 = true; + minimumOCamlVersion = "4.04"; src = fetchurl { diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix index d86dc01dcb71..a3f64cb7bd95 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/eqaf/default.nix @@ -4,6 +4,7 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; pname = "eqaf"; version = "0.7"; + useDune2 = true; src = fetchurl { url = "https://github.com/mirage/eqaf/releases/download/v${version}/eqaf-v${version}.tbz"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix index 546fc904ffce..5e04c73c3025 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix @@ -3,11 +3,11 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; stdenv.mkDerivation { - name = "ocaml${ocaml.version}-extlib-1.7.6"; + name = "ocaml${ocaml.version}-extlib-1.7.7"; src = fetchurl { - url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.6.tar.gz"; - sha256 = "0wfs20v1yj5apdbj7214wdsr17ayh0qqq7ihidndvc8nmmwfa1dz"; + url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.7.tar.gz"; + sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1"; }; buildInputs = [ ocaml findlib cppo ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ezjsonm/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ezjsonm/default.nix index 781af8a4c98b..269288ef3cd9 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -1,15 +1,17 @@ -{ stdenv, fetchzip, buildDunePackage, jsonm, hex, sexplib }: +{ stdenv, fetchurl, buildDunePackage, jsonm, hex, sexplib0 }: buildDunePackage rec { pname = "ezjsonm"; - version = "0.6.0"; + version = "1.2.0"; - src = fetchzip { - url = "https://github.com/mirage/${pname}/archive/${version}.tar.gz"; - sha256 = "18g64lhai0bz65b9fil12vlgfpwa9b5apj7x6d7n4zzm18qfazvj"; + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/ezjsonm/releases/download/v${version}/ezjsonm-v${version}.tbz"; + sha256 = "1q6cf63cc614lr141rzhm2w4rhi1snfqai6fmkhvfjs84hfbw2w7"; }; - propagatedBuildInputs = [ jsonm hex sexplib ]; + propagatedBuildInputs = [ jsonm hex sexplib0 ]; meta = { description = "An easy interface on top of the Jsonm library"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix index 0c3eb5459cb2..48a6a82a738c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix @@ -2,7 +2,9 @@ buildDunePackage rec { pname = "faraday"; - version = "0.7.0"; + version = "0.7.2"; + + useDune2 = true; minimumOCamlVersion = "4.02"; @@ -10,12 +12,12 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "0z6ikwlqad91iac0q5z88p3wzq5k15y86ckzmhdq1aqwrcm14bq2"; + sha256 = "0gdysszzk6b6npic4nhpdnz2nbq7rma6aml0rbn113bfh0rmb36x"; }; - checkInputs = lib.optional doCheck alcotest; + checkInputs = [ alcotest ]; propagatedBuildInputs = [ bigstringaf ]; - doCheck = lib.versions.majorMinor ocaml.version != "4.07"; + doCheck = lib.versionAtLeast ocaml.version "4.05"; meta = { description = "Serialization library built for speed and memory efficiency"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/fiat-p256/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/fiat-p256/default.nix index ac7e6640eeab..3ebe98ab775d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/fiat-p256/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/fiat-p256/default.nix @@ -5,6 +5,7 @@ buildDunePackage rec { pname = "fiat-p256"; version = "0.2.1"; + useDune2 = true; src = fetchurl { url = "https://github.com/mirage/fiat/releases/download/v${version}/${pname}-v${version}.tbz"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/functoria/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/functoria/default.nix index 330ab26e8e64..4f1083203997 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/functoria/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/functoria/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, buildDunePackage, alcotest, cmdliner +{ lib, fetchurl, buildDunePackage, alcotest, cmdliner , rresult, astring, fmt, ocamlgraph, logs, bos, fpath, ptime }: buildDunePackage rec { pname = "functoria"; - version = "3.1.0"; + version = "3.1.1"; + + useDune2 = true; minimumOCamlVersion = "4.04"; src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "15jdqdj1vfi0x9gjydrrnbwzwbzw34w1iir032jrji820xlblky2"; + sha256 = "0bihxbq16zwsi7frk4b8wz8993mvy2ym3n6288jhv0n0gb7c2f7m"; }; propagatedBuildInputs = [ cmdliner rresult astring fmt ocamlgraph logs bos fpath ptime ]; @@ -18,7 +20,7 @@ buildDunePackage rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A DSL to organize functor applications"; homepage = "https://github.com/mirage/functoria"; license = licenses.isc; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/functoria/runtime.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/functoria/runtime.nix index 806ae82b6ef4..2ba13ce87389 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/functoria/runtime.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/functoria/runtime.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "functoria-runtime"; - inherit (functoria) version src; + inherit (functoria) version useDune2 src; propagatedBuildInputs = [ cmdliner fmt ]; checkInputs = [ alcotest functoria]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index b01d4b4a04c2..348a70a0da9f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,10 +1,13 @@ -{ stdenv, fetchFromGitHub, buildDunePackage -, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm +{ lib, fetchFromGitHub, buildDunePackage, ocaml +, cryptokit, ocamlnet, ocurl, yojson +, ounit }: buildDunePackage rec { pname = "gapi-ocaml"; - version = "0.3.19"; + version = "0.4.1"; + + useDune2 = true; minimumOCamlVersion = "4.02"; @@ -12,16 +15,18 @@ buildDunePackage rec { owner = "astrada"; repo = pname; rev = "v${version}"; - sha256 = "04arif1p1vj5yr24cwicj70b7yx17hrgf4pl47vqg8ngcrdh71v9"; + sha256 = "0riax23grjnq9pczmp1yv02ji0svvs2kbiqskj6f6yjviamnpa31"; }; - propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib ocamlnet yojson ]; - buildInputs = [ xmlm ]; + propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ]; + + doCheck = lib.versionAtLeast ocaml.version "4.04"; + checkInputs = [ ounit ]; meta = { description = "OCaml client for google services"; homepage = "http://gapi-ocaml.forge.ocamlcore.org"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ bennofs ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bennofs ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix index c292c3d6ab5f..aebdf4adb27f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix @@ -1,6 +1,4 @@ -{ lib, fetchurl, buildDunePackage, pkg-config, gsl -, dune-configurator -}: +{ stdenv, fetchurl, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }: buildDunePackage rec { pname = "gsl"; @@ -14,11 +12,12 @@ buildDunePackage rec { }; buildInputs = [ dune-configurator gsl pkg-config ]; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; - meta = { + meta = with stdenv.lib; { homepage = "https://mmottl.github.io/gsl-ocaml/"; description = "OCaml bindings to the GNU Scientific Library"; - license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.vbgl ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ vbgl ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/hex/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/hex/default.nix index 8e9dd2db2500..526989734abd 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/hex/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/hex/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchurl, buildDunePackage, cstruct }: +{ stdenv, fetchurl, buildDunePackage, bigarray-compat, cstruct }: buildDunePackage rec { pname = "hex"; - version = "1.3.0"; + version = "1.4.0"; + + useDune2 = true; minimumOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/hex-v${version}.tbz"; - sha256 = "193567pn58df3b824vmfanncdfgf9cxzl7q3rq39zl9szvzhvkja"; + sha256 = "07b9y0lmnflsslkrm6xilkj40n8sf2hjqkyqghnk7sw5l0plkqsp"; }; - propagatedBuildInputs = [ cstruct ]; + propagatedBuildInputs = [ bigarray-compat cstruct ]; doCheck = true; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix index 42e7c1eac1b6..fbc21108bd02 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/httpaf/default.nix @@ -1,19 +1,31 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, angstrom, faraday, alcotest }: +{ lib, fetchFromGitHub, fetchpatch, buildDunePackage +, angstrom, faraday, alcotest +}: buildDunePackage rec { pname = "httpaf"; - version = "0.4.1"; + version = "0.6.6"; + + useDune2 = true; src = fetchFromGitHub { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "0i2r004ihj00hd97475y8nhjqjln58xx087zcjl0dfp0n7q80517"; + sha256 = "065ikryv8zw9cbk6ddcjcind88ckk0inz9m3sqj9nwyfw4v4scm6"; }; - checkInputs = lib.optional doCheck alcotest; + patches = [ + # Fix tests with angstrom ≥ 0.14 + (fetchpatch { + url = "https://github.com/inhabitedtype/httpaf/commit/fc0de5f2f1bd8df953ae4d4c9a61032392436c84.patch"; + sha256 = "1a8ca76ifbgyaq1bqfyq18mmxinjjparzkrr7ljbj0y1z1rl748z"; + }) + ]; + + checkInputs = [ alcotest ]; propagatedBuildInputs = [ angstrom faraday ]; - doCheck = lib.versions.majorMinor ocaml.version != "4.07"; + doCheck = true; meta = { description = "A high-performance, memory-efficient, and scalable web server for OCaml"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix index 12b8a757e16f..46bd4b962681 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/imagelib/default.nix @@ -4,6 +4,9 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; version = "20191011"; pname = "imagelib"; + + useDune2 = true; + src = fetchFromGitHub { owner = "rlepigre"; repo = "ocaml-imagelib"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/imagelib/unix.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/imagelib/unix.nix index 48986b15a8f8..a188165a48fa 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/imagelib/unix.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/imagelib/unix.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "imagelib-unix"; - inherit (imagelib) version src meta; + inherit (imagelib) version src useDune2 meta; propagatedBuildInputs = [ imagelib ]; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix index a949b339c729..ca14c3ca8739 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "integers"; - version = "0.3.0"; + version = "0.4.0"; src = fetchzip { url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz"; - sha256 = "1yhif5zh4srh63mhimfx3p5ljpb3lixjdd3i9pjnbj2qgpzlqj8p"; + sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd"; }; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix index 31ae0cfc19ed..46908369e571 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/io-page/default.nix @@ -4,6 +4,7 @@ buildDunePackage rec { pname = "io-page"; version = "2.3.0"; + useDune2 = true; minimumOCamlVersion = "4.02.3"; src = fetchurl { diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/io-page/unix.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/io-page/unix.nix index b3f7f878b276..843451b30866 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/io-page/unix.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/io-page/unix.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "io-page-unix"; - inherit (io-page) version src minimumOCamlVersion; + inherit (io-page) version src useDune2 minimumOCamlVersion; propagatedBuildInputs = [ cstruct io-page ]; checkInputs = [ ounit ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ipaddr/cstruct.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ipaddr/cstruct.nix index b6240d39ebd3..d1386230452c 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ipaddr/cstruct.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ipaddr/cstruct.nix @@ -5,7 +5,7 @@ buildDunePackage rec { pname = "ipaddr-cstruct"; - inherit (ipaddr) version src minimumOCamlVersion; + inherit (ipaddr) version src useDune2 minimumOCamlVersion; propagatedBuildInputs = [ ipaddr cstruct ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix index a4a6f9fc7a14..3090066c2f4e 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -6,7 +6,7 @@ buildDunePackage rec { pname = "ipaddr"; - inherit (macaddr) version src minimumOCamlVersion; + inherit (macaddr) version src useDune2 minimumOCamlVersion; propagatedBuildInputs = [ macaddr domain-name stdlib-shims ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix index 8d6186d6338f..1ede3c064ada 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ipaddr/sexp.nix @@ -5,7 +5,7 @@ buildDunePackage rec { pname = "ipaddr-sexp"; - inherit (ipaddr) version src minimumOCamlVersion; + inherit (ipaddr) version src useDune2 minimumOCamlVersion; propagatedBuildInputs = [ ipaddr ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix index 66f3f26285ed..d7b3ff64d30f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/iter/default.nix @@ -1,9 +1,13 @@ -{ lib, fetchFromGitHub, buildDunePackage, ocaml, mdx, qtest, result }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, dune-configurator +, mdx, qtest, result +}: buildDunePackage rec { pname = "iter"; version = "1.2.1"; + useDune2 = true; + src = fetchFromGitHub { owner = "c-cube"; repo = pname; @@ -11,10 +15,11 @@ buildDunePackage rec { sha256 = "0j2sg50byn0ppmf6l36ksip7zx1d3gv7sc4hbbxs2rmx39jr7vxh"; }; - buildInputs = lib.optionals doCheck [ mdx.bin qtest ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ result ]; doCheck = lib.versionAtLeast ocaml.version "4.07"; + checkInputs = [ mdx.bin qtest ]; meta = { homepage = "https://github.com/c-cube/sequence"; 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 diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix index a4cf0aae6918..1c7622f2805a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/jwto/default.nix @@ -5,6 +5,8 @@ buildDunePackage rec { pname = "jwto"; version = "0.3.0"; + useDune2 = true; + minimumOCamlVersion = "4.05"; src = fetchFromGitHub { diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ke/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ke/default.nix index e1b68a1d2da4..f14383207ea6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ke/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ke/default.nix @@ -7,6 +7,8 @@ buildDunePackage rec { pname = "ke"; version = "0.4"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/ke/releases/download/v${version}/ke-v${version}.tbz"; sha256 = "13c9xy60vmq29mnwpg3h3zgl6gjbjfwbx1s0crfc6xwvark0zxnx"; @@ -14,7 +16,7 @@ buildDunePackage rec { propagatedBuildInputs = [ bigarray-compat fmt ]; - checkInputs = lib.optionals doCheck [ alcotest bigstringaf ]; + checkInputs = [ alcotest bigstringaf ]; doCheck = true; minimumOCamlVersion = "4.03"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix index 23b38e469b4b..b7f5cb44818b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/lacaml/default.nix @@ -1,31 +1,31 @@ -{ stdenv, fetchFromGitHub, darwin, ocaml, findlib, dune, base, stdio, lapack, blas }: +{ stdenv, fetchurl, darwin, buildDunePackage, dune-configurator +, lapack, blas +}: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.05.0"; assert (!blas.isILP64) && (!lapack.isILP64); -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-lacaml"; - version = "11.0.6"; +buildDunePackage rec { + pname = "lacaml"; + version = "11.0.8"; - src = fetchFromGitHub { - owner = "mmottl"; - repo = "lacaml"; - rev = version; - sha256 = "1vn5441fg45d0ni9x87dhz2x4jrmvg3w7qk3vvcrd436snvh07g0"; + useDune2 = true; + + minimumOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/mmottl/lacaml/releases/download/${version}/lacaml-${version}.tbz"; + sha256 = "1i47wqnd9iy6ndbi9zfahpb592gahp6im26rgpwch13vgzk3kifd"; }; - buildInputs = [ ocaml findlib dune base stdio ]; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ lapack blas ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; - inherit (dune) installPhase; - meta = with stdenv.lib; { - homepage = "http://mmottl.github.io/lacaml"; + homepage = "https://mmottl.github.io/lacaml"; description = "OCaml bindings for BLAS and LAPACK"; license = licenses.lgpl21Plus; - platforms = ocaml.meta.platforms or []; - maintainers = [ maintainers.rixed ]; + maintainers = [ maintainers.vbgl ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix index f535ee78fef9..de5fbf63b383 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/lambdasoup/default.nix @@ -1,18 +1,25 @@ -{ lib, fetchFromGitHub, buildDunePackage, markup }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, markup, ounit2 }: buildDunePackage rec { pname = "lambdasoup"; - version = "0.7.1"; + version = "0.7.2"; + + minimumOCamlVersion = "4.02"; + + useDune2 = true; src = fetchFromGitHub { owner = "aantron"; repo = pname; rev = version; - sha256 = "14lndpsnzjjg58sdwxqpsv7kz77mnwn5658lya9jyaclj8azmaks"; + sha256 = "0php51lyz3ll0psazjd59yw02xb9w84150gkyiwmn3fa0iq8nf7m"; }; propagatedBuildInputs = [ markup ]; + doCheck = lib.versionAtLeast ocaml.version "4.04"; + checkInputs = [ ounit2 ]; + meta = { description = "Functional HTML scraping and rewriting with CSS in OCaml"; homepage = "https://aantron.github.io/lambdasoup/"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix index 6e69bc1e5c50..38ccaea65eba 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/lua-ml/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "lindig"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "04lv98nxmzanvyn4c0k6k0ax29f5xfdl8qzpf5hwadslq213a044"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/macaddr/cstruct.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/macaddr/cstruct.nix index 991a77a6ba21..143230408920 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/macaddr/cstruct.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/macaddr/cstruct.nix @@ -7,6 +7,8 @@ buildDunePackage { inherit (macaddr) version src minimumOCamlVersion; + useDune2 = true; + propagatedBuildInputs = [ macaddr cstruct ]; doCheck = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix index 08b486bb683a..5552393b4086 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/macaddr/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "macaddr"; version = "5.0.1"; + useDune2 = true; + minimumOCamlVersion = "4.04"; src = fetchurl { diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix index 3d0305c4be38..35cc7c6b4401 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/macaddr/sexp.nix @@ -7,6 +7,8 @@ buildDunePackage { inherit (macaddr) version src minimumOCamlVersion; + useDune2 = true; + propagatedBuildInputs = [ ppx_sexp_conv ]; checkInputs = [ macaddr-cstruct ounit ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/markup/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/markup/default.nix index 8b3525d26345..a8246e1cc7e8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/markup/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/markup/default.nix @@ -1,23 +1,26 @@ -{ lib, buildDunePackage, fetchzip, uutf }: +{ lib, buildDunePackage, fetchzip, ocaml, uchar, uutf, ounit2 }: buildDunePackage rec { pname = "markup"; - version = "0.8.2"; + version = "1.0.0"; + + useDune2 = true; src = fetchzip { url = "https://github.com/aantron/markup.ml/archive/${version}.tar.gz"; - sha256 = "13zcrwzjmifniv3bvjbkd2ah8wwa3ld75bxh1d8hrzdvfxzh9szn"; - }; + sha256 = "09hkrf9pw6hpb9j06p5bddklpnjwdjpqza3bx2179l970yl67an9"; + }; + + propagatedBuildInputs = [ uchar uutf ]; - propagatedBuildInputs = [ uutf ]; + checkInputs = [ ounit2 ]; + doCheck = lib.versionAtLeast ocaml.version "4.04"; meta = with lib; { homepage = "https://github.com/aantron/markup.ml/"; description = "A pair of best-effort parsers implementing the HTML5 and XML specifications"; license = licenses.mit; - maintainers = with maintainers; [ - gal_bolle - ]; + maintainers = with maintainers; [ gal_bolle ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix index 893b667f8364..58fcab5313a2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix @@ -2,18 +2,20 @@ buildDunePackage rec { pname = "metrics"; - version = "0.1.0"; + version = "0.2.0"; + + useDune2 = true; minimumOCamlVersion = "4.04"; src = fetchurl { url = "https://github.com/mirage/metrics/releases/download/${version}/metrics-${version}.tbz"; - sha256 = "0jy88anrx3rh19046rrbrjmx922zvz3wlqkk8asilqv9pbvpnp1a"; + sha256 = "0j215cji3n78lghzi9m6kgr3r1s91v681hfnn7cgybb31d7gjkqg"; }; propagatedBuildInputs = [ fmt ]; - checkInputs = lib.optional doCheck alcotest; + checkInputs = [ alcotest ]; doCheck = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/influx.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/influx.nix new file mode 100644 index 000000000000..8394ec0c0f94 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/influx.nix @@ -0,0 +1,14 @@ +{ buildDunePackage, metrics +, astring, duration, fmt, lwt +}: + +buildDunePackage rec { + pname = "metrics-influx"; + inherit (metrics) version useDune2 src; + + propagatedBuildInputs = [ astring duration fmt lwt metrics ]; + + meta = metrics.meta // { + description = "Influx reporter for the Metrics library"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/lwt.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/lwt.nix index 47b91e430c65..7085ff58148b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/lwt.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/lwt.nix @@ -1,11 +1,11 @@ -{ buildDunePackage, ocaml_lwt, metrics }: +{ buildDunePackage, logs, ocaml_lwt, metrics }: buildDunePackage { pname = "metrics-lwt"; - inherit (metrics) version src; + inherit (metrics) version useDune2 src; - propagatedBuildInputs = [ ocaml_lwt metrics ]; + propagatedBuildInputs = [ logs ocaml_lwt metrics ]; meta = metrics.meta // { description = "Lwt backend for the Metrics library"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/mirage.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/mirage.nix new file mode 100644 index 000000000000..4a891505ac71 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/mirage.nix @@ -0,0 +1,14 @@ +{ buildDunePackage, metrics, metrics-influx +, cstruct, ipaddr, logs, lwt, mirage-clock, mirage-stack +}: + +buildDunePackage { + pname = "metrics-mirage"; + inherit (metrics) version useDune2 src; + + propagatedBuildInputs = [ cstruct ipaddr logs lwt metrics metrics-influx mirage-clock mirage-stack ]; + + meta = metrics.meta // { + description = "Mirage backend for the Metrics library"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix index 45a92f108038..5a7bae1b29f3 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix @@ -1,14 +1,14 @@ -{ lib, buildDunePackage, gnuplot, ocaml_lwt, metrics, metrics-lwt, mtime, uuidm }: +{ buildDunePackage, gnuplot, ocaml_lwt, metrics, metrics-lwt, mtime, uuidm }: buildDunePackage rec { pname = "metrics-unix"; - inherit (metrics) version src; + inherit (metrics) version useDune2 src; propagatedBuildInputs = [ gnuplot ocaml_lwt metrics mtime uuidm ]; - checkInputs = lib.optional doCheck metrics-lwt; + checkInputs = [ metrics-lwt ]; doCheck = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-block/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-block/default.nix new file mode 100644 index 000000000000..28eb4d6b28ed --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-block/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, buildDunePackage +, cstruct, lwt, mirage-device +}: + +buildDunePackage rec { + pname = "mirage-block"; + version = "2.0.1"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/mirage-block/releases/download/v${version}/mirage-block-v${version}.tbz"; + sha256 = "1wp8wmixaz9i2sbvq6nkx903lbnpdgb2w404pz1wk8kcg9p3ilcc"; + }; + + propagatedBuildInputs = [ cstruct lwt mirage-device ]; + + meta = with lib; { + description = "Block signatures and implementations for MirageOS"; + homepage = "https://github.com/mirage/mirage-block"; + license = licenses.isc; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix new file mode 100644 index 000000000000..9b9a1ae185ec --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchurl, buildDunePackage +, lwt, parse-argv +}: + +buildDunePackage rec { + pname = "mirage-bootvar-unix"; + version = "0.1.0"; + + src = fetchurl { + url = "https://github.com/mirage/mirage-bootvar-unix/releases/download/${version}/mirage-bootvar-unix-${version}.tbz"; + sha256 = "0r92s6y7nxg0ci330a7p0hii4if51iq0sixn20cnm5j4a2clprbf"; + }; + + propagatedBuildInputs = [ lwt parse-argv ]; + + meta = { + description = "Unix implementation of MirageOS Bootvar interface"; + homepage = "https://github.com/mirage/mirage-bootvar-unix"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix new file mode 100644 index 000000000000..5b639e6fdd6e --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchurl, buildDunePackage +, cstruct, logs, lwt, mirage-flow +, alcotest, mirage-flow-combinators +}: + +buildDunePackage rec { + pname = "mirage-channel"; + version = "4.0.1"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/mirage-channel/releases/download/v${version}/mirage-channel-v${version}.tbz"; + sha256 = "0wmb2zhiyp8n78xgcspcsyd19bhcml3kyli2caw3778wc1gyvfpc"; + }; + + propagatedBuildInputs = [ cstruct logs lwt mirage-flow ]; + + doCheck = true; + checkInputs = [ alcotest mirage-flow-combinators ]; + + meta = { + description = "Buffered channels for MirageOS FLOW types"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/mirage/mirage-channel"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/default.nix index c5f0b1fc93c1..77d6b4ef7788 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-clock/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "mirage-clock"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { url = "https://github.com/mirage/mirage-clock/releases/download/v${version}/mirage-clock-v${version}.tbz"; - sha256 = "12m2dph69r843clrbcgfjj2gcxmq2kdb7g5d91kfj16g13b0vsa3"; + sha256 = "0cqa07aqkamw0dvis1fl46brvk81zvb92iy5076ik62gv9n5a0mn"; }; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-console/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-console/default.nix new file mode 100644 index 000000000000..ccde5c5f2ae2 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-console/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, buildDunePackage +, lwt, mirage-device, mirage-flow +}: + +buildDunePackage rec { + pname = "mirage-console"; + version = "3.0.2"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/mirage-console/releases/download/v${version}/mirage-console-v${version}.tbz"; + sha256 = "1fygk7pvlmwx6vd0h4cv9935xxhi64k2dgym41wf6qfkxgpp31lm"; + }; + + propagatedBuildInputs = [ lwt mirage-device mirage-flow ]; + + meta = { + description = "Implementations of Mirage console devices"; + homepage = "https://github.com/mirage/mirage-console"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix index e178e066a384..f963e8e15d08 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -4,11 +4,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.8.5"; + version = "0.8.7"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "0l6q0z5ghhy0djfscb2i2xg4dpmxs4xkwh16kc473cmb4hsxsmyk"; + sha256 = "1gx86h6kk39zq3kvl854jc2ap2755paalp1f7iv8r9js2xnbxfxy"; }; useDune2 = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/combinators.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/combinators.nix index 2ad6e5b0b974..d4904e77430a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/combinators.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/combinators.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "mirage-flow-combinators"; - inherit (mirage-flow) version src; + inherit (mirage-flow) version useDune2 src; propagatedBuildInputs = [ ocaml_lwt logs cstruct mirage-clock mirage-flow ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/default.nix index 25bb5e0f32d4..d6ba6603596a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/default.nix @@ -4,6 +4,7 @@ buildDunePackage rec { pname = "mirage-flow"; version = "2.0.1"; + useDune2 = true; minimumOCamlVersion = "4.05"; src = fetchurl { diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix index 7a20ca87f8f3..3bd676b45fa0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-flow/unix.nix @@ -4,7 +4,7 @@ buildDunePackage { pname = "mirage-flow-unix"; - inherit (mirage-flow) version src; + inherit (mirage-flow) version useDune2 src; propagatedBuildInputs = [ fmt logs mirage-flow ocaml_lwt cstruct ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-fs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-fs/default.nix new file mode 100644 index 000000000000..d8cfddff313c --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-fs/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, buildDunePackage +, cstruct, fmt, lwt, mirage-device, mirage-kv +}: + +buildDunePackage rec { + pname = "mirage-fs"; + version = "3.0.1"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/mirage-fs/releases/download/v${version}/mirage-fs-v${version}.tbz"; + sha256 = "0px18bgk528vr7iw78r0j3z4sdcz684sfcj47ibbly2adbvd64yk"; + }; + + propagatedBuildInputs = [ cstruct fmt lwt mirage-device mirage-kv ]; + + meta = { + description = "MirageOS signatures for filesystem devices"; + homepage = "https://github.com/mirage/mirage-fs"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix new file mode 100644 index 000000000000..20d83e166418 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-kv/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchurl, buildDunePackage +, fmt, mirage-device +, alcotest +}: + +buildDunePackage rec { + pname = "mirage-kv"; + version = "3.0.1"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/mirage-kv/releases/download/v${version}/mirage-kv-v${version}.tbz"; + sha256 = "1n736sjvdd8rkbc2b5jm9sn0w6hvhjycma5328r0l03v24vk5cki"; + }; + + propagatedBuildInputs = [ fmt mirage-device ]; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = { + description = "MirageOS signatures for key/value devices"; + homepage = "https://github.com/mirage/mirage-kv"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-logs/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-logs/default.nix new file mode 100644 index 000000000000..2a7670ce3722 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-logs/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchurl, buildDunePackage +, logs, lwt, mirage-clock, mirage-profile, ptime +, alcotest +}: + +buildDunePackage rec { + pname = "mirage-logs"; + version = "1.2.0"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/mirage-logs/releases/download/v${version}/mirage-logs-v${version}.tbz"; + sha256 = "0h0amzjxy067jljscib7fvw5q8k0adqa8m86affha9hq5jsh07a1"; + }; + + propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime ]; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = { + description = "A reporter for the Logs library that writes log messages to stderr, using a Mirage `CLOCK` to add timestamps"; + homepage = "https://github.com/mirage/mirage-logs"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-net/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-net/default.nix new file mode 100644 index 000000000000..a29727d7ee17 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-net/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, buildDunePackage +, cstruct, fmt, lwt, macaddr, mirage-device +}: + +buildDunePackage rec { + pname = "mirage-net"; + version = "3.0.1"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/mirage-net/releases/download/v${version}/mirage-net-v${version}.tbz"; + sha256 = "0yfvl0fgs7xy5i7kkparaa7a315a2h7kb1z24fmmnwnyaji57dg3"; + }; + + propagatedBuildInputs = [ cstruct fmt lwt macaddr mirage-device ]; + + meta = { + description = "Network signatures for MirageOS"; + homepage = "https://github.com/mirage/mirage-net"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-profile/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-profile/default.nix new file mode 100644 index 000000000000..c6ca730bf3c5 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-profile/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchurl, buildDunePackage +, ppx_cstruct +, cstruct, lwt +}: + +buildDunePackage rec { + pname = "mirage-profile"; + version = "0.9.1"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/mirage-profile/releases/download/v${version}/mirage-profile-v${version}.tbz"; + sha256 = "0lh3591ad4v7nxpd410b75idmgdq668mqdilvkg4avrwqw1wzdib"; + }; + + buildInputs = [ ppx_cstruct ]; + propagatedBuildInputs = [ cstruct lwt ]; + + meta = with lib; { + description = "Collect runtime profiling information in CTF format"; + homepage = "https://github.com/mirage/mirage-profile"; + license = licenses.bsd2; + maintainers = with maintainers; [ vbgl ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-protocols/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-protocols/default.nix index 47a534c21699..9f144bd2d7ee 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-protocols/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-protocols/default.nix @@ -2,11 +2,13 @@ buildDunePackage rec { pname = "mirage-protocols"; - version = "4.0.1"; + version = "5.0.0"; + + useDune2 = true; src = fetchurl { url = "https://github.com/mirage/mirage-protocols/releases/download/v${version}/mirage-protocols-v${version}.tbz"; - sha256 = "188m8x6xdw1bllwrpa8f8bqbdqy20kjfk7q8p8jf8j0daf7kl3mi"; + sha256 = "1bd6zgxhq2qliyzzarfvaj3ksr20ryghxq6h24i2hha7rwim63bk"; }; propagatedBuildInputs = [ duration ipaddr mirage-device mirage-flow ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-random/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-random/default.nix index 535c9286948e..defde0ba89fb 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-random/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-random/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "mirage-random"; version = "2.0.0"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/mirage-random/releases/download/v${version}/mirage-random-v${version}.tbz"; sha256 = "0qj41d5smkkkbjwsnz71bhhj94d2cwv53rf3j4rhky0pqbkidnv1"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix index 57e0f99ab1b6..dbcba59c4790 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix @@ -3,6 +3,7 @@ buildDunePackage rec { pname = "mirage-stack"; version = "2.2.0"; + useDune2 = true; src = fetchurl { url = "https://github.com/mirage/mirage-stack/releases/download/v${version}/mirage-stack-v${version}.tbz"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-unix/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-unix/default.nix index 696181f7f602..1e6dc0ef144f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-unix/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage-unix/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "mirage-unix"; version = "4.0.0"; + useDune2 = true; + src = fetchurl { url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; sha256 = "0kyd83bkpjhn382b4mw3a4325xr8vms78znxqvifpcyfvfnlx7hj"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage/default.nix new file mode 100644 index 000000000000..9a4d3f21cb87 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, ocaml +, functoria, mirage-runtime +}: + +buildDunePackage rec { + pname = "mirage"; + inherit (mirage-runtime) version src; + + useDune2 = true; + + outputs = [ "out" "dev" ]; + + propagatedBuildInputs = [ functoria mirage-runtime ]; + + installPhase = '' + runHook preInstall + dune install --prefix=$out --libdir=$dev/lib/ocaml/${ocaml.version}/site-lib/ ${pname} + runHook postInstall + ''; + + meta = mirage-runtime.meta // { + description = "The MirageOS library operating system"; + }; + +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix index 816e85d3c9ac..50121ad62802 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage/runtime.nix @@ -3,13 +3,15 @@ buildDunePackage rec { pname = "mirage-runtime"; - version = "3.8.1"; + version = "3.10.1"; - minimumOCamlVersion = "4.06"; + useDune2 = true; + + minimumOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mirage/mirage/releases/download/v${version}/mirage-v${version}.tbz"; - sha256 = "1sx9df041jb2rdrsibybifhml6h6kpzw9d2bw6vvv0ml500070ww"; + sha256 = "1glmsz2znhfkk4w6d6nsr7q5jqvivhmi8zwagzw2d8pah0c8bhm4"; }; propagatedBuildInputs = [ ipaddr functoria-runtime fmt logs ocaml_lwt ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage/types-lwt.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage/types-lwt.nix new file mode 100644 index 000000000000..ac232b0be6e1 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage/types-lwt.nix @@ -0,0 +1,13 @@ +{ lib, buildDunePackage, mirage-types +}: + +buildDunePackage { + pname = "mirage-types-lwt"; + inherit (mirage-types) version src useDune2; + + propagatedBuildInputs = [ mirage-types ]; + + meta = mirage-types.meta // { + description = "Lwt module type definitions for MirageOS applications"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage/types.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage/types.nix new file mode 100644 index 000000000000..f30a9e263bbc --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mirage/types.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, mirage +, mirage-block, mirage-channel, mirage-clock, mirage-console, mirage-device +, mirage-flow, mirage-fs, mirage-kv, mirage-net, mirage-protocols, mirage-random +, mirage-stack, mirage-time +}: + +buildDunePackage { + pname = "mirage-types"; + inherit (mirage) src version useDune2; + + propagatedBuildInputs = [ mirage-block mirage-channel mirage-clock + mirage-console mirage-device mirage-flow mirage-fs mirage-kv mirage-net + mirage-protocols mirage-random mirage-stack mirage-time + ]; + + meta = mirage.meta // { + description = "Module type definitions for MirageOS applications"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mstruct/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mstruct/default.nix deleted file mode 100644 index ae26f879ef8c..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mstruct/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, cstruct }: - -buildDunePackage rec { - pname = "mstruct"; - version = "1.4.0"; - - minimumOCamlVersion = "4.02"; - - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-${pname}"; - rev = "v${version}"; - sha256 = "1p4ygwzs3n1fj4apfib0z0sabpph21bkq1dgjk4bsa59pq4prncm"; - }; - - propagatedBuildInputs = [ cstruct ]; - - meta = { - description = "A thin mutable layer on top of cstruct"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (src.meta) homepage; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mustache/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mustache/default.nix index 267aa17e9e42..005e26926d1a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mustache/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/mustache/default.nix @@ -3,6 +3,7 @@ buildDunePackage rec { pname = "mustache"; version = "3.1.0"; + useDune2 = true; src = fetchFromGitHub { owner = "rgrinberg"; repo = "ocaml-mustache"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 026aeb220e56..dc6cef0bbba1 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -1,28 +1,24 @@ -{ stdenv, fetchgit, libvirt, autoconf, ocaml, findlib }: +{ stdenv, fetchFromGitLab, libvirt, autoreconfHook, pkg-config, ocaml, findlib, perl }: stdenv.mkDerivation rec { pname = "ocaml-libvirt"; - rev = "bab7f84ade84ceaddb08b6948792d49b3d04b897"; - version = "0.6.1.4.2017-11-08-unstable"; # libguestfs-1.34+ needs ocaml-libvirt newer than the latest release 0.6.1.4 + version = "0.6.1.5"; - src = fetchgit { - url = "git://git.annexia.org/git/ocaml-libvirt.git"; - rev = rev; - sha256 = "0vxgx1n58fp4qmly6i5zxiacr7303127d6j78a295xin1p3a8xcw"; + src = fetchFromGitLab { + owner = "libvirt"; + repo = "libvirt-ocaml"; + rev = "v${version}"; + sha256 = "0xpkdmknk74yqxgw8z2w8b7ss8hpx92xnab5fsqg2byyj55gzf2k"; }; propagatedBuildInputs = [ libvirt ]; - nativeBuildInputs = [ autoconf findlib ]; + nativeBuildInputs = [ autoreconfHook pkg-config findlib perl ]; buildInputs = [ ocaml ]; createFindlibDestdir = true; - preConfigure = '' - autoconf - ''; - buildPhase = "make all opt CPPFLAGS=-Wno-error"; installPhase = "make install-opt"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix new file mode 100644 index 000000000000..0db0164589cf --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -0,0 +1,66 @@ +{ buildDunePackage +, stdlib-shims +, ppx_yojson_conv_lib +, ocaml-syntax-shims +, omd +, octavius +, dune-build-info +, uutf +, csexp +, cmdliner +, fetchzip +, lib +}: +let + version = "1.1.0"; + src = fetchzip { + url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/ocaml-lsp-server-${version}.tbz"; + sha256 = "0al89waw43jl80k9z06kh44byhjhwb5hmzx07sddwi1kr1vc6jrb"; + }; + + # unvendor some (not all) dependencies. + # They are vendored by upstream only because it is then easier to install + # ocaml-lsp without messing with your opam switch, but nix should prevent + # this type of problems without resorting to vendoring. + preBuild = '' + rm -r vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner} + ''; + + buildInputs = [ + stdlib-shims + ppx_yojson_conv_lib + ocaml-syntax-shims + octavius + uutf + csexp + dune-build-info + omd + cmdliner + ]; + + lsp = buildDunePackage { + pname = "lsp"; + inherit version src; + useDune2 = true; + minimumOCamlVersion = "4.06"; + + inherit buildInputs preBuild; + }; + +in +buildDunePackage { + pname = "ocaml-lsp-server"; + inherit version src; + useDune2 = true; + + inherit preBuild; + + buildInputs = buildInputs ++ [ lsp ]; + + meta = with lib; { + description = "OCaml Language Server Protocol implementation"; + license = lib.licenses.isc; + platforms = platforms.unix; + maintainers = [ maintainers.symphorien ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix index bcd0a519899c..faadaf214f51 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ocaml-migrate-parsetree"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = "v${version}"; - sha256 = "0336vz0galjnsazbmkxjwdv1qvdqsx2rgrvp778xgq2fzasz45cx"; + sha256 = "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq"; }; propagatedBuildInputs = [ ppx_derivers result ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix new file mode 100644 index 000000000000..afe3d34963ae --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix @@ -0,0 +1,20 @@ +{ lib, fetchurl, buildDunePackage }: + +buildDunePackage rec { + pname = "ocaml-migrate-parsetree"; + version = "2.1.0"; + + minimumOCamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/ocaml-ppx/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "07x7lm45kny0mi0fjvzw51445brm0dgy099cw0gpyly0wj77hyrq"; + }; + + meta = { + description = "Convert OCaml parsetrees between different major versions"; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ vbgl sternenseemann ]; + homepage = "https://github.com/ocaml-ppx/ocaml-migrate-parsetree"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc/default.nix index 1ef7b6c2d40b..5abb026032be 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocaml-protoc/default.nix @@ -1,35 +1,27 @@ -{ stdenv, ocaml, fetchFromGitHub, ocamlbuild, findlib, ppx_deriving_protobuf }: +{ lib, fetchFromGitHub, buildDunePackage +, stdlib-shims +}: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ocaml-protoc-${version}"; - version = "1.2.0"; +buildDunePackage rec { + pname = "ocaml-protoc"; + version = "2.0.2"; + + useDune2 = true; minimumOCamlVersion = "4.02"; src = fetchFromGitHub { owner = "mransan"; repo = "ocaml-protoc"; - rev = "60d2d4dd55f73830e1bed603cc44d3420430632c"; - sha256 = "1d1p8ch723z2qa9azmmnhbcpwxbpzk3imh1cgkjjq4p5jwzj8amj"; + rev = version; + sha256 = "1vlnjqqpypmjhlyrxfzla79y4ilmc9ggz311giy6vmh4cyzl29h3"; }; - installPhase = '' - mkdir -p tmp/bin - export PREFIX=`pwd`/tmp - make all.install.build - make check_install - make lib.install - make bin.install - ''; - - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ ppx_deriving_protobuf ]; - - createFindlibDestdir = true; + buildInputs = [ stdlib-shims ]; doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mransan/ocaml-protoc"; description = "A Protobuf Compiler for OCaml"; license = licenses.mit; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 637c06e98dcf..5939e6164536 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, macaque, safepass, yojson +{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, safepass, yojson , cohttp-lwt-unix , resource-pooling }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; createFindlibDestdir = true; - + src = fetchFromGitHub { owner = "ocsigen"; repo = "ocsigen-start"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/odate/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/odate/default.nix new file mode 100644 index 000000000000..aed5e92765f8 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/odate/default.nix @@ -0,0 +1,29 @@ +{ lib, buildDunePackage, fetchFromGitHub +, menhir +}: + +buildDunePackage rec { + pname = "odate"; + version = "0.6"; + + useDune2 = true; + + minimumOCamlVersion = "4.07"; + + src = fetchFromGitHub { + owner = "hhugo"; + repo = pname; + rev = version; + sha256 = "1dk33lr0g2jnia2gqsm6nnc7nf256qgkm3v30w477gm6y2ppfm3h"; + }; + + buildInputs = [ menhir ]; + + meta = { + description = "Date and duration in OCaml"; + inherit (src.meta) homepage; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; + +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/opium_kernel/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/opium_kernel/default.nix index 8388e108feff..c7bfe1e7306a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/opium_kernel/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/opium_kernel/default.nix @@ -1,6 +1,6 @@ { lib , buildDunePackage -, fetchFromGitHub +, fetchurl , ppx_fields_conv , ppx_sexp_conv @@ -8,35 +8,36 @@ , cohttp-lwt , ezjsonm , hmap +, sexplib }: buildDunePackage rec { - pname = "opium_kernel"; - version = "0.17.1"; + pname = "opium_kernel"; + version = "0.18.0"; + + useDune2 = true; minimumOCamlVersion = "4.04.1"; - - src = fetchFromGitHub { - owner = "rgrinberg"; - repo = "opium"; - rev = "v${version}"; - sha256 = "03xzh0ik6k3c0yn1w1avph667vdagwclzimwwrlf9qdxnzxvcnp3"; - }; + + src = fetchurl { + url = "https://github.com/rgrinberg/opium/releases/download/${version}/opium-${version}.tbz"; + sha256 = "0a2y9gw55psqhqli3a5ps9mfdab8r46fnbj882r2sp366sfcy37q"; + }; doCheck = true; - buildInputs = [ + buildInputs = [ ppx_sexp_conv ppx_fields_conv ]; - propagatedBuildInputs = [ - hmap cohttp-lwt ezjsonm + propagatedBuildInputs = [ + hmap cohttp-lwt ezjsonm sexplib ]; meta = { - description = "Sinatra like web toolkit for OCaml based on cohttp & lwt"; + description = "Sinatra like web toolkit for OCaml based on cohttp & lwt"; homepage = "https://github.com/rgrinberg/opium"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.pmahoney ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.pmahoney ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix index 3e1eb09faad6..b930ea88654b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix @@ -1,23 +1,19 @@ -{ stdenv, buildDunePackage, fetchFromGitHub, stdlib-shims }: +{ lib, buildDunePackage, fetchurl }: buildDunePackage rec { pname = "owl-base"; - version = "0.9.0"; + version = "1.0.0"; useDune2 = true; - src = fetchFromGitHub { - owner = "owlbarn"; - repo = "owl"; - rev = version; - sha256 = "0xxchsymmdbwszs6barqq8x4vqz5hbap64yxq82c2la9sdxgk0vv"; + src = fetchurl { + url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz"; + sha256 = "1gny4351ws2r7dp53nampfyh39l0z6qqvxj5v3d05mpdi2aa06yr"; }; - propagatedBuildInputs = [ stdlib-shims ]; - minimumOCamlVersion = "4.10"; - meta = with stdenv.lib; { + meta = with lib; { description = "Numerical computing library for Ocaml"; homepage = "https://ocaml.xyz"; changelog = "https://github.com/owlbarn/owl/releases"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix index 7dd1d525a462..980efd3bf5c6 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/owl/default.nix @@ -5,7 +5,6 @@ , alcotest , eigen , stdio -, stdlib-shims , openblasCompat , owl-base , npy @@ -18,9 +17,9 @@ buildDunePackage rec { inherit (owl-base) version src meta useDune2; checkInputs = [ alcotest ]; - buildInputs = [ dune-configurator ]; + buildInputs = [ dune-configurator stdio ]; propagatedBuildInputs = [ - eigen stdio stdlib-shims openblasCompat owl-base npy + eigen openblasCompat owl-base npy ]; doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462 diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix new file mode 100644 index 000000000000..64cc7c0c6b73 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/parse-argv/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchurl, buildDunePackage, ocaml +, astring +, ounit +}: + +buildDunePackage rec { + pname = "parse-argv"; + version = "0.2.0"; + + minimumOCamlVersion = "4.03"; + + src = fetchurl { + url = "https://github.com/mirage/parse-argv/releases/download/v${version}/parse-argv-v${version}.tbz"; + sha256 = "06dl04fcmwpkydzni2fzwrhk0bqypd55mgxfax9v82x65xrgj5gw"; + }; + + propagatedBuildInputs = [ astring ]; + + doCheck = lib.versionAtLeast ocaml.version "4.04"; + checkInputs = [ ounit ]; + + meta = { + description = "Process strings into sets of command-line arguments"; + homepage = "https://github.com/mirage/parse-argv"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix index 8896675f63c8..d0dcb5b489f8 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -1,22 +1,21 @@ { lib, fetchFromGitHub, buildDunePackage -, calendar, csv, hex, re +, calendar, csv, hex, ppx_deriving, ppx_sexp_conv, re, rresult, sexplib }: buildDunePackage rec { pname = "pgocaml"; - version = "4.0"; + version = "4.2.2"; src = fetchFromGitHub { owner = "darioteixeira"; repo = "pgocaml"; - rev = "v${version}"; - sha256 = "1s8c5prr7jb9k76bz990m836czm6k8rv5bvp6s2zg9ra0w19w90j"; + rev = version; + sha256 = "1rdypc83nap9j2ml9r6n1pzgf79gk1yffwyi6fmcrl7zmy01cg0n"; }; - minimumOCamlVersion = "4.05"; + minimumOCamlVersion = "4.07"; + useDune2 = true; - preConfigure = "patchShebangs src/genconfig.sh"; - - propagatedBuildInputs = [ calendar csv hex re ]; + propagatedBuildInputs = [ calendar csv hex ppx_deriving ppx_sexp_conv re rresult sexplib ]; meta = with lib; { description = "An interface to PostgreSQL databases for OCaml applications"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/pgocaml/ppx.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/pgocaml/ppx.nix index f8bc4a40e7f9..35c19622f88d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/pgocaml/ppx.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/pgocaml/ppx.nix @@ -1,8 +1,8 @@ -{ buildDunePackage, pgocaml, ppx_tools, ppx_tools_versioned, rresult }: +{ buildDunePackage, pgocaml, ppx_optcomp, ppx_tools, ppx_tools_versioned, rresult }: buildDunePackage { pname = "pgocaml_ppx"; - inherit (pgocaml) src version meta; + inherit (pgocaml) src version useDune2 meta; - propagatedBuildInputs = [ pgocaml ppx_tools ppx_tools_versioned rresult ]; + propagatedBuildInputs = [ pgocaml ppx_optcomp ppx_tools ppx_tools_versioned rresult ]; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_blob/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_blob/default.nix index d7d662e74a5e..a64ff9cbef2d 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -2,16 +2,18 @@ buildDunePackage rec { pname = "ppx_blob"; - version = "0.4.0"; + version = "0.7.1"; + + useDune2 = true; src = fetchurl { url = "https://github.com/johnwhitington/${pname}/releases/download/${version}/ppx_blob-${version}.tbz"; - sha256 = "1xmslk1mwdzhy1bydgsjlcb7h544c39hvxa8lywp8w72gaggjl16"; + sha256 = "0m616ri6kmawflphiwm6j4djds27v0fjvi8xjz1fq5ydc1sq8d0l"; }; - checkInputs = lib.optional doCheck alcotest; + checkInputs = [ alcotest ]; buildInputs = [ ocaml-migrate-parsetree ]; - doCheck = lib.versionAtLeast ocaml.version "4.03"; + doCheck = lib.versionAtLeast ocaml.version "4.05"; meta = with lib; { homepage = "https://github.com/johnwhitington/ppx_blob"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix index 4af711ce3950..f85e32d72c7f 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix @@ -1,6 +1,10 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, cppo, ppx_tools, ppx_deriving +{ lib, fetchFromGitHub, buildDunePackage, ocaml, cppo, ppx_tools, ppx_deriving , ppxfind }: +if lib.versionAtLeast ocaml.version "4.11" +then throw "ppx_deriving_protobuf is not available for OCaml ${ocaml.version}" +else + buildDunePackage rec { pname = "ppx_deriving_protobuf"; version = "2.7"; @@ -14,7 +18,7 @@ buildDunePackage rec { buildInputs = [ cppo ppx_tools ppxfind ppx_deriving ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/ocaml-ppx/ppx_deriving_protobuf"; description = "A Protocol Buffers codec generator for OCaml"; license = licenses.mit; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix index 92d73e540f48..b7d1986c30d4 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving_rpc/default.nix @@ -1,13 +1,16 @@ -{ lib, buildDunePackage, rpclib, ppxlib, ppx_deriving }: +{ lib, buildDunePackage, rpclib, alcotest, ppxlib, ppx_deriving, yojson }: buildDunePackage rec { pname = "ppx_deriving_rpc"; - inherit (rpclib) version src; + inherit (rpclib) version useDune2 src; - buildInputs = [ ppxlib ]; + minimumOCamlVersion = "4.08"; - propagatedBuildInputs = [ rpclib ppx_deriving ]; + propagatedBuildInputs = [ ppxlib rpclib ppx_deriving ]; + + checkInputs = [ alcotest yojson ]; + doCheck = true; meta = with lib; { homepage = "https://github.com/mirage/ocaml-rpc"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix index 7fd939e58ec2..958c088cd6a2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ppx_tools_versioned"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = version; - sha256 = "0c735w9mq49dmvkdw9ahfwh0icsk2sbhnfwmdhpibj86phfm17yj"; + sha256 = "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66"; }; propagatedBuildInputs = [ ocaml-migrate-parsetree ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/alcotest.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/alcotest.nix index 4f1baec1e556..aebe6bd95a85 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/alcotest.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/alcotest.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "qcheck-alcotest"; - inherit (qcheck-core) version src; + inherit (qcheck-core) version useDune2 src; propagatedBuildInputs = [ qcheck-core alcotest ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix index fa72a211ef45..03de70237a46 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix @@ -2,7 +2,9 @@ buildDunePackage rec { pname = "qcheck-core"; - version = "0.15"; + version = "0.16"; + + useDune2 = true; minimumOCamlVersion = "4.03"; @@ -10,7 +12,7 @@ buildDunePackage rec { owner = "c-cube"; repo = "qcheck"; rev = version; - sha256 = "1ywaklqm1agvxvzv7pwl8v4zlwc3ykw6l251w43f0gy9cfwqmh3j"; + sha256 = "1s5dpqj8zvd3wr2w3fp4wb6yc57snjpxzzfv9fb6l9qgigswwjdr"; }; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/default.nix index 2a0e6c0ae40c..dc73f42a13b0 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/default.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "qcheck"; - inherit (qcheck-ounit) version src; + inherit (qcheck-ounit) version useDune2 src; propagatedBuildInputs = [ qcheck-ounit ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/ounit.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/ounit.nix index 06897987a954..62b082f48fb2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/ounit.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qcheck/ounit.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "qcheck-ounit"; - inherit (qcheck-core) version src; + inherit (qcheck-core) version useDune2 src; propagatedBuildInputs = [ qcheck-core ounit ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qtest/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qtest/default.nix index 3bbb542bcba5..d5829127a8bc 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qtest/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/qtest/default.nix @@ -2,13 +2,15 @@ buildDunePackage rec { pname = "qtest"; - version = "2.11"; + version = "2.11.1"; + + useDune2 = true; src = fetchFromGitHub { owner = "vincent-hugot"; repo = pname; rev = "v${version}"; - sha256 = "10fi2093ny8pp3jsi1gdqsllp3lr4r5mfcs2hrm7qvbnhrdbb0g3"; + sha256 = "01aaqnblpkrkv1b2iy5cwn92vxdj4yjiav9s2nvvrqz5m8b9hi1f"; }; propagatedBuildInputs = [ qcheck ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/randomconv/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/randomconv/default.nix index 7abb153b9be3..078d50da895b 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/randomconv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/randomconv/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { pname = "randomconv"; version = "0.1.3"; + useDune2 = true; + src = fetchurl { url = "https://github.com/hannesm/randomconv/releases/download/v${version}/randomconv-v${version}.tbz"; sha256 = "1iv3r0s5kqxs893b0d55f0r62k777haiahfkkvvfbqwgqsm6la4v"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/re/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/re/default.nix index 8881821490ab..ca3cf1e82675 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/re/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/re/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchzip, buildDunePackage, ocaml, ounit, seq }: +{ lib, fetchurl, buildDunePackage, ocaml, ounit, seq }: buildDunePackage rec { pname = "re"; @@ -6,9 +6,9 @@ buildDunePackage rec { minimumOCamlVersion = "4.02"; - src = fetchzip { - url = "https://github.com/ocaml/ocaml-re/archive/${version}.tar.gz"; - sha256 = "07ycb103mr4mrkxfd63cwlsn023xvcjp0ra0k7n2gwrg0mwxmfss"; + src = fetchurl { + url = "https://github.com/ocaml/ocaml-re/releases/download/${version}/re-${version}.tbz"; + sha256 = "1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj"; }; buildInputs = lib.optional doCheck ounit; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix index 9216a489248b..53b559257bec 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/rpclib/default.nix @@ -1,20 +1,22 @@ -{ lib, fetchFromGitHub, buildDunePackage, alcotest, cmdliner, rresult, result, xmlm, yojson }: +{ lib, fetchurl, buildDunePackage +, alcotest +, base64, cmdliner, rresult, xmlm, yojson +}: buildDunePackage rec { pname = "rpclib"; - version = "7.0.0"; + version = "8.0.0"; - minimumOCamlVersion = "4.04"; + useDune2 = true; - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-rpc"; - rev = "v${version}"; - sha256 = "0d8nb272mjxkq5ddn65cy9gjpa8yvd0v3jv3wp5xfh9gj29wd2jj"; + src = fetchurl { + url = "https://github.com/mirage/ocaml-rpc/releases/download/v${version}/rpclib-v${version}.tbz"; + sha256 = "1kqbixk4d9y15ns566fiyzid5jszkamm1kv7iks71invv33v7krz"; }; - buildInputs = [ alcotest cmdliner yojson ]; - propagatedBuildInputs = [ rresult result xmlm ]; + buildInputs = [ cmdliner yojson ]; + propagatedBuildInputs = [ base64 rresult xmlm ]; + checkInputs = [ alcotest ]; doCheck = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/rpclib/lwt.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/rpclib/lwt.nix new file mode 100644 index 000000000000..49f718474980 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/rpclib/lwt.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage, rpclib +, lwt +, alcotest-lwt, ppx_deriving_rpc, yojson +}: + +buildDunePackage { + pname = "rpclib-lwt"; + inherit (rpclib) version useDune2 src; + + propagatedBuildInputs = [ lwt rpclib ]; + + checkInputs = [ alcotest-lwt ppx_deriving_rpc yojson ]; + doCheck = true; + + meta = rpclib.meta // { + description = "A library to deal with RPCs in OCaml - Lwt interface"; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/safepass/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/safepass/default.nix index 884bcdebba4f..04c494403be2 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/safepass/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/safepass/default.nix @@ -1,33 +1,21 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ lib, fetchFromGitHub, buildDunePackage }: -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" - then { - version = "2.0"; - url = "http://forge.ocamlcore.org/frs/download.php/1615/ocaml-safepass-2.0.tgz"; - sha256 = "1zxx3wcyzhxxvm5w9c21y7hpa11h67paaaz9mfsyiqk6fs6hcvmw"; - } else { - version = "1.3"; - url = "http://forge.ocamlcore.org/frs/download.php/1432/ocaml-safepass-1.3.tgz"; - sha256 = "0lb8xbpyc5d1zml7s7mmcr6y2ipwdp7qz73lkv9asy7dyi6cj15g"; - }; -in +buildDunePackage rec { + pname = "safepass"; + version = "3.0"; -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-safepass-${param.version}"; - src = fetchurl { - inherit (param) url sha256; + src = fetchFromGitHub { + owner = "darioteixeira"; + repo = "ocaml-safepass"; + rev = "v${version}"; + sha256 = "0i127gs9x23wzwa1q3dxa2j6hby07hvxdg1c98fc3j09rg6vy2bs"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - - createFindlibDestdir = true; - meta = { - homepage = "http://ocaml-safepass.forge.ocamlcore.org/"; + inherit (src.meta) homepage; description = "An OCaml library offering facilities for the safe storage of user passwords"; - license = stdenv.lib.licenses.lgpl21; - platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ vbgl ]; }; + } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix index 7cc455b01957..572ff5936154 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/sqlexpr/ppx.nix @@ -1,11 +1,17 @@ { buildDunePackage, sqlexpr, ounit -, ppx_core, ppx_tools_versioned, re, lwt_ppx +, ppxlib, ppx_tools_versioned, re, lwt_ppx }: buildDunePackage { pname = "ppx_sqlexpr"; inherit (sqlexpr) version src meta; - buildInputs = [ sqlexpr ounit ppx_core ppx_tools_versioned re lwt_ppx ]; + minimumOCamlVersion = "4.06"; + + postPatch = '' + substituteInPlace src/ppx/jbuild --replace ppx_core ppxlib + ''; + + buildInputs = [ sqlexpr ounit ppxlib ppx_tools_versioned re lwt_ppx ]; doCheck = true; } diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix index 2cc02abbb44d..660282ad131a 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -2,12 +2,12 @@ buildDunePackage rec { pname = "sqlite3"; - version = "5.0.1"; + version = "5.0.2"; minimumOCamlVersion = "4.05"; src = fetchurl { url = "https://github.com/mmottl/sqlite3-ocaml/releases/download/${version}/sqlite3-${version}.tbz"; - sha256 = "0iymkszrs6qwak0vadfzc8yd8jfwn06zl08ggb4jr2mgk2c8mmsn"; + sha256 = "0sba74n0jvzxibrclhbpqscil36yfw7i9jj9q562yhza6rax9p82"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix index b52561d760e9..5aa3ecb0bf17 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; - version = "0.12.5"; + version = "0.12.7"; pname = "tls"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; - sha256 = "1zsh3fx8l3d9lc9w516apzabqsix2ss8nv6kbbzjmp2d4hwh818b"; + sha256 = "1c7hmcpcxn1bfa9cavqzriv7py2q7xfbdpb7kh1kb3j1qjap17dc"; }; useDune2 = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/tsort/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/tsort/default.nix index d47236ba96b8..fdfe7a650e55 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/tsort/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/tsort/default.nix @@ -2,6 +2,7 @@ buildDunePackage rec { pname = "tsort"; + useDune2 = true; version = "2.0.0"; src = fetchFromGitHub { owner = "dmbaturin"; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/tuntap/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/tuntap/default.nix index a4536316ba41..981f05b01e38 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/tuntap/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/tuntap/default.nix @@ -6,6 +6,8 @@ buildDunePackage rec { pname = "tuntap"; version = "2.0.0"; + useDune2 = true; + minimumOCamlVersion = "4.04.2"; src = fetchurl { diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix index 819d8527b2a5..fb56cca0f0a7 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/uchar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline, withShared ? true }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline, withShared ? true, lib }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-uchar-0.0.2"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ ocaml ocamlbuild findlib ]; buildInputs = [ findlib ocaml ocamlbuild ]; - buildPhase = "ocaml pkg/build.ml native=true native-dynlink=${if withShared then "true" else "false"}"; + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=${lib.boolToString withShared}"; installPhase = "${opaline}/bin/opaline -libdir $OCAMLFIND_DESTDIR"; configurePlatforms = []; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix index 3bf163607cd2..c7ad92efe768 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/webmachine/default.nix @@ -5,20 +5,21 @@ buildDunePackage rec { pname = "webmachine"; - version = "0.6.2"; + version = "0.7.0"; + useDune2 = true; minimumOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "inhabitedtype"; repo = "ocaml-webmachine"; - rev = "${version}"; - sha256 = "1zi1vsm589y2njwzsqkmdbxvs9s4xlgbd62xqw2scp60mccp09nk"; + rev = version; + sha256 = "03ynb1l2jjqba88m9r8m5hwlm8izpfp617r4vcab5kmdim1l2ffx"; }; propagatedBuildInputs = [ cohttp dispatch ptime ]; - checkInputs = lib.optional doCheck ounit; + checkInputs = [ ounit ]; doCheck = true; diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix index 2264f0dedbf9..31c671538a58 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/xtmpl/default.nix @@ -2,6 +2,7 @@ , js_of_ocaml-ppx, re }: if stdenv.lib.versionOlder ocaml.version "4.03" +|| stdenv.lib.versionAtLeast ocaml.version "4.11" then throw "xtmpl not supported for ocaml ${ocaml.version}" else stdenv.mkDerivation rec { diff --git a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix index 317907553571..c8b2b614e860 100644 --- a/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/development/ocaml-modules/yaml/default.nix @@ -1,17 +1,21 @@ { lib, fetchurl, buildDunePackage +, dune-configurator , ppx_sexp_conv , bos, ctypes, fmt, logs, rresult, sexplib }: buildDunePackage rec { pname = "yaml"; - version = "2.0.1"; + version = "2.1.0"; + + useDune2 = true; src = fetchurl { url = "https://github.com/avsm/ocaml-yaml/releases/download/v${version}/yaml-v${version}.tbz"; - sha256 = "1r8jj572h416g2zliwmxj2j9hkv73nxnpfb9gmbj9gixg24lskx0"; + sha256 = "03g8vsh5jgi1cm5q78v15slgnzifp91fp7n4v1i7pa8yk0bkh585"; }; + buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ bos ctypes fmt logs ppx_sexp_conv rresult sexplib ]; meta = { |