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

Commits on Jun 17, 2019

  1. ocamlPackages.merlin: 3.3.0 -> 3.3.1

    @marsam
    marsam committed Jun 17, 2019
    Copy the full SHA
    4f7a080 View commit details

Commits on Jun 20, 2019

  1. Merge pull request #63412 from marsam/update-ocaml-merlin 

    ocamlPackages.merlin: 3.3.0 -> 3.3.1
    @marsam
    marsam authored Jun 20, 2019
    Copy the full SHA
    0e1bd6e 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,15 +2,15 @@

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

minimumOCamlVersion = "4.02.1";

src = fetchFromGitHub {
owner = "ocaml";
repo = pname;
rev = "v${version}";
sha256 = "1s4y7jz581hj4gqv4pkk3980khw4lm0qzcj416b4ckji40q7nf9d";
sha256 = "1z2m6jykgn3nylh4bfirhxlb0bwamifv4fgml6j34ggk1drs8xrl";
};

buildInputs = [ yojson ];