ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 13:57:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81160 from bcdarwin/update-owl

Browse Source 
ocamlPackages.owl: 0.7.2 -> 0.8.0
This commit is contained in:
Vincent Laporte 2020-03-03 15:42:55 +01:00 committed by GitHub
commit 2240e6aa2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/ocaml-modules/eigen/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, buildDunePackage, fetchFromGitHub, ctypes }: { stdenv, buildDune2Package, fetchFromGitHub, ctypes }:
buildDunePackage rec { buildDune2Package rec {
pname = "eigen"; pname = "eigen";
version = "0.1.5"; version = "0.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "owlbarn"; owner = "owlbarn";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0pbqd87i9h7qpx84hr8k4iw0rhmjgma4s3wihxh992jjvsrgdyfi"; sha256 = "1zaw03as14hyvfpyj6bjrfbcxp2ljdbqcqqgm53kms244mig425f";
}; };
minimumOCamlVersion = "4.04"; minimumOCamlVersion = "4.02";
propagatedBuildInputs = [ ctypes ]; propagatedBuildInputs = [ ctypes ];

8
pkgs/development/ocaml-modules/owl-base/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, buildDunePackage, fetchFromGitHub, stdlib-shims }: { stdenv, buildDune2Package, fetchFromGitHub, stdlib-shims }:
buildDunePackage rec { buildDune2Package rec {
pname = "owl-base"; pname = "owl-base";
version = "0.7.2"; version = "0.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "owlbarn"; owner = "owlbarn";
repo = "owl"; repo = "owl";
rev = version; rev = version;
sha256 = "1a2lbhywrb3bmm4k48wwbp6iszpd3aj1f23v10i78cbqm5slk6dj"; sha256 = "1j3xmr4izfznmv8lbn8vkx9c77py2xr6fqyn6ypjlf5k9b8g4mmw";
}; };
propagatedBuildInputs = [ stdlib-shims ]; propagatedBuildInputs = [ stdlib-shims ];

20
pkgs/development/ocaml-modules/owl/default.nix
View File

@ -1,14 +1,26 @@
{ stdenv, buildDunePackage, fetchFromGitHub, alcotest { stdenv
, eigen, stdio, stdlib-shims, openblasCompat, owl-base , buildDune2Package
, dune-configurator
, fetchFromGitHub
, alcotest
, eigen
, stdio
, stdlib-shims
, openblasCompat
, owl-base
, npy
}: }:
buildDunePackage rec { buildDune2Package rec {
pname = "owl"; pname = "owl";
inherit (owl-base) version src meta; inherit (owl-base) version src meta;
checkInputs = [ alcotest ]; 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 doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462
} }

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

@ -1,7 +1,7 @@
{ stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving { stdenv, buildDune2Package, fetchFromGitHub, ppx_deriving
, alcotest, biocaml, gnuplot, lacaml, menhir, owl }: , alcotest, biocaml, gnuplot, lacaml, menhir, owl }:
buildDunePackage rec { buildDune2Package rec {
pname = "phylogenetics"; pname = "phylogenetics";
version = "unstable-2019-11-15"; version = "unstable-2019-11-15";
@ -20,7 +20,7 @@ buildDunePackage rec {
doCheck = false; # many tests require bppsuite doCheck = false; # many tests require bppsuite
meta = with stdenv.lib; { meta = with stdenv.lib; {
inherit (std.meta) homepage; inherit (src.meta) homepage;
description = "Bioinformatics library for Ocaml"; description = "Bioinformatics library for Ocaml";
maintainers = [ maintainers.bcdarwin ]; maintainers = [ maintainers.bcdarwin ];
license = licenses.cecill-b; license = licenses.cecill-b;