b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #241708 from Julow/ocamlformat-move

Browse source 
ocamlPackages.ocamlformat: Move into 'ocamlPackages'
This commit is contained in:
Ulrik Strid 2023-07-05 19:38:35 +02:00 committed by GitHub
parent 4333f887a6 cc0557bb27
commit 7f76939485
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/ocaml-modules/ocamlformat/generic.nix
View file

@ -1,11 +1,11 @@
{ lib, fetchurl, ocaml-ng, version }:
{ lib, fetchurl, version, 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 }:
# The ocamlformat package have been split into two in version 0.25.1:
# one for the library and one for the executable.
# Both have the same sources and very similar dependencies.
with ocaml-ng.ocamlPackages;
rec {
tarballName = "ocamlformat-${version}.tbz";

4
pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix
View file

@ -1,6 +1,4 @@
{ lib, callPackage, ocaml-ng, version ? "0.25.1" }:
with ocaml-ng.ocamlPackages;
{ lib, callPackage, buildDunePackage, menhir, version ? "0.25.1" }:
let inherit (callPackage ./generic.nix { inherit version; }) src library_deps;

11
pkgs/development/tools/ocaml/ocamlformat/generic.nix → pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
View file

@ -1,12 +1,7 @@
{ lib, callPackage, ocaml-ng, version ? "0.25.1" }:
{ lib, callPackage, buildDunePackage, re, ocamlformat-lib, menhir
, version ? "0.25.1" }:
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 { };