movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

ocamlPackages.re: 1.11.0 → 1.12.0

Browse source
This commit is contained in:
Vincent Laporte 2024-12-11 15:25:16 +01:00 • committed by Vincent Laporte
parent 531093ccbd
commit 79a93b5d52
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/ocaml-modules/dose3/default.nix
View file

@ -42,7 +42,8 @@ buildDunePackage rec {
checkInputs = [ checkInputs = [
ounit ounit
]; ];
doCheck = lib.versionAtLeast ocaml.version "4.08"; # Check are not compatible with re ≥ 1.12
doCheck = lib.versionAtLeast ocaml.version "4.08" && !lib.versionAtLeast ocaml.version "4.12";
meta = with lib; { meta = with lib; {
description = "Dose library (part of Mancoosi tools)"; description = "Dose library (part of Mancoosi tools)";

16
pkgs/development/ocaml-modules/re/default.nix
View file

@ -4,20 +4,26 @@
buildDunePackage, buildDunePackage,
ocaml, ocaml,
ounit, ounit,
ounit2,
seq, seq,
}: }:
let let
version_sha = version_sha =
if lib.versionAtLeast ocaml.version "4.08" then if lib.versionAtLeast ocaml.version "4.12" then
{
version = "1.12.0";
hash = "sha256-oB8r8i9ywvSrq9jT52NeNcG/a8WkGtbVoAdFTdq60dQ=";
}
else if lib.versionAtLeast ocaml.version "4.08" then
{ {
version = "1.11.0"; version = "1.11.0";
sha256 = "sha256-AfwkR4DA9r5yrnlrH7dQ82feGGJP110H7nl4LtbfjU8="; hash = "sha256-AfwkR4DA9r5yrnlrH7dQ82feGGJP110H7nl4LtbfjU8=";
} }
else else
{ {
version = "1.9.0"; version = "1.9.0";
sha256 = "1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj"; hash = "sha256:1gas4ky49zgxph3870nffzkr6y41kkpqp4nj38pz1gh49zcf12aj";
}; };
in in
@ -29,12 +35,12 @@ buildDunePackage rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/ocaml/ocaml-re/releases/download/${version}/re-${version}.tbz"; url = "https://github.com/ocaml/ocaml-re/releases/download/${version}/re-${version}.tbz";
sha256 = version_sha.sha256; inherit (version_sha) hash;
}; };
buildInputs = lib.optional doCheck ounit;
propagatedBuildInputs = [ seq ]; propagatedBuildInputs = [ seq ];
doCheck = lib.versionAtLeast ocaml.version "4.08"; doCheck = lib.versionAtLeast ocaml.version "4.08";
checkInputs = [ (if lib.versionAtLeast version "1.12" then ounit2 else ounit) ];
meta = { meta = {
homepage = "https://github.com/ocaml/ocaml-re"; homepage = "https://github.com/ocaml/ocaml-re";