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: af82b55eccc9
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a685288d4692
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 2, 2019

  1. reason: 3.3.7 -> 3.5.0

    @vbgl
    vbgl committed Aug 2, 2019
    Copy the full SHA
    ea5ce27 View commit details

Commits on Aug 3, 2019

  1. Merge pull request #65778 from vbgl/reason-3.5.0 

    reason: 3.3.7 -> 3.5.0
    @srhb
    srhb authored Aug 3, 2019
    Copy the full SHA
    a685288 View commit details
Showing with 7 additions and 5 deletions.
  1. +7 −5 pkgs/development/compilers/reason/default.nix
12 changes: 7 additions & 5 deletions pkgs/development/compilers/reason/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
{ stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune
, menhir, merlin-extend, ppx_tools_versioned, utop
, menhir, merlin-extend, ppx_tools_versioned, utop, cppo
, ocaml_lwt
}:

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-reason-${version}";
version = "3.3.7";
version = "3.5.0";

src = fetchFromGitHub {
owner = "facebook";
repo = "reason";
rev = "4d20e5b535c29c5ef1283e65958b32996e449e5a";
sha256 = "0f3pb61wg58g8f3wcnp1h4gpmnwmp7bq0cnqdfwldmh9cs0dqyfk";
rev = "ea207004e021efef5a92ecd011d9d5b9b16bbded";
sha256 = "0cdjy7sw15rlk63prrwy8lavqrz8fqwsgwr19ihvj99x332r98kk";
};

nativeBuildInputs = [ makeWrapper ];

propagatedBuildInputs = [ menhir merlin-extend ppx_tools_versioned ];

buildInputs = [ ocaml findlib dune utop menhir ];
buildInputs = [ ocaml findlib dune cppo utop menhir ];

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

@@ -26,6 +27,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/rtop \
--prefix PATH : "${utop}/bin" \
--set CAML_LD_LIBRARY_PATH ${ocaml_lwt}/lib/ocaml/${ocaml.version}/site-lib:$CAML_LD_LIBRARY_PATH \
--set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH
'';