From f8bab20f015e6df8aa019e31bb220c4ac1e9a76d Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 25 Nov 2020 14:15:42 +0100 Subject: [PATCH] ocamlPackages.ocaml-migrate-parsetree: 1.7.3 -> 1.8.0 --- .../ocaml-migrate-parsetree/{default.nix => 1.8.x.nix} | 4 ++-- pkgs/development/ocaml-modules/sqlexpr/ppx.nix | 2 ++ pkgs/top-level/ocaml-packages.nix | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) rename pkgs/development/ocaml-modules/ocaml-migrate-parsetree/{default.nix => 1.8.x.nix} (84%) diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix similarity index 84% rename from pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix rename to pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix index bcd0a519899c..faadaf214f51 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "ocaml-migrate-parsetree"; - version = "1.7.3"; + version = "1.8.0"; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = "v${version}"; - sha256 = "0336vz0galjnsazbmkxjwdv1qvdqsx2rgrvp778xgq2fzasz45cx"; + sha256 = "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq"; }; propagatedBuildInputs = [ ppx_derivers result ]; diff --git a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix b/pkgs/development/ocaml-modules/sqlexpr/ppx.nix index 863bd21c90ef..572ff5936154 100644 --- a/pkgs/development/ocaml-modules/sqlexpr/ppx.nix +++ b/pkgs/development/ocaml-modules/sqlexpr/ppx.nix @@ -6,6 +6,8 @@ buildDunePackage { pname = "ppx_sqlexpr"; inherit (sqlexpr) version src meta; + minimumOCamlVersion = "4.06"; + postPatch = '' substituteInPlace src/ppx/jbuild --replace ppx_core ppxlib ''; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 64a23c21fc30..b4bf6f7852e5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -662,7 +662,9 @@ let ocaml-lsp = callPackage ../development/ocaml-modules/ocaml-lsp { }; - ocaml-migrate-parsetree = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree { }; + ocaml-migrate-parsetree = ocaml-migrate-parsetree-1-8; + + ocaml-migrate-parsetree-1-8 = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix { }; ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { };