pyrox.dev / nixpkgs
lol
fork atom

ocamlformat: 0.20.1 -> 0.21.0

The cmdliner dependency changed.
Update older version to use cmdliner_1_0 explicitly to be ready when it
changes.

Jules Aguillon 29750d36 5a61d189

+14 -10
unified split
+5 -1
pkgs/development/tools/ocaml/ocamlformat/default.nix
··· 68 version = "0.20.1"; 69 }; 70 71 - ocamlformat = ocamlformat_0_20_1; 72 }
··· 68 version = "0.20.1"; 69 }; 70 71 + ocamlformat_0_21_0 = mkOCamlformat { 72 + version = "0.21.0"; 73 + }; 74 + 75 + ocamlformat = ocamlformat_0_21_0; 76 }
+8 -8
pkgs/development/tools/ocaml/ocamlformat/generic.nix
··· 25 "0.19.0" = "0ihgwl7d489g938m1jvgx8azdgq9f5np5mzqwwya797hx2m4dz32"; 26 "0.20.0" = "sha256-JtmNCgwjbCyUE4bWqdH5Nc2YSit+rekwS43DcviIfgk="; 27 "0.20.1" = "sha256-fTpRZFQW+ngoc0T6A69reEUAZ6GmHkeQvxspd5zRAjU="; 28 }."${version}"; 29 }; 30 ocamlPackages = ··· 60 if lib.versionAtLeast version "0.20.0" 61 then [ 62 base 63 - cmdliner 64 dune-build-info 65 either 66 fix ··· 78 else if lib.versionAtLeast version "0.19.0" 79 then [ 80 base 81 - cmdliner 82 fpath 83 re 84 stdio ··· 94 else if lib.versionAtLeast version "0.18.0" 95 then [ 96 base 97 - cmdliner 98 fpath 99 odoc 100 re ··· 112 else if lib.versionAtLeast version "0.17.0" 113 then [ 114 base 115 - cmdliner 116 fpath 117 odoc 118 re ··· 131 else if lib.versionAtLeast version "0.15.1" 132 then [ 133 base 134 - cmdliner 135 fpath 136 odoc 137 re ··· 148 else if lib.versionAtLeast version "0.14" 149 then [ 150 base 151 - cmdliner 152 fpath 153 ocaml-migrate-parsetree 154 odoc ··· 161 menhirSdk 162 ] else [ 163 base 164 - cmdliner 165 fpath 166 ocaml-migrate-parsetree 167 odoc ··· 178 license = lib.licenses.mit; 179 }; 180 } 181 -
··· 25 "0.19.0" = "0ihgwl7d489g938m1jvgx8azdgq9f5np5mzqwwya797hx2m4dz32"; 26 "0.20.0" = "sha256-JtmNCgwjbCyUE4bWqdH5Nc2YSit+rekwS43DcviIfgk="; 27 "0.20.1" = "sha256-fTpRZFQW+ngoc0T6A69reEUAZ6GmHkeQvxspd5zRAjU="; 28 + "0.21.0" = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0="; 29 }."${version}"; 30 }; 31 ocamlPackages = ··· 61 if lib.versionAtLeast version "0.20.0" 62 then [ 63 base 64 + (if lib.versionAtLeast version "0.21.0" then cmdliner_1_1 else cmdliner_1_0) 65 dune-build-info 66 either 67 fix ··· 79 else if lib.versionAtLeast version "0.19.0" 80 then [ 81 base 82 + cmdliner_1_0 83 fpath 84 re 85 stdio ··· 95 else if lib.versionAtLeast version "0.18.0" 96 then [ 97 base 98 + cmdliner_1_0 99 fpath 100 odoc 101 re ··· 113 else if lib.versionAtLeast version "0.17.0" 114 then [ 115 base 116 + cmdliner_1_0 117 fpath 118 odoc 119 re ··· 132 else if lib.versionAtLeast version "0.15.1" 133 then [ 134 base 135 + cmdliner_1_0 136 fpath 137 odoc 138 re ··· 149 else if lib.versionAtLeast version "0.14" 150 then [ 151 base 152 + cmdliner_1_0 153 fpath 154 ocaml-migrate-parsetree 155 odoc ··· 162 menhirSdk 163 ] else [ 164 base 165 + cmdliner_1_0 166 fpath 167 ocaml-migrate-parsetree 168 odoc ··· 179 license = lib.licenses.mit; 180 }; 181 }
+1 -1
pkgs/top-level/all-packages.nix
··· 13570 ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0 13571 ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0 13572 ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0 ocamlformat_0_18_0 13573 - ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1; 13574 13575 orc = callPackage ../development/compilers/orc { }; 13576
··· 13570 ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0 13571 ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0 13572 ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0 ocamlformat_0_18_0 13573 + ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0; 13574 13575 orc = callPackage ../development/compilers/orc { }; 13576