Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2be90ccb4faa
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0206adc56602
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 24, 2019

  1. lacaml: init at 11.0.3

    @rixed @vbgl
    rixed authored and vbgl committed Mar 24, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0206adc View commit details
Showing with 32 additions and 0 deletions.
  1. +30 −0 pkgs/development/ocaml-modules/lacaml/default.nix
  2. +2 −0 pkgs/top-level/ocaml-packages.nix
30 changes: 30 additions & 0 deletions pkgs/development/ocaml-modules/lacaml/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{ stdenv, fetchFromGitHub, darwin, ocaml, findlib, dune, base, stdio, liblapack, blas }:

assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.05.0";

stdenv.mkDerivation rec {
pname = "ocaml${ocaml.version}-lacaml";
version = "11.0.3";

src = fetchFromGitHub {
owner = "mmottl";
repo = "lacaml";
rev = "${version}";
sha256 = "1aflg07cc9ak9mg1cr0qr368c9s141glwlarl5nhalf6hhq7ibcb";
};

buildInputs =
[ ocaml findlib dune base stdio liblapack blas ] ++
stdenv.lib.optionals stdenv.isDarwin
[ darwin.apple_sdk.frameworks.Accelerate ];

inherit (dune) installPhase;

meta = with stdenv.lib; {
homepage = http://mmottl.github.io/lacaml;
description = "OCaml bindings for BLAS and LAPACK";
license = licenses.lgpl21Plus;
platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers.rixed ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/ocaml-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -381,6 +381,8 @@ let

labltk = callPackage ../development/ocaml-modules/labltk { };

lacaml = callPackage ../development/ocaml-modules/lacaml { };

lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { lwt = lwt2; };
lambdaTerm =
if lib.versionOlder "4.02" ocaml.version