lol

ocamlPackages.gsl: 1.24.3 → 1.25.0

authored by

Vincent Laporte and committed by
Vincent Laporte
0e98a613 0c38aa9c

+7 -30
+3 -29
pkgs/development/ocaml-modules/gsl/default.nix
··· 1 - { lib, stdenv, ocaml, fetchFromGitHub, fetchpatch, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }: 2 - 3 - lib.throwIf (lib.versionAtLeast ocaml.version "5.0") 4 - "gsl is not available for OCaml ${ocaml.version}" 1 + { lib, stdenv, fetchFromGitHub, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }: 5 2 6 3 buildDunePackage rec { 7 4 pname = "gsl"; 8 - version = "1.24.3"; 5 + version = "1.25.0"; 9 6 10 7 minimalOCamlVersion = "4.12"; 11 8 ··· 13 10 owner = "mmottl"; 14 11 repo = "gsl-ocaml"; 15 12 rev = version; 16 - hash = "sha256-I+u7lFEredt8ZLiba8x904eTgSUdZq82/e82B+/GIlo="; 13 + hash = "sha256-vxXv0ZcToXmdYu5k0aLdV3seNn3Y6Sgg+8dpy3Iw68I="; 17 14 }; 18 - 19 - patches = [ 20 - # Switched to Dune lang 2.7 21 - (fetchpatch { 22 - url = "https://github.com/mmottl/gsl-ocaml/commit/be0f6933f16fea6d6fb2e39178816974be4c3724.patch"; 23 - sha256 = "sha256-G/4JT8XPYw+oNJEwJ9zRdUBwtNUHL+T8/htCb3qfuT8="; 24 - }) 25 - # Fix dune rules 26 - (fetchpatch { 27 - url = "https://github.com/mmottl/gsl-ocaml/commit/0b38a22d9813de27eab5caafafeabd945f298b5e.patch"; 28 - sha256 = "sha256-S6OUDase2kR7V6fizaev5huqEAIM5QOkx3n18rj4y3w="; 29 - }) 30 - # Updated opam file 31 - (fetchpatch { 32 - url = "https://github.com/mmottl/gsl-ocaml/commit/b749455b76501c9e3623e05d659565eab7292602.patch"; 33 - sha256 = "sha256-/GACjI3cRCApyGyk1kQp0rB/Hae8DIR9zs6q9KiS1ZQ="; 34 - }) 35 - # Used new OCaml 4.12 C-macros 36 - (fetchpatch { 37 - url = "https://github.com/mmottl/gsl-ocaml/commit/cca79ea56a7ee83a4c67b432decdaef3de8c9d30.patch"; 38 - sha256 = "sha256-bsIKkvj9W8oAYSvP6ZfbqSgt5fSirc780O08WBhVRmI="; 39 - }) 40 - ]; 41 15 42 16 nativeBuildInputs = [ pkg-config ]; 43 17 buildInputs = [ dune-configurator gsl ];
+4 -1
pkgs/development/ocaml-modules/phylogenetics/default.nix
··· 1 1 { lib 2 + , ocaml 2 3 , buildDunePackage 3 4 , fetchFromGitHub 4 5 , ppx_deriving ··· 14 15 , printbox-text 15 16 }: 16 17 18 + lib.throwIf (lib.versionAtLeast ocaml.version "5.0") 19 + "phylogenetics is not compatible with OCaml ${ocaml.version}" 20 + 17 21 buildDunePackage rec { 18 22 pname = "phylogenetics"; 19 23 version = "unstable-2022-05-06"; ··· 26 30 }; 27 31 28 32 minimalOCamlVersion = "4.08"; 29 - duneVersion = "3"; 30 33 31 34 nativeCheckInputs = [ bppsuite ]; 32 35 checkInputs = [ alcotest ];