diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2023-09-18 08:21:07 +0200 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2023-09-18 08:55:03 +0200 |
commit | fefd0ab1c1b0c8225e87085572f95804f58eb3ae (patch) | |
tree | 0893249062a0109da6d316a24faf09f64df61086 | |
parent | 443321aed24916a572c67c7cb0d678c3aff9ec0d (diff) | |
download | nixpkgs-fefd0ab1c1b0c8225e87085572f95804f58eb3ae.tar nixpkgs-fefd0ab1c1b0c8225e87085572f95804f58eb3ae.tar.gz nixpkgs-fefd0ab1c1b0c8225e87085572f95804f58eb3ae.tar.bz2 nixpkgs-fefd0ab1c1b0c8225e87085572f95804f58eb3ae.tar.lz nixpkgs-fefd0ab1c1b0c8225e87085572f95804f58eb3ae.tar.xz nixpkgs-fefd0ab1c1b0c8225e87085572f95804f58eb3ae.tar.zst nixpkgs-fefd0ab1c1b0c8225e87085572f95804f58eb3ae.zip |
ocamlPackages.batteries: 3.6.0 → 3.7.1
-rw-r--r-- | pkgs/development/ocaml-modules/batteries/default.nix | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 38a28eafae8..50a4ded50c6 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,34 +1,25 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, qcheck, num, camlp-streams +{ stdenv, lib, fetchFromGitHub, buildDunePackage, ocaml, qtest, qcheck, num, camlp-streams , doCheck ? lib.versionAtLeast ocaml.version "4.08" && !stdenv.isAarch64 }: -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 ]; |