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

Merge pull request from vbgl/ocaml-ocamlformat-0.26.2

Browse Source 
ocamlPackages.ocamlformat: 0.26.1 → 0.26.2
This commit is contained in:
Ulrik Strid 2024-05-16 15:08:38 +02:00 committed by GitHub
commit e11c3f6fd9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 3 deletions
pkgs
development/ocaml-modules/ocamlformat
generic.nixocamlformat.nix
top-level
all-packages.nixocaml-packages.nix

3
pkgs/development/ocaml-modules/ocamlformat/generic.nix
View File

@ -1,4 +1,4 @@
{ lib, fetchurl, version ? "0.26.1", astring, base, camlp-streams, cmdliner_1_0
{ lib, fetchurl, version ? "0.26.2", astring, base, camlp-streams, cmdliner_1_0
, cmdliner_1_1, csexp, dune-build-info, either, fix, fpath, menhirLib, menhirSdk
, ocaml-version, ocp-indent, odoc-parser, result, stdio, uuseg, uutf, ... }:
@ -24,6 +24,7 @@ rec {
"0.25.1" = "sha256-3I8qMwyjkws2yssmI7s2Dti99uSorNKT29niJBpv0z0=";
"0.26.0" = "sha256-AxSUq3cM7xCo9qocvrVmDkbDqmwM1FexEP7IWadeh30=";
"0.26.1" = "sha256-2gBuQn8VuexhL7gI1EZZm9m3w+4lq+s9VVdHpw10xtc=";
"0.26.2" = "sha256-Lk9Za/eqNnqET+g7oPawvxSyplF53cCCNj/peT0DdcU=";
}."${version}";
};

3
pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
View File

@ -12,7 +12,8 @@
let inherit (callPackage ./generic.nix args) src version library_deps;
in
lib.throwIf (lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23")
lib.throwIf (lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23"
|| lib.versionAtLeast ocaml.version "5.2" && !lib.versionAtLeast version "0.26.2")
"ocamlformat ${version} is not available for OCaml ${ocaml.version}"
buildDunePackage {

2
pkgs/top-level/all-packages.nix
View File

@ -16487,7 +16487,7 @@ with pkgs;
ocamlformat # latest version
ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0
ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1
ocamlformat_0_26_0 ocamlformat_0_26_1;
ocamlformat_0_26_0 ocamlformat_0_26_1 ocamlformat_0_26_2;
inherit (ocamlPackages) odig;

1
pkgs/top-level/ocaml-packages.nix
View File

@ -1292,6 +1292,7 @@ let
ocamlformat_0_25_1 = ocamlformat.override { version = "0.25.1"; };
ocamlformat_0_26_0 = ocamlformat.override { version = "0.26.0"; };
ocamlformat_0_26_1 = ocamlformat.override { version = "0.26.1"; };
ocamlformat_0_26_2 = ocamlformat.override { version = "0.26.2"; };
ocamlformat = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat.nix {};