Merge pull request #311849 from vbgl/ocaml-ocamlformat-0.26.2

ocamlPackages.ocamlformat: 0.26.1 → 0.26.2

authored by Ulrik Strid and committed by GitHub e11c3f6f b08b6446

+6 -3
+2 -1
pkgs/development/ocaml-modules/ocamlformat/generic.nix
··· 1 - { lib, fetchurl, version ? "0.26.1", astring, base, camlp-streams, cmdliner_1_0 1 + { lib, fetchurl, version ? "0.26.2", astring, base, camlp-streams, cmdliner_1_0 2 2 , cmdliner_1_1, csexp, dune-build-info, either, fix, fpath, menhirLib, menhirSdk 3 3 , ocaml-version, ocp-indent, odoc-parser, result, stdio, uuseg, uutf, ... }: 4 4 ··· 24 24 "0.25.1" = "sha256-3I8qMwyjkws2yssmI7s2Dti99uSorNKT29niJBpv0z0="; 25 25 "0.26.0" = "sha256-AxSUq3cM7xCo9qocvrVmDkbDqmwM1FexEP7IWadeh30="; 26 26 "0.26.1" = "sha256-2gBuQn8VuexhL7gI1EZZm9m3w+4lq+s9VVdHpw10xtc="; 27 + "0.26.2" = "sha256-Lk9Za/eqNnqET+g7oPawvxSyplF53cCCNj/peT0DdcU="; 27 28 }."${version}"; 28 29 }; 29 30
+2 -1
pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
··· 12 12 let inherit (callPackage ./generic.nix args) src version library_deps; 13 13 in 14 14 15 - lib.throwIf (lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23") 15 + lib.throwIf (lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23" 16 + || lib.versionAtLeast ocaml.version "5.2" && !lib.versionAtLeast version "0.26.2") 16 17 "ocamlformat ${version} is not available for OCaml ${ocaml.version}" 17 18 18 19 buildDunePackage {
+1 -1
pkgs/top-level/all-packages.nix
··· 16487 16487 ocamlformat # latest version 16488 16488 ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 16489 16489 ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1 16490 - ocamlformat_0_26_0 ocamlformat_0_26_1; 16490 + ocamlformat_0_26_0 ocamlformat_0_26_1 ocamlformat_0_26_2; 16491 16491 16492 16492 inherit (ocamlPackages) odig; 16493 16493
+1
pkgs/top-level/ocaml-packages.nix
··· 1292 1292 ocamlformat_0_25_1 = ocamlformat.override { version = "0.25.1"; }; 1293 1293 ocamlformat_0_26_0 = ocamlformat.override { version = "0.26.0"; }; 1294 1294 ocamlformat_0_26_1 = ocamlformat.override { version = "0.26.1"; }; 1295 + ocamlformat_0_26_2 = ocamlformat.override { version = "0.26.2"; }; 1295 1296 1296 1297 ocamlformat = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat.nix {}; 1297 1298