From a29a3981efd43b0e58038151987cc8c09696d930 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 21 Jun 2021 17:59:07 +0200 Subject: [PATCH] =?UTF-8?q?ocamlPackages.ocaml-migrate-parsetree:=202.1.0?= =?UTF-8?q?=20=E2=86=92=202.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-migrate-parsetree/{2.1.x.nix => 2.x.nix} | 6 +++--- pkgs/development/ocaml-modules/ppx_deriving/default.nix | 4 ++-- pkgs/development/ocaml-modules/ppxlib/default.nix | 4 ++-- pkgs/development/tools/analysis/flow/default.nix | 2 +- pkgs/development/tools/ocaml/ocamlformat/generic.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) rename pkgs/development/ocaml-modules/ocaml-migrate-parsetree/{2.1.x.nix => 2.x.nix} (80%) diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix similarity index 80% rename from pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix rename to pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix index ca88fe32416..dab537df221 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix @@ -2,15 +2,15 @@ buildDunePackage rec { pname = "ocaml-migrate-parsetree"; - version = "2.1.0"; + version = "2.2.0"; useDune2 = true; - minimumOCamlVersion = "4.02"; + minimalOCamlVersion = "4.02"; src = fetchurl { url = "https://github.com/ocaml-ppx/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "07x7lm45kny0mi0fjvzw51445brm0dgy099cw0gpyly0wj77hyrq"; + sha256 = "188v3z09bg4gyv80c138fa3a3j2w54w5gc4r1ajw7klr70yqz9mj"; }; meta = { diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 7d415bd894e..5563e611346 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -7,7 +7,7 @@ , result , ounit , ocaml-migrate-parsetree -, ocaml-migrate-parsetree-2-1 +, ocaml-migrate-parsetree-2 }: let params = @@ -40,7 +40,7 @@ buildDunePackage rec { buildInputs = [ ppxlib cppo ]; propagatedBuildInputs = [ (if params.useOMP2 - then ocaml-migrate-parsetree-2-1 + then ocaml-migrate-parsetree-2 else ocaml-migrate-parsetree) ppx_derivers result diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index c92992197d2..a19d8cce52f 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -4,7 +4,7 @@ then if lib.versionAtLeast ocaml.version "4.08" then "0.22.0" else "0.15.0" else "0.13.0" , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio -, stdlib-shims, ocaml-migrate-parsetree-2-1 +, stdlib-shims, ocaml-migrate-parsetree-2 }: let param = { @@ -57,7 +57,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ocaml-compiler-libs (if param.useOMP2 or true - then ocaml-migrate-parsetree-2-1 + then ocaml-migrate-parsetree-2 else ocaml-migrate-parsetree) ppx_derivers stdio diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index ab0696f14ed..599908b4931 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow ''; - buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2-1 dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ]) + buildInputs = (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml-migrate-parsetree-2 dtoa core_kernel sedlex_2 ocaml_lwt lwt_log lwt_ppx ppx_deriving ppx_gen_rec ppx_tools_versioned visitors wtf8 ]) ++ lib.optionals stdenv.isDarwin [ CoreServices ]; meta = with lib; { diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 6f3ce218713..536fcd4acb1 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -83,7 +83,7 @@ buildDunePackage { ocaml-version # Changed since 0.16.0: (ppxlib.override { version = "0.22.0"; }) - ocaml-migrate-parsetree-2-1 + ocaml-migrate-parsetree-2 ] else if lib.versionAtLeast version "0.15.1" then [ diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index efe1808b922..e040cef1575 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -611,7 +611,7 @@ let }; lwt = callPackage ../development/ocaml-modules/lwt { - ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2; }; ocaml_lwt = lwt; @@ -847,12 +847,12 @@ let ocaml-migrate-parsetree-1-8 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix { }; - ocaml-migrate-parsetree-2-1 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix { }; + ocaml-migrate-parsetree-2 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix { }; ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; ocaml-monadic = callPackage ../development/ocaml-modules/ocaml-monadic { - ocaml-migrate-parsetree = ocaml-migrate-parsetree-2-1; + ocaml-migrate-parsetree = ocaml-migrate-parsetree-2; }; ocaml_mysql = callPackage ../development/ocaml-modules/mysql { };