diff options
Diffstat (limited to 'nixpkgs/pkgs/development/ocaml-modules')
10 files changed, 38 insertions, 40 deletions
diff --git a/nixpkgs/pkgs/development/ocaml-modules/brr/default.nix b/nixpkgs/pkgs/development/ocaml-modules/brr/default.nix index 709a9b092926..816a52bbab9f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/brr/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/brr/default.nix @@ -2,18 +2,17 @@ , ocaml, findlib, ocamlbuild, topkg , js_of_ocaml-compiler , js_of_ocaml-toplevel -, note }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-brr"; - version = "0.0.4"; + version = "0.0.6"; src = fetchurl { url = "https://erratique.ch/software/brr/releases/brr-${version}.tbz"; - hash = "sha256-v+Ik1tdRBVnNDqhmNoJuLelL3k5OhxIsUorGdTb9sbw="; + hash = "sha256-paYZlzujXsG1S+s/4/kAPBlDuV1Ljorw7okAu4qaAV0="; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; - propagatedBuildInputs = [ js_of_ocaml-compiler js_of_ocaml-toplevel note ]; + propagatedBuildInputs = [ js_of_ocaml-compiler js_of_ocaml-toplevel ]; inherit (topkg) buildPhase installPhase; meta = { diff --git a/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix b/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix index 727d407ac542..7ba02d68ff5f 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/carton/default.nix @@ -8,14 +8,13 @@ buildDunePackage rec { pname = "carton"; - version = "0.6.0"; + version = "0.7.0"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchurl { url = "https://github.com/mirage/ocaml-git/releases/download/${pname}-v${version}/git-${pname}-v${version}.tbz"; - hash = "sha256-NAm4Xq7L0Dgynr8cKZQ356M4GR6D19LbCRxvnSlIf1U="; + hash = "sha256-vWkBJdP4ZpRCEwzrFMzsdHay4VyiXix/+1qzk+7yDvk="; }; patches = [ diff --git a/nixpkgs/pkgs/development/ocaml-modules/cooltt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cooltt/default.nix index b19e01ceb345..c9e25045426c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cooltt/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cooltt/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , fetchurl , buildDunePackage +, bos , bwd , cmdliner , containers @@ -16,22 +17,21 @@ , yuujinchou , ounit2 , qcheck +, qcheck-core }: let bantorra = buildDunePackage rec { pname = "bantorra"; - version = "unstable-2022-04-20"; + version = "unstable-2022-05-08"; src = fetchFromGitHub { owner = "RedPRL"; repo = "bantorra"; - rev = "1e78633d9a2ef7104552a24585bb8bea36d4117b"; - sha256 = "sha256:15v1cggm7awp11iwl3lzpaar91jzivhdxggp5mr48gd28kfipzk2"; + rev = "d05c34295727dd06d0ac4416dc2e258732e8593d"; + hash = "sha256-s6lUTs3VRl6YhLAn3PO4aniANhFp8ytoTsFAgcOlee4="; }; - duneVersion = "3"; - - propagatedBuildInputs = [ ezjsonm findlib ]; + propagatedBuildInputs = [ bos ezjsonm findlib ]; meta = { description = "Extensible Library Management and Path Resolution"; @@ -41,19 +41,18 @@ let }; kado = buildDunePackage rec { pname = "kado"; - version = "unstable-2022-04-30"; + version = "unstable-2023-10-03"; src = fetchFromGitHub { owner = "RedPRL"; repo = "kado"; - rev = "8dce50e7d759d482b82565090e550d3860d64729"; - sha256 = "sha256:1xb754fha4s0bgjfqjxzqljvalmkfdwdn5y4ycsp51wiah235bsy"; + rev = "6b2e9ba2095e294e6e0fc6febc280d80c5799c2b"; + hash = "sha256-fP6Ade3mJeyOMjuDIvrW88m6E3jfb2z3L8ufgloz4Tc="; }; - duneVersion = "3"; - propagatedBuildInputs = [ bwd ]; doCheck = true; + checkInputs = [ qcheck-core ]; meta = { description = "Cofibrations in Cartecian Cubical Type Theory"; @@ -65,16 +64,15 @@ in buildDunePackage { pname = "cooltt"; - version = "unstable-2022-04-28"; + version = "unstable-2023-10-03"; - minimalOCamlVersion = "4.13"; - duneVersion = "3"; + minimalOCamlVersion = "5.0"; src = fetchFromGitHub { owner = "RedPRL"; repo = "cooltt"; - rev = "88511e10cb9e17286f585882dee334f3d8ace47c"; - sha256 = "sha256:1n9bh86r2n9s3mm7ayfzwjbnjqcphpsf8yqnf4whd3yi930sqisw"; + rev = "a5eaf4db195b5166a7102d47d42724f59cf3de19"; + hash = "sha256-48bEf59rtPRrCRjab7+GxppjfR2c87HjQ+uKY2Bag0I="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix b/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix index e12454759a35..18d307655584 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/hacl-star/default.nix @@ -4,9 +4,9 @@ buildDunePackage { pname = "hacl-star"; - inherit (hacl-star-raw) version src meta doCheck minimalOCamlVersion; + inherit (hacl-star-raw) version src meta doCheck; - duneVersion = "3"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ hacl-star-raw diff --git a/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix b/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix index de20299cd4a1..00b524606fcf 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -12,11 +12,11 @@ }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-hacl-star-raw"; - version = "0.7.0"; + version = "0.7.1"; src = fetchzip { url = "https://github.com/cryspen/hacl-packages/releases/download/ocaml-v${version}/hacl-star.${version}.tar.gz"; - sha256 = "sha256-jJtxVYhQgP8ItfLhQ2wcF8RKNRnYhB2j0nR7/YH1NfY="; + hash = "sha256-TcAEaJou4BOVXSz5DYewzKfvIpjXmhLAlgF0hlq3ToQ="; stripRoot = false; }; @@ -24,8 +24,6 @@ stdenv.mkDerivation rec { ./aligned-alloc.patch ]; - minimalOCamlVersion = "4.08"; - # strictoverflow is disabled because it breaks aarch64-darwin hardeningDisable = [ "strictoverflow" ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix index f9612c0c011d..ccd2d4eab299 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -3,6 +3,7 @@ , fetchpatch , fzf , lib +, ocaml , openssl , zstd }: @@ -264,6 +265,7 @@ with self; buildInputs = [ jst-config ]; propagatedBuildInputs = [ base base_bigstring base_quickcheck ppx_jane time_now ]; doCheck = false; # circular dependency with core_kernel + meta.broken = lib.versionAtLeast ocaml.version "5.1"; }; core_bench = janePackage { diff --git a/nixpkgs/pkgs/development/ocaml-modules/note/default.nix b/nixpkgs/pkgs/development/ocaml-modules/note/default.nix index 5bb0da7dd106..9640a33569c4 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/note/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/note/default.nix @@ -1,18 +1,20 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, brr }: lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") "note is not available for OCaml ${ocaml.version}" stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-note"; - version = "0.0.2"; + version = "0.0.3"; src = fetchurl { url = "https://erratique.ch/software/note/releases/note-${version}.tbz"; - hash = "sha256-b35XcaDUXQLqwkNfsJKX5A1q1pAhw/mgdwyOdacZiiY="; + hash = "sha256-ZZOvCnyz7UWzFtGFI1uC0ZApzyylgZYM/HYIXGVXY2k="; }; buildInputs = [ ocaml findlib ocamlbuild topkg ]; inherit (topkg) buildPhase installPhase; + propagatedBuildInputs = [ brr ]; + meta = { homepage = "https://erratique.ch/software/note"; description = "An OCaml module for functional reactive programming"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix index f66abd2bdcf1..0e2dbda80d49 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/sail/default.nix @@ -13,20 +13,20 @@ , z3 , linksem , num +, yojson }: buildDunePackage rec { pname = "sail"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub { owner = "rems-project"; repo = "sail"; rev = version; - hash = "sha256-eNdFOSzkniNvSCZeORRJ/IYAu+9P4HSouwmhd4BQLPk="; + hash = "sha256-HY/rgWi0S7ZiAWZF0fVIRK6fpoJ7Xp5EQcxoPRCPJ5Y="; }; - duneVersion = "3"; minimalOCamlVersion = "4.08"; nativeBuildInputs = [ @@ -43,6 +43,7 @@ buildDunePackage rec { linenoise pprint linksem + yojson ]; preBuild = '' diff --git a/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix b/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix index ca7b893ebc8e..38a920ae865c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/yojson/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "yojson"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "https://github.com/ocaml-community/yojson/releases/download/${version}/yojson-${version}.tbz"; - sha256 = "sha256-n8sf8ttYqyWfkih5awraR5Tq6XF3sYMzcTgMTk+QsV0="; + hash = "sha256-1YGDIHsZjcBlhmI5Bm4HTDT54TnA2cQXWjiAl5DogXM="; }; nativeBuildInputs = [ cppo ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix b/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix index 5f0c0965b27b..48c1fb471fad 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/yuujinchou/default.nix @@ -4,8 +4,8 @@ }: let params = if lib.versionAtLeast ocaml.version "5.0" then { - version = "4.0.0"; - hash = "sha256-yNLN5bBe4aft9Rl5VHmlOYTlnCdR2NgDWsc3uJHaZy4="; + version = "5.1.0"; + hash = "sha256-J3qkytgJkk2gT83KJ47nNM4cXqVHbx4iTPK+fLwR7Wk="; propagatedBuildInputs = [ algaeff bwd ]; } else { version = "2.0.0"; @@ -18,7 +18,6 @@ buildDunePackage rec { inherit (params) version; minimalOCamlVersion = "4.12"; - duneVersion = "3"; src = fetchFromGitHub { owner = "RedPRL"; |