Unverified Commit 7f769394 authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

Merge pull request #241708 from Julow/ocamlformat-move 

ocamlPackages.ocamlformat: Move into 'ocamlPackages'
parents 4333f887 cc0557bb

pkgs/development/ocaml-modules/ocamlformat/generic.nix

+3 −3
Original line number Diff line number Diff line 
{ 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";

pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix

+1 −3
Original line number Diff line number Diff line 
{ 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;

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

+3 −8
Original line number Diff line number Diff line 
{ 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";

pkgs/development/tools/ocaml/ocamlformat/default.nix

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
{ 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 {};

}

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;