diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
| commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
| tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/development/tools/ocaml/ocamlformat | |
| parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
| parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
| download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip | |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/development/tools/ocaml/ocamlformat')
| -rw-r--r-- | nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix | 20 |
2 files changed, 28 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix index 1de95187af2f..57061cfe126c 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -40,5 +40,13 @@ rec { version = "0.15.0"; }; - ocamlformat = ocamlformat_0_15_0; + ocamlformat_0_15_1 = mkOCamlformat { + version = "0.15.1"; + }; + + ocamlformat_0_16_0 = mkOCamlformat { + version = "0.16.0"; + }; + + ocamlformat = ocamlformat_0_16_0; } diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 8fac26c2b3e8..24527fcf41af 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -18,6 +18,8 @@ let src = "0.14.2" = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz"; "0.14.3" = "13pfakdncddm41cp61p0l98scawbvhx1q4zdsglv7ph87l7zwqfl"; "0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; + "0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a"; + "0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr"; }."${version}"; } ; in @@ -39,7 +41,23 @@ buildDunePackage rec { useDune2 = true; buildInputs = - if lib.versionAtLeast version "0.14" + if lib.versionAtLeast version "0.15.1" + then [ + base + cmdliner + fpath + odoc + re + stdio + uuseg + uutf + fix + menhir + (ppxlib.override { version = "0.18.0"; }) + dune-build-info # lib.versionAtLeast version "0.16.0" + ocaml-version # lib.versionAtLeast version "0.16.0" + ] + else if lib.versionAtLeast version "0.14" then [ base cmdliner |