Unverified Commit 6e07221e authored by Vincent Laporte's avatar Vincent Laporte
Browse files

ocaml-ng.ocamlPackages_5_4: init at 5.4.0

parent 65f869a0

pkgs/development/compilers/ocaml/5.4.nix

0 → 100644
+6 −0
Original line number Diff line number Diff line 
import ./generic.nix {

  major_version = "5";

  minor_version = "4";

  patch_version = "0";

  sha256 = "sha256-36qKLhHHmbwXZdi+9EkRQG7l9IAwJxkDgqk5+IyRImY=";

}

pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix

+8 −1
Original line number Diff line number Diff line
@@ -9,7 +9,9 @@ 
  lib,

  ocaml,

  version ?

    if lib.versionAtLeast ocaml.version "5.3" then

    if lib.versionAtLeast ocaml.version "5.4" then

      "1.24.0"

    else if lib.versionAtLeast ocaml.version "5.3" then

      "1.23.1"

    else if lib.versionAtLeast ocaml.version "5.2" then

      "1.21.0"
@@ -26,6 +28,11 @@ 
let

  params =

    {

      "1.24.0" = {

        name = "lsp";

        minimalOCamlVersion = "5.3";

        sha256 = "sha256-TVoaIVf2EvbALY+DjZferKX4GyOt08XOpcts7Ot7N1c=";

      };

      "1.23.1" = {

        name = "lsp";

        minimalOCamlVersion = "5.3";

pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix

+3 −1
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ 
  ocamlformat-rpc-lib,

  ocaml,

  version ?

    if lib.versionAtLeast ocaml.version "5.3" then

    if lib.versionAtLeast ocaml.version "5.4" then

      "1.24.0"

    else if lib.versionAtLeast ocaml.version "5.3" then

      "1.23.1"

    else if lib.versionAtLeast ocaml.version "5.2" then

      "1.21.0"

pkgs/development/ocaml-modules/ppxlib/default.nix

+14 −5
Original line number Diff line number Diff line 
{

  lib,

  fetchurl,

  fetchFromGitHub,

  buildDunePackage,

  ocaml,

  version ?

    if lib.versionAtLeast ocaml.version "4.07" then

      if lib.versionAtLeast ocaml.version "4.08" then

        if lib.versionAtLeast ocaml.version "4.11" then

          if lib.versionAtLeast ocaml.version "5.03" then "0.36.2" else "0.33.0"

          if lib.versionAtLeast ocaml.version "5.03" then

            if lib.versionAtLeast ocaml.version "5.04" then "0.37.0" else "0.36.2"

          else

            "0.33.0"

        else

          "0.24.0"

      else
@@ -91,6 +95,10 @@ let 
        sha256 = "sha256-yHVgB9jKwTeahGEUYQDB1hHH327MGpoKqb3ewNbk5xs=";

        min_version = "4.08";

      };

      "0.37.0" = {

        sha256 = "sha256-LiI4N+fOzDvISkMkMsCnL04dW+kWXJwzdy8VbbhdsLM=";

        min_version = "4.08";

      };

    }

    ."${version}";

in
@@ -106,10 +114,11 @@ else 
    pname = "ppxlib";

    inherit version;



    src = fetchurl {

    src =

      param.src or (fetchurl {

        url = "https://github.com/ocaml-ppx/ppxlib/releases/download/${version}/ppxlib-${version}.tbz";

        inherit (param) sha256;

    };

      });



    propagatedBuildInputs = [

      ocaml-compiler-libs

pkgs/development/tools/ocaml/merlin/4.x.nix

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
      "5.2.0" = "5.3-502";

      "5.2.1" = "5.3-502";

      "5.3.0" = "5.6-503";

      "5.4.0" = "5.6-504";

    }

    ."${ocaml.version}",

}:
@@ -47,6 +48,7 @@ let 
    "5.3-502" = "sha256-LOpG8SOX+m4x7wwNT14Rwc/ZFu5JQgaUAFyV67OqJLw=";

    "5.4.1-503" = "sha256-SbO0x3jBISX8dAXnN5CwsxLV15dJ3XPUg4tlYqJTMCI=";

    "5.6-503" = "sha256-sNytCSqq96I/ZauaCJ6HYb1mXMcjV5CeCsbCGC9PwtQ=";

    "5.6-504" = "sha256-gtZIpBgNbVqjoIMhjii/GX9OnxR4hN6TArtoEa2Yt38=";

  };



in