Merge pull request #255822 from vbgl/ocaml-batteries-3.7.1
ocamlPackages.batteries: 3.6.0 → 3.7.1
This commit is contained in:
commit
5164552aa4
|
@ -1,34 +1,25 @@
|
|||
{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, qcheck, num, camlp-streams
|
||||
, doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64
|
||||
{ stdenv, lib, fetchFromGitHub, buildDunePackage, ocaml, qtest, qcheck, num, camlp-streams
|
||||
, doCheck ? lib.versionAtLeast ocaml.version "4.08"
|
||||
}:
|
||||
|
||||
if lib.versionOlder ocaml.version "4.02"
|
||||
then throw "batteries is not available for OCaml ${ocaml.version}"
|
||||
else
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-batteries";
|
||||
version = "3.6.0";
|
||||
buildDunePackage rec {
|
||||
pname = "batteries";
|
||||
version = "3.7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ocaml-batteries-team";
|
||||
repo = "batteries-included";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-D/0h0/70V8jmzHIUR6i2sT2Jz9/+tfR2dQgp4Bxtimc=";
|
||||
hash = "sha256-0ZCaJA9xowO9QxCWcyJ1zhqG7+GNkMYJt62+VPOFj4Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ocaml findlib ocamlbuild ];
|
||||
nativeCheckInputs = [ qtest ];
|
||||
checkInputs = [ qcheck ];
|
||||
propagatedBuildInputs = [ camlp-streams num ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
inherit doCheck;
|
||||
checkTarget = "test";
|
||||
|
||||
createFindlibDestdir = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://ocaml-batteries-team.github.io/batteries-included/hdoc2/";
|
||||
description = "OCaml Batteries Included";
|
||||
|
@ -38,7 +29,6 @@ stdenv.mkDerivation rec {
|
|||
language.
|
||||
'';
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
inherit (ocaml.meta) platforms;
|
||||
maintainers = [
|
||||
lib.maintainers.maggesi
|
||||
];
|
||||
|
|
|
@ -10,7 +10,6 @@
|
|||
buildDunePackage rec {
|
||||
pname = "telegraml";
|
||||
version = "unstable-2021-06-17";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nv-vn";
|
||||
|
@ -19,6 +18,10 @@ buildDunePackage rec {
|
|||
sha256 = "sha256-2bMHARatwl8Zl/fWppvwbH6Ut+igJVKzwyQb8Q4gem4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/dune --replace batteries batteries.unthreaded
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
batteries
|
||||
cohttp-lwt-unix
|
||||
|
|
Loading…
Reference in a new issue