diff options
| author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2020-11-25 14:15:42 +0100 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2020-11-26 16:07:18 +0100 |
| commit | f8bab20f015e6df8aa019e31bb220c4ac1e9a76d (patch) | |
| tree | 2e31b85cc6b9c76a414303778324373f85378213 | |
| parent | a97cb19b38e70d41bece868736c5194b5824d968 (diff) | |
| download | nixpkgs-f8bab20f015e6df8aa019e31bb220c4ac1e9a76d.tar nixpkgs-f8bab20f015e6df8aa019e31bb220c4ac1e9a76d.tar.gz nixpkgs-f8bab20f015e6df8aa019e31bb220c4ac1e9a76d.tar.bz2 nixpkgs-f8bab20f015e6df8aa019e31bb220c4ac1e9a76d.tar.lz nixpkgs-f8bab20f015e6df8aa019e31bb220c4ac1e9a76d.tar.xz nixpkgs-f8bab20f015e6df8aa019e31bb220c4ac1e9a76d.tar.zst nixpkgs-f8bab20f015e6df8aa019e31bb220c4ac1e9a76d.zip | |
ocamlPackages.ocaml-migrate-parsetree: 1.7.3 -> 1.8.0
| -rw-r--r-- | pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix (renamed from pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix) | 4 | ||||
| -rw-r--r-- | pkgs/development/ocaml-modules/sqlexpr/ppx.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix index bcd0a519899..faadaf214f5 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 863bd21c90e..572ff593615 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 64a23c21fc3..b4bf6f7852e 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 { }; |