talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

ocamlPackages.ocamlformat: Move into 'ocamlPackages'

Browse Source 
Move the definitions of OCamlformat packages into ocamlPackages. This
moves the package containing the tool closer to the definition of the
library.

It's now possible to build OCamlformat using a different version of
OCaml than the default.

`ocamlformat`, `ocamlPackages.ocamlformat` and
`ocaml-ng.ocamlPackages_<lastest>.ocamlformat` are all aliases.
This commit is contained in:
Jules Aguillon 2023-07-05 17:21:04 +02:00
parent a5ca6a0f2e
commit fb98ebb9a0
4 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/tools/ocaml/ocamlformat/generic.nix → pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
View File

@ -2,11 +2,7 @@
with ocaml-ng.ocamlPackages;
let
inherit (callPackage ../../../ocaml-modules/ocamlformat/generic.nix {
inherit version;
})
src library_deps;
let inherit (callPackage ./generic.nix { inherit version; }) src library_deps;
in buildDunePackage {
pname = "ocamlformat";

18
pkgs/development/tools/ocaml/ocamlformat/default.nix
View File

@ -1,18 +0,0 @@
{ lib, fetchurl, fetchzip, callPackage }:
# Older versions should be removed when their usage decrease
# This script scraps Github looking for OCamlformat's options and versions usage:
# https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433
rec {
ocamlformat_0_19_0 = ocamlformat.override { version = "0.19.0"; };
ocamlformat_0_20_0 = ocamlformat.override { version = "0.20.0"; };
ocamlformat_0_20_1 = ocamlformat.override { version = "0.20.1"; };
ocamlformat_0_21_0 = ocamlformat.override { version = "0.21.0"; };
ocamlformat_0_22_4 = ocamlformat.override { version = "0.22.4"; };
ocamlformat_0_23_0 = ocamlformat.override { version = "0.23.0"; };
ocamlformat_0_24_1 = ocamlformat.override { version = "0.24.1"; };
ocamlformat_0_25_1 = ocamlformat.override { version = "0.25.1"; };
ocamlformat = callPackage ./generic.nix {};
}

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

@ -16348,7 +16348,7 @@ with pkgs;
ocaml-crunch = ocamlPackages.crunch.bin;
inherit (callPackage ../development/tools/ocaml/ocamlformat { })
inherit (ocamlPackages)
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;

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

@ -1170,6 +1170,20 @@ let
ocamlc-loc = callPackage ../development/ocaml-modules/ocamlc-loc { };
# Older versions of OCamlformat should be removed when their usage decrease
# This script scraps Github looking for OCamlformat's options and versions usage:
# https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433
ocamlformat_0_19_0 = ocamlformat.override { version = "0.19.0"; };
ocamlformat_0_20_0 = ocamlformat.override { version = "0.20.0"; };
ocamlformat_0_20_1 = ocamlformat.override { version = "0.20.1"; };
ocamlformat_0_21_0 = ocamlformat.override { version = "0.21.0"; };
ocamlformat_0_22_4 = ocamlformat.override { version = "0.22.4"; };
ocamlformat_0_23_0 = ocamlformat.override { version = "0.23.0"; };
ocamlformat_0_24_1 = ocamlformat.override { version = "0.24.1"; };
ocamlformat_0_25_1 = ocamlformat.override { version = "0.25.1"; };
ocamlformat = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat.nix {};
ocamlformat-lib = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat-lib.nix { };
ocamlformat-rpc-lib = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix { };