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

dune: move into ocamlPackages

Browse Source
This commit is contained in:
Vincent Laporte 2019-03-20 10:28:28 +00:00 committed by Vincent Laporte
parent 98dcfed615
commit 7a2426ca77
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/ocaml/dune/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocamlPackages, opaline }:
{ stdenv, fetchurl, ocaml, findlib, opaline }:
stdenv.mkDerivation rec {
name = "dune-${version}";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1lbgnmzdgb3cp2k2wfhhm5zwlm6dbipab49lh308y2qmh1q6yk6a";
};
buildInputs = with ocamlPackages; [ ocaml findlib ];
buildInputs = [ ocaml findlib ];
buildFlags = "release";
@ -25,6 +25,6 @@ stdenv.mkDerivation rec {
description = "A composable build system";
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = stdenv.lib.licenses.mit;
inherit (ocamlPackages.ocaml.meta) platforms;
inherit (ocaml.meta) platforms;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -1351,7 +1351,7 @@ in
dtrx = callPackage ../tools/compression/dtrx { };
dune = callPackage ../development/tools/ocaml/dune { };
inherit (ocamlPackages) dune;
duperemove = callPackage ../tools/filesystems/duperemove { };

2
pkgs/top-level/ocaml-packages.nix
View File

@ -223,6 +223,8 @@ let
dtoa = callPackage ../development/ocaml-modules/dtoa { };
dune = callPackage ../development/tools/ocaml/dune { };
earley = callPackage ../development/ocaml-modules/earley { };
earley_ocaml = callPackage ../development/ocaml-modules/earley_ocaml { };