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

Merge pull request #45892 from vbgl/reason

Browse Source 
ocamlPackages.reason: remove spurious dependency on opam
This commit is contained in:
Jörg Thalheim 2018-09-01 11:32:38 +01:00 committed by GitHub
commit fbad0bc8f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/compilers/reason/default.nix
View File

@ -1,8 +1,9 @@
{ stdenv, makeWrapper, buildOcaml, fetchFromGitHub, { stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, jbuilder
ocaml, opam, jbuilder, menhir, merlin_extend, ppx_tools_versioned, utop }: , menhir, merlin_extend, ppx_tools_versioned, utop
}:
buildOcaml rec { stdenv.mkDerivation rec {
name = "reason"; name = "ocaml${ocaml.version}-reason-${version}";
version = "3.3.3"; version = "3.3.3";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -14,12 +15,10 @@ buildOcaml rec {
propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ]; propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
buildInputs = [ makeWrapper opam jbuilder utop menhir ]; buildInputs = [ makeWrapper ocaml findlib jbuilder utop menhir ];
buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
createFindlibDestdir = true;
installPhase = '' installPhase = ''
for p in reason rtop for p in reason rtop
do do
@ -35,6 +34,7 @@ buildOcaml rec {
homepage = https://reasonml.github.io/; homepage = https://reasonml.github.io/;
description = "Facebook's friendly syntax to OCaml"; description = "Facebook's friendly syntax to OCaml";
license = licenses.mit; license = licenses.mit;
inherit (ocaml.meta) platforms;
maintainers = [ maintainers.volth ]; maintainers = [ maintainers.volth ];
}; };
} }