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

Commits on Aug 7, 2018

  1. reason: 3.0.4 -> 3.3.2 (#44593)

    dywedir authored and xeji committed Aug 7, 2018
    Copy the full SHA
    23fd014 View commit details
Showing with 8 additions and 10 deletions.
  1. +8 −10 pkgs/development/compilers/reason/default.nix
18 changes: 8 additions & 10 deletions pkgs/development/compilers/reason/default.nix
Original file line number Diff line number Diff line change
@@ -3,13 +3,13 @@

buildOcaml rec {
name = "reason";
version = "3.0.4";
version = "3.3.2";

src = fetchFromGitHub {
owner = "facebook";
repo = "reason";
rev = version;
sha256 = "15qhx85him5rr4j0ygj3jh3qv9ijrn82ibr9scbn0qrnn43kj047";
rev = "68a4124c772ee25c4729b005c8643851b1e17b92";
sha256 = "01v17m94ds98qk727mwpyx0a362zdf9s8x1fh8gp9jd9v3n6bc2d";
};

propagatedBuildInputs = [ menhir merlin_extend ppx_tools_versioned ];
@@ -20,13 +20,11 @@ buildOcaml rec {

createFindlibDestdir = true;

postPatch = ''
substituteInPlace src/reasonbuild/myocamlbuild.ml \
--replace "refmt --print binary" "$out/bin/refmt --print binary"
'';

installPhase = ''
${jbuilder.installPhase}
for p in reason rtop
do
${jbuilder.installPhase} $p.install
done
wrapProgram $out/bin/rtop \
--prefix PATH : "${utop}/bin" \
@@ -36,7 +34,7 @@ buildOcaml rec {
meta = with stdenv.lib; {
homepage = https://reasonml.github.io/;
description = "Facebook's friendly syntax to OCaml";
license = licenses.bsd3;
license = licenses.mit;
maintainers = [ maintainers.volth ];
};
}