diff --git a/pkgs/development/ocaml-modules/owl-base/default.nix b/pkgs/development/ocaml-modules/owl-base/default.nix index 12cd54363085..ce6ee124466c 100644 --- a/pkgs/development/ocaml-modules/owl-base/default.nix +++ b/pkgs/development/ocaml-modules/owl-base/default.nix @@ -1,14 +1,14 @@ -{ stdenv, buildDunePackage, fetchFromGitHub, stdlib-shims }: +{ stdenv, buildDune2Package, fetchFromGitHub, stdlib-shims }: -buildDunePackage rec { +buildDune2Package rec { pname = "owl-base"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "owlbarn"; repo = "owl"; rev = version; - sha256 = "1a2lbhywrb3bmm4k48wwbp6iszpd3aj1f23v10i78cbqm5slk6dj"; + sha256 = "1j3xmr4izfznmv8lbn8vkx9c77py2xr6fqyn6ypjlf5k9b8g4mmw"; }; propagatedBuildInputs = [ stdlib-shims ]; diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix index 0cc1c1db42a4..c6eaf69b704b 100644 --- a/pkgs/development/ocaml-modules/owl/default.nix +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -1,14 +1,26 @@ -{ stdenv, buildDunePackage, fetchFromGitHub, alcotest -, eigen, stdio, stdlib-shims, openblasCompat, owl-base +{ stdenv +, buildDune2Package +, dune-configurator +, fetchFromGitHub +, alcotest +, eigen +, stdio +, stdlib-shims +, openblasCompat +, owl-base +, npy }: -buildDunePackage rec { +buildDune2Package rec { pname = "owl"; inherit (owl-base) version src meta; checkInputs = [ alcotest ]; - propagatedBuildInputs = [ eigen stdio stdlib-shims openblasCompat owl-base ]; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ + eigen stdio stdlib-shims openblasCompat owl-base npy + ]; doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462 }