public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.ppx_tools: 6.2 → 6.3 (add 4.12 support) (#110009)

Browse Source
This commit is contained in:
Antonio Nuno Monteiro 2021-01-20 23:25:33 -08:00 committed by GitHub
parent 6317796bec
commit c5ddb07e28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/ocaml-modules/ppx_tools/default.nix
View File

@ -1,9 +1,11 @@
{ lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib }: { lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }:
let param = let param =
let v6_2 = { let v6_3 = {
version = "6.2"; version = "6.3";
sha256 = "0qf4fwnn4hhk52kjw9frv21v23azqnn4mjvwf1hs0nxf7q4kacb5"; sha256 = "1skf4njvkifwx0qlsrc0jn891gvvcp5ryd6kkpx56hck7nnxv8x6";
useDune2 = lib.versionAtLeast ocaml.version "4.12";
buildInputs = [cppo];
}; in }; in
{ {
"4.02" = { "4.02" = {
@ -25,10 +27,11 @@ let param =
"4.07" = { "4.07" = {
version = "5.1+4.06.0"; version = "5.1+4.06.0";
sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; }; sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; };
"4.08" = v6_2; "4.08" = v6_3;
"4.09" = v6_2; "4.09" = v6_3;
"4.10" = v6_2; "4.10" = v6_3;
"4.11" = v6_2; "4.11" = v6_3;
"4.12" = v6_3;
}.${ocaml.meta.branch}; }.${ocaml.meta.branch};
in in
@ -50,7 +53,7 @@ if lib.versionAtLeast param.version "6.0"
then then
buildDunePackage { buildDunePackage {
inherit pname src meta; inherit pname src meta;
inherit (param) version; inherit (param) version useDune2 buildInputs;
} }
else else
stdenv.mkDerivation { stdenv.mkDerivation {