diff options
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules')
21 files changed, 73 insertions, 56 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix b/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix index f5dd92422cc1..13cc4b02b068 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/astring/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; meta = { - homepage = http://erratique.ch/software/astring; + homepage = https://erratique.ch/software/astring; description = "Alternative String module for OCaml"; longDescription = '' Astring exposes an alternative String module for OCaml. This module tries diff --git a/nixpkgs/pkgs/development/ocaml-modules/base64/2.0.nix b/nixpkgs/pkgs/development/ocaml-modules/base64/2.0.nix new file mode 100644 index 000000000000..8128dc1cb6f5 --- /dev/null +++ b/nixpkgs/pkgs/development/ocaml-modules/base64/2.0.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: + +let version = "2.0.0"; in + +stdenv.mkDerivation { + name = "ocaml-base64-${version}"; + + src = fetchzip { + url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz"; + sha256 = "1nv55gwq5vaxmrcz9ja2s165b1p9fhcxszc1l76043gpa56qm4fs"; + }; + + buildInputs = [ ocaml findlib ocamlbuild ]; + + createFindlibDestdir = true; + + meta = { + homepage = https://github.com/mirage/ocaml-base64; + platforms = ocaml.meta.platforms or []; + description = "Base64 encoding and decoding in OCaml"; + license = stdenv.lib.licenses.isc; + maintainers = with stdenv.lib.maintainers; [ vbgl ]; + }; +} diff --git a/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix b/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix index 8128dc1cb6f5..2633d43c1045 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/base64/default.nix @@ -1,24 +1,26 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ lib, fetchzip, buildDunePackage, alcotest, bos }: -let version = "2.0.0"; in +let version = "3.2.0"; in -stdenv.mkDerivation { - name = "ocaml-base64-${version}"; +buildDunePackage { + pname = "base64"; + inherit version; src = fetchzip { url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz"; - sha256 = "1nv55gwq5vaxmrcz9ja2s165b1p9fhcxszc1l76043gpa56qm4fs"; + sha256 = "1ilw3zj0w6cq7i4pvr8m2kv5l5f2y9aldmv72drlwwns013b1gwy"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + minimumOCamlVersion = "4.03"; - createFindlibDestdir = true; + buildInputs = [ alcotest bos ]; + + doCheck = true; meta = { homepage = https://github.com/mirage/ocaml-base64; - platforms = ocaml.meta.platforms or []; description = "Base64 encoding and decoding in OCaml"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix index 974348116656..47e9d7febf85 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/bos/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Basic OS interaction for OCaml"; - homepage = http://erratique.ch/software/bos; + homepage = https://erratique.ch/software/bos; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix index c11aa41a4931..003ce57cc8a0 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { - homepage = http://erratique.ch/software/cmdliner; + homepage = https://erratique.ch/software/cmdliner; description = "An OCaml module for the declarative definition of command line interfaces"; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix b/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix index 34c8fcbfcbcd..d739b33c8fab 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/faraday/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, alcotest }: +{ lib, fetchFromGitHub, buildDunePackage, alcotest, bigstringaf }: buildDunePackage rec { pname = "faraday"; - version = "0.5.0"; + version = "0.7.0"; minimumOCamlVersion = "4.02"; @@ -10,16 +10,17 @@ buildDunePackage rec { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "1kql0il1frsbx6rvwqd7ahi4m14ik6la5an6c2w4x7k00ndm4d7n"; + sha256 = "0z6ikwlqad91iac0q5z88p3wzq5k15y86ckzmhdq1aqwrcm14bq2"; }; buildInputs = [ alcotest ]; + propagatedBuildInputs = [ bigstringaf ]; doCheck = true; meta = { description = "Serialization library built for speed and memory efficiency"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; }; } diff --git a/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix b/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix index 20b6f7d0909e..96423a213a19 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/farfadet/default.nix @@ -8,11 +8,11 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-farfadet-${version}"; - version = "0.2"; + version = "0.3"; src = fetchurl { url = "https://github.com/oklm-wsh/Farfadet/releases/download/v${version}/farfadet-${version}.tbz"; - sha256 = "06wvd57c8khpq0c2hvm15zng269zvabsw1lcaqphqdcckl67nsxr"; + sha256 = "0nlafnp0pwx0n4aszpsk6nvcvqi9im306p4jhx70si7k3xprlr2j"; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix index 922f85996e14..a171a672ecaa 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/fmt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { inherit (topkg) buildPhase installPhase; meta = { - homepage = http://erratique.ch/software/fmt; + homepage = https://erratique.ch/software/fmt; license = stdenv.lib.licenses.isc; description = "OCaml Format pretty-printer combinators"; inherit (ocaml.meta) platforms; diff --git a/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix b/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix index 9317f50717e2..f8b7eda3a4fc 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/fpath/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "An OCaml module for handling file system paths with POSIX and Windows conventions"; - homepage = http://erratique.ch/software/fpath; + homepage = https://erratique.ch/software/fpath; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix index 988b7147fcb4..5c0726176f6d 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix @@ -441,13 +441,6 @@ rec { meta.description = "Async helpers for writing expectation tests"; }; - bignum = janePackage { - pname = "bignum"; - hash = "0hqd88fb90rsj1wjj4k79gigcf31c6a45msasw99zzifzppr3w3f"; - propagatedBuildInputs = [ core_kernel zarith num ]; - meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals"; - }; - cinaps = janePackage { pname = "cinaps"; hash = "0f8cx4xkkk4wqpcbvva8kxdndbgawljp17dwppc6zpjpkjl8s84j"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix index ca286ee36f8c..739daeddee57 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/jsonm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "An OCaml non-blocking streaming codec to decode and encode the JSON data format"; - homepage = http://erratique.ch/software/jsonm; + homepage = https://erratique.ch/software/jsonm; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; platforms = ocaml.meta.platforms or []; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix index b067fd99ded4..715f97ebb6cb 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mtime/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "Monotonic wall-clock time for OCaml"; - homepage = http://erratique.ch/software/mtime; + homepage = https://erratique.ch/software/mtime; inherit (ocaml.meta) platforms; maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix index a1e43d6d13db..468738224dea 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "ppxlib"; - version = "0.3.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = version; - sha256 = "0qpjl84x8abq9zivifb0k8ld7fa1lrhkbajmmccvfv06ja3as1v4"; + sha256 = "0d2nyp4mlx7m3vdvcdhs51x570vw30j645yfbwlhjpwdd8243fya"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix index 4ac473fef006..6562edc12785 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ptime/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit (topkg) installPhase; meta = { - homepage = http://erratique.ch/software/ptime; + homepage = https://erratique.ch/software/ptime; description = "POSIX time for OCaml"; longDescription = '' Ptime has platform independent POSIX time support in pure OCaml. diff --git a/nixpkgs/pkgs/development/ocaml-modules/react/default.nix b/nixpkgs/pkgs/development/ocaml-modules/react/default.nix index 9d070b962b4c..eb0980618129 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/react/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/react/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { - homepage = http://erratique.ch/software/react; + homepage = https://erratique.ch/software/react; description = "Applicative events and signals for OCaml"; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix b/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix index fa85f2174688..05bfe2c09347 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, react, opaline }: -assert stdenv.lib.versionAtLeast ocaml.version "3.11"; +if !stdenv.lib.versionAtLeast ocaml.version "4.04" +then throw "reactiveData is not available for OCaml ${ocaml.version}" +else stdenv.mkDerivation { - name = "ocaml${ocaml.version}-reactiveData-0.2.1"; + name = "ocaml${ocaml.version}-reactiveData-0.2.2"; src = fetchurl { - url = https://github.com/ocsigen/reactiveData/archive/0.2.1.tar.gz; - sha256 = "0wcs0z50nia1cpk8mh6i5qbc6sff9cc8x7s7q1q89d7m73bnv4vf"; + url = https://github.com/ocsigen/reactiveData/archive/0.2.2.tar.gz; + sha256 = "0jzagyp4zla28wykvcgqwd8df71ir0vb4s8akp02cfacd5v86sng"; }; buildInputs = [ ocaml findlib ocamlbuild opaline ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix b/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix index 270432b86e94..caff9fa96320 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/rresult/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.isc; - homepage = http://erratique.ch/software/rresult; + homepage = https://erratique.ch/software/rresult; description = "Result value combinators for OCaml"; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix b/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix index e28a86907bb4..e10cdd2d9c10 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/topkg/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { passthru = { inherit run; }; meta = { - homepage = http://erratique.ch/software/topkg; + homepage = https://erratique.ch/software/topkg; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; description = "A packager for distributing OCaml software"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix index 0c45e6c8af18..bb6ef649e59c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/uuidm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122"; - homepage = http://erratique.ch/software/uuidm; + homepage = https://erratique.ch/software/uuidm; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.maurer ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix b/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix index 9b6c1868ad32..58e02d6b2806 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/uutf/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1gp96dcggq7s84934vimxh89caaxa77lqiff1yywbwkilkkjcfqj"; + sha256 = "1nx1rly3qj23jzn9yk3x6fwqimcxjd84kv5859vvhdg56psq26p6"; }; buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix b/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix index d91f6e1c8a31..9122a3509d96 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildOcaml, fetchurl +{ stdenv, fetchurl , ocaml, findlib, pkgconfig, perl , gmp }: @@ -6,9 +6,9 @@ let source = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.7"; - url = https://github.com/ocaml/Zarith/archive/release-1.7.tar.gz; - sha256 = "0fmblap5nsbqq0dab63d6b7lsxpc3snkgz7jfldi2qa4s1kbnhfn"; + version = "1.8"; + url = https://github.com/ocaml/Zarith/archive/release-1.8.tar.gz; + sha256 = "1cn63c97aij19nrw5hc1zh1jpnbsdkzq99zyyk649c4s3xi3iqq7"; } else { version = "1.3"; url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz; @@ -16,25 +16,20 @@ let source = }; in -buildOcaml rec { - name = "zarith"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-zarith-${version}"; inherit (source) version; src = fetchurl { inherit (source) url sha256; }; - minimumSupportedOcamlVersion = "3.12.1"; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ocaml findlib perl ]; propagatedBuildInputs = [ gmp ]; - # needed so setup-hook.sh sets CAML_LD_LIBRARY_PATH for dllzarith.so - hasSharedObjects = true; - patchPhase = "patchShebangs ./z_pp.pl"; configurePhase = '' ./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib ''; - preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib"; + createFindlibDestdir = true; meta = with stdenv.lib; { description = "Fast, arbitrary precision OCaml integers"; |