ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-20 08:59:32 +03:00
Code Issues Projects Releases Wiki Activity

ocamlPackages.ocaml-migrate-parsetree: 2.1.0 → 2.2.0

Browse Source
This commit is contained in:
Vincent Laporte 2021-06-21 17:59:07 +02:00 committed by Vincent Laporte
parent 97613b7a86
commit a29a3981ef
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.1.x.nix → pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix
View File

@ -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 = {

4
pkgs/development/ocaml-modules/ppx_deriving/default.nix
View File

@ -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

4
pkgs/development/ocaml-modules/ppxlib/default.nix
View File

@ -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

2
pkgs/development/tools/analysis/flow/default.nix
View File

@ -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; {

2
pkgs/development/tools/ocaml/ocamlformat/generic.nix
View File

@ -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 [

6
pkgs/top-level/ocaml-packages.nix
View File

@ -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 { };