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: 1c49226176d2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2e89de61c59e
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 9, 2018

  1. dune: 1.4.0 -> 1.5.0 (#49848) 

    * dune: 1.4.0 -> 1.5.1

* reason: use dune installPhase
    @marsam @vbgl
    marsam authored and vbgl committed Nov 9, 2018
    Copy the full SHA
    2e89de6 View commit details
Showing with 10 additions and 9 deletions.
  1. +2 −5 pkgs/development/compilers/reason/default.nix
  2. +8 −4 pkgs/development/tools/ocaml/dune/default.nix
7 changes: 2 additions & 5 deletions pkgs/development/compilers/reason/default.nix
View file
Original file line number Diff line number Diff line change
@@ -21,12 +21,9 @@ stdenv.mkDerivation rec {

buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed

installPhase = ''
for p in reason rtop
do
${dune.installPhase} $p.install
done
inherit (dune) installPhase;

postInstall = ''
wrapProgram $out/bin/rtop \
--prefix PATH : "${utop}/bin" \
--set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH
12 changes: 8 additions & 4 deletions pkgs/development/tools/ocaml/dune/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,10 +2,10 @@

stdenv.mkDerivation rec {
name = "dune-${version}";
version = "1.4.0";
version = "1.5.1";
src = fetchurl {
url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz";
sha256 = "1fz1jx1d48yb40qan4hw25h8ia55vs7mp94a3rr7cf5gb5ap2zkj";
sha256 = "1dbf7wwhr7b41g3p24qb9v5r1vvgrk6i9w8f7y7k5k527xy9jk5w";
};

buildInputs = with ocamlPackages; [ ocaml findlib ];
@@ -14,10 +14,14 @@ stdenv.mkDerivation rec {

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 = {
homepage = "https://github.com/ocaml/dune";
homepage = https://github.com/ocaml/dune;
description = "A composable build system";
maintainers = [ stdenv.lib.maintainers.vbgl ];
license = stdenv.lib.licenses.mit;