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

Commits on Jun 3, 2019

  1. ocamlPackages.merlin: 3.2.2 -> 3.3.0

    @marsam @vbgl
    marsam authored and vbgl committed Jun 3, 2019
    Copy the full SHA
    ddaf94d View commit details
Showing with 8 additions and 6 deletions.
  1. +8 −6 pkgs/development/tools/ocaml/merlin/default.nix
14 changes: 8 additions & 6 deletions pkgs/development/tools/ocaml/merlin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
{ stdenv, fetchzip, buildDunePackage, yojson }:
{ stdenv, fetchFromGitHub, buildDunePackage, yojson }:

buildDunePackage rec {
pname = "merlin";
version = "3.2.2";
version = "3.3.0";

minimumOCamlVersion = "4.02";
minimumOCamlVersion = "4.02.1";

src = fetchzip {
url = "https://github.com/ocaml/merlin/archive/v${version}.tar.gz";
sha256 = "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb";
src = fetchFromGitHub {
owner = "ocaml";
repo = pname;
rev = "v${version}";
sha256 = "1s4y7jz581hj4gqv4pkk3980khw4lm0qzcj416b4ckji40q7nf9d";
};

buildInputs = [ yojson ];