diff options
| author | Antonio Nuno Monteiro <anmonteiro@gmail.com> | 2021-01-20 23:25:33 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-21 08:25:33 +0100 |
| commit | c5ddb07e28eeadaf9469d114d0e04265ae9b9b37 (patch) | |
| tree | cd388fae4480ab681944104a3eb57f4a6ab324e9 /pkgs/development/ocaml-modules/ppx_tools | |
| parent | 6317796bec84655264f89e3e33d45fdc0292cac9 (diff) | |
| download | nixpkgs-c5ddb07e28eeadaf9469d114d0e04265ae9b9b37.tar nixpkgs-c5ddb07e28eeadaf9469d114d0e04265ae9b9b37.tar.gz nixpkgs-c5ddb07e28eeadaf9469d114d0e04265ae9b9b37.tar.bz2 nixpkgs-c5ddb07e28eeadaf9469d114d0e04265ae9b9b37.tar.lz nixpkgs-c5ddb07e28eeadaf9469d114d0e04265ae9b9b37.tar.xz nixpkgs-c5ddb07e28eeadaf9469d114d0e04265ae9b9b37.tar.zst nixpkgs-c5ddb07e28eeadaf9469d114d0e04265ae9b9b37.zip | |
ocamlPackages.ppx_tools: 6.2 → 6.3 (add 4.12 support) (#110009)
Diffstat (limited to 'pkgs/development/ocaml-modules/ppx_tools')
| -rw-r--r-- | pkgs/development/ocaml-modules/ppx_tools/default.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 94d7eb714dd..3e06af881c5 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -1,9 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib }: +{ lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }: let param = - let v6_2 = { - version = "6.2"; - sha256 = "0qf4fwnn4hhk52kjw9frv21v23azqnn4mjvwf1hs0nxf7q4kacb5"; + let v6_3 = { + version = "6.3"; + sha256 = "1skf4njvkifwx0qlsrc0jn891gvvcp5ryd6kkpx56hck7nnxv8x6"; + useDune2 = lib.versionAtLeast ocaml.version "4.12"; + buildInputs = [cppo]; }; in { "4.02" = { @@ -25,10 +27,11 @@ let param = "4.07" = { version = "5.1+4.06.0"; sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; - "4.08" = v6_2; - "4.09" = v6_2; - "4.10" = v6_2; - "4.11" = v6_2; + "4.08" = v6_3; + "4.09" = v6_3; + "4.10" = v6_3; + "4.11" = v6_3; + "4.12" = v6_3; }.${ocaml.meta.branch}; in @@ -50,7 +53,7 @@ if lib.versionAtLeast param.version "6.0" then buildDunePackage { inherit pname src meta; - inherit (param) version; + inherit (param) version useDune2 buildInputs; } else stdenv.mkDerivation { |