diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2021-04-20 22:22:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-20 22:22:34 -0500 |
| commit | 04bb7dc19bc7b382f76b186e9674397a4f371f4a (patch) | |
| tree | 7f21e7771cbe7eb6a5125e5a38ec0dd35bfe154e | |
| parent | 8b2b6e4e113d5aba50f8c0c0fef152521ceb1960 (diff) | |
| parent | 212adc0c99ba152053b61d8479b47a672ef0c6c8 (diff) | |
| download | nixpkgs-04bb7dc19bc7b382f76b186e9674397a4f371f4a.tar nixpkgs-04bb7dc19bc7b382f76b186e9674397a4f371f4a.tar.gz nixpkgs-04bb7dc19bc7b382f76b186e9674397a4f371f4a.tar.bz2 nixpkgs-04bb7dc19bc7b382f76b186e9674397a4f371f4a.tar.lz nixpkgs-04bb7dc19bc7b382f76b186e9674397a4f371f4a.tar.xz nixpkgs-04bb7dc19bc7b382f76b186e9674397a4f371f4a.tar.zst nixpkgs-04bb7dc19bc7b382f76b186e9674397a4f371f4a.zip | |
Merge pull request #119686 from marsam/update-ocamlformat
ocamlformat: 0.17.0 -> 0.18.0
| -rw-r--r-- | pkgs/development/tools/ocaml/ocamlformat/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/ocamlformat/generic.nix | 28 |
2 files changed, 27 insertions, 7 deletions
diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index c3b4182a0b5..4c8a4b9e9d0 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -52,5 +52,9 @@ rec { version = "0.17.0"; }; - ocamlformat = ocamlformat_0_17_0; + ocamlformat_0_18_0 = mkOCamlformat { + version = "0.18.0"; + }; + + ocamlformat = ocamlformat_0_18_0; } diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 69f26c5b887..223ac39c6aa 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -21,11 +21,10 @@ let src = "0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a"; "0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr"; "0.17.0" = "0f1lxp697yq61z8gqxjjaqd2ns8fd1vjfggn55x0gh9dx098p138"; + "0.18.0" = "0571kzmb1h03qj74090n3mg8wfbh29qqrkdjkai6rnl5chll86lq"; }."${version}"; - } -; in - -let ocamlPackages = + }; + ocamlPackages = if lib.versionAtLeast version "0.14.3" then ocaml-ng.ocamlPackages else ocaml-ng.ocamlPackages_4_07 @@ -33,7 +32,7 @@ let ocamlPackages = with ocamlPackages; -buildDunePackage rec { +buildDunePackage { pname = "ocamlformat"; inherit src version; @@ -45,7 +44,24 @@ buildDunePackage rec { useDune2 = true; buildInputs = - if lib.versionAtLeast version "0.17.0" + if lib.versionAtLeast version "0.18.0" + then [ + base + cmdliner + fpath + odoc + re + stdio + uuseg + uutf + fix + menhir + dune-build-info + ocaml-version + # Changed since 0.16.0: + (ppxlib.override { version = "0.22.0"; }) + ] + else if lib.versionAtLeast version "0.17.0" then [ base cmdliner |