ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-05 22:06:00 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #257454 from Julow/ocamlformat0261

Browse Source 
ocamlPackages.ocamlformat: 0.26.0 → 0.26.1
This commit is contained in:
Mario Rodas 2023-10-31 07:18:41 -05:00 committed by GitHub
commit 87f99309e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{ lib, fetchurl, version, astring, base, camlp-streams, cmdliner_1_0 { lib, fetchurl, version ? "0.26.1", astring, base, camlp-streams, cmdliner_1_0
, cmdliner_1_1, csexp, dune-build-info, either, fix, fpath, menhirLib, menhirSdk , cmdliner_1_1, csexp, dune-build-info, either, fix, fpath, menhirLib, menhirSdk
, ocaml-version, ocp-indent, odoc-parser, result, stdio, uuseg, uutf }: , ocaml-version, ocp-indent, odoc-parser, result, stdio, uuseg, uutf, ... }:
# The ocamlformat package have been split into two in version 0.25.1: # The ocamlformat package have been split into two in version 0.25.1:
# one for the library and one for the executable. # one for the library and one for the executable.
@ -23,9 +23,12 @@ rec {
"0.24.1" = "sha256-AjQl6YGPgOpQU3sjcaSnZsFJqZV9BYB+iKAE0tX0Qc4="; "0.24.1" = "sha256-AjQl6YGPgOpQU3sjcaSnZsFJqZV9BYB+iKAE0tX0Qc4=";
"0.25.1" = "sha256-3I8qMwyjkws2yssmI7s2Dti99uSorNKT29niJBpv0z0="; "0.25.1" = "sha256-3I8qMwyjkws2yssmI7s2Dti99uSorNKT29niJBpv0z0=";
"0.26.0" = "sha256-AxSUq3cM7xCo9qocvrVmDkbDqmwM1FexEP7IWadeh30="; "0.26.0" = "sha256-AxSUq3cM7xCo9qocvrVmDkbDqmwM1FexEP7IWadeh30=";
"0.26.1" = "sha256-2gBuQn8VuexhL7gI1EZZm9m3w+4lq+s9VVdHpw10xtc=";
}."${version}"; }."${version}";
}; };
inherit version;
odoc-parser_v = odoc-parser.override { odoc-parser_v = odoc-parser.override {
version = if lib.versionAtLeast version "0.24.0" then version = if lib.versionAtLeast version "0.24.0" then
"2.0.0" "2.0.0"

5
pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix
View File

@ -1,6 +1,7 @@
{ lib, callPackage, buildDunePackage, menhir, version ? "0.25.1" }: # Version can be selected with the 'version' argument, see generic.nix.
{ lib, callPackage, buildDunePackage, menhir, ... }@args:
let inherit (callPackage ./generic.nix { inherit version; }) src library_deps; let inherit (callPackage ./generic.nix args) src version library_deps;
in assert (lib.versionAtLeast version "0.25.1"); in assert (lib.versionAtLeast version "0.25.1");

29
pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix
View File

@ -1,25 +1,16 @@
{ lib, fetchurl, buildDunePackage, ocaml, csexp, sexplib0 }: # Version can be selected with the 'version' argument, see generic.nix.
{ lib, fetchurl, buildDunePackage, ocaml, csexp, sexplib0, callPackage, ... }@args:
# for compat with ocaml-lsp let
let source = # for compat with ocaml-lsp
if lib.versionAtLeast ocaml.version "4.13" version_arg =
then { if lib.versionAtLeast ocaml.version "4.13" then {} else { version = "0.20.0"; };
version = "0.26.0";
sha256 = "sha256-AxSUq3cM7xCo9qocvrVmDkbDqmwM1FexEP7IWadeh30=";
} else {
version = "0.20.0";
sha256 = "sha256-JtmNCgwjbCyUE4bWqdH5Nc2YSit+rekwS43DcviIfgk=";
};
in
buildDunePackage rec { inherit (callPackage ./generic.nix (args // version_arg)) src version;
in buildDunePackage rec {
pname = "ocamlformat-rpc-lib"; pname = "ocamlformat-rpc-lib";
inherit (source) version; inherit src version;
src = fetchurl {
url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz";
inherit (source) sha256;
};
minimalOCamlVersion = "4.08"; minimalOCamlVersion = "4.08";
duneVersion = "3"; duneVersion = "3";

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

@ -1,3 +1,4 @@
# Version can be selected with the 'version' argument, see generic.nix.
{ lib { lib
, callPackage , callPackage
, buildDunePackage , buildDunePackage
@ -5,10 +6,10 @@
, re , re
, ocamlformat-lib , ocamlformat-lib
, menhir , menhir
, version ? "0.26.0" , ...
}: }@args:
let inherit (callPackage ./generic.nix { inherit version; }) src library_deps; let inherit (callPackage ./generic.nix args) src version library_deps;
in 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")

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

@ -16896,7 +16896,7 @@ with pkgs;
ocamlformat # latest version ocamlformat # latest version
ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 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_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1
ocamlformat_0_26_0; ocamlformat_0_26_0 ocamlformat_0_26_1;
inherit (ocamlPackages) odig; inherit (ocamlPackages) odig;

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

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