JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ocamlPackages.gsl: 1.24.3 → 1.25.0

Browse Source
This commit is contained in:
Vincent Laporte 2023-12-06 06:41:45 +01:00 committed by Vincent Laporte
parent 0c38aa9ce8
commit 0e98a613ff
2 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pkgs/development/ocaml-modules/gsl/default.nix
View File

@ -1,11 +1,8 @@
{ lib, stdenv, ocaml, fetchFromGitHub, fetchpatch, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }:
lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
"gsl is not available for OCaml ${ocaml.version}"
{ lib, stdenv, fetchFromGitHub, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }:
buildDunePackage rec {
pname = "gsl";
version = "1.24.3";
version = "1.25.0";
minimalOCamlVersion = "4.12";
@ -13,32 +10,9 @@ buildDunePackage rec {
owner = "mmottl";
repo = "gsl-ocaml";
rev = version;
hash = "sha256-I+u7lFEredt8ZLiba8x904eTgSUdZq82/e82B+/GIlo=";
hash = "sha256-vxXv0ZcToXmdYu5k0aLdV3seNn3Y6Sgg+8dpy3Iw68I=";
};
patches = [
# Switched to Dune lang 2.7
(fetchpatch {
url = "https://github.com/mmottl/gsl-ocaml/commit/be0f6933f16fea6d6fb2e39178816974be4c3724.patch";
sha256 = "sha256-G/4JT8XPYw+oNJEwJ9zRdUBwtNUHL+T8/htCb3qfuT8=";
})
# Fix dune rules
(fetchpatch {
url = "https://github.com/mmottl/gsl-ocaml/commit/0b38a22d9813de27eab5caafafeabd945f298b5e.patch";
sha256 = "sha256-S6OUDase2kR7V6fizaev5huqEAIM5QOkx3n18rj4y3w=";
})
# Updated opam file
(fetchpatch {
url = "https://github.com/mmottl/gsl-ocaml/commit/b749455b76501c9e3623e05d659565eab7292602.patch";
sha256 = "sha256-/GACjI3cRCApyGyk1kQp0rB/Hae8DIR9zs6q9KiS1ZQ=";
})
# Used new OCaml 4.12 C-macros
(fetchpatch {
url = "https://github.com/mmottl/gsl-ocaml/commit/cca79ea56a7ee83a4c67b432decdaef3de8c9d30.patch";
sha256 = "sha256-bsIKkvj9W8oAYSvP6ZfbqSgt5fSirc780O08WBhVRmI=";
})
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ dune-configurator gsl ];
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ];

5
pkgs/development/ocaml-modules/phylogenetics/default.nix
View File

@ -1,4 +1,5 @@
{ lib
, ocaml
, buildDunePackage
, fetchFromGitHub
, ppx_deriving
@ -14,6 +15,9 @@
, printbox-text
}:
lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
"phylogenetics is not compatible with OCaml ${ocaml.version}"
buildDunePackage rec {
pname = "phylogenetics";
version = "unstable-2022-05-06";
@ -26,7 +30,6 @@ buildDunePackage rec {
};
minimalOCamlVersion = "4.08";
duneVersion = "3";
nativeCheckInputs = [ bppsuite ];
checkInputs = [ alcotest ];