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

Commits on Apr 22, 2020

  1. ocamlPackages.merlin: 3.3.3 → 3.3.4 

    (cherry picked from commit 513e133)
    @vbgl
    vbgl committed Apr 22, 2020
    Copy the full SHA
    b6c7259 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/tools/ocaml/merlin/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/tools/ocaml/merlin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildDunePackage rec {
pname = "merlin";
version = "3.3.3";
version = "3.3.4";

minimumOCamlVersion = "4.02.1";

src = fetchurl {
url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz";
sha256 = "05dfkbpbb7nvs4g6y0iw7a9f73ygvhs9l45l2g56y7zagvs9x43j";
sha256 = "12wxric6n3rmsn0w16xm8vjd8p5aw24cj76zw2x87qfwwgmy1kdd";
};

buildInputs = [ yojson ];