ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

dune: 1.4.0 -> 1.5.0 (#49848)

Browse Source 
* dune: 1.4.0 -> 1.5.1

* reason: use dune installPhase
This commit is contained in:
Mario Rodas 2018-11-09 07:26:18 -05:00 committed by Vincent Laporte
parent 1c49226176
commit 2e89de61c5
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,12 +21,9 @@ stdenv.mkDerivation rec {
buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed
installPhase = '' inherit (dune) installPhase;
for p in reason rtop
do
${dune.installPhase} $p.install
done
postInstall = ''
wrapProgram $out/bin/rtop \ wrapProgram $out/bin/rtop \
--prefix PATH : "${utop}/bin" \ --prefix PATH : "${utop}/bin" \
--set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH --set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH

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

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dune-${version}"; name = "dune-${version}";
version = "1.4.0"; version = "1.5.1";
src = fetchurl { src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
sha256 = "1fz1jx1d48yb40qan4hw25h8ia55vs7mp94a3rr7cf5gb5ap2zkj"; sha256 = "1dbf7wwhr7b41g3p24qb9v5r1vvgrk6i9w8f7y7k5k527xy9jk5w";
}; };
buildInputs = with ocamlPackages; [ ocaml findlib ]; buildInputs = with ocamlPackages; [ ocaml findlib ];
@ -14,10 +14,14 @@ stdenv.mkDerivation rec {
dontAddPrefix = true; dontAddPrefix = true;
installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR"; installPhase = ''
runHook preInstall
${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR
runHook postInstall
'';
meta = { meta = {
homepage = "https://github.com/ocaml/dune"; homepage = https://github.com/ocaml/dune;
description = "A composable build system"; description = "A composable build system";
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ stdenv.lib.maintainers.vbgl ];
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;