diff options
author | Ulrik Strid <ulrik.strid@outlook.com> | 2023-07-05 19:38:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-05 19:38:35 +0200 |
commit | 7f76939485a8487141f1d88942d65f03a2fa3d46 (patch) | |
tree | 0c4a58b2d0c95ca8a42473581809a52c79150527 /pkgs/development | |
parent | 4333f887a60ffe2d884d6f85e42433f6380f334d (diff) | |
parent | cc0557bb27dafc2e03dc69001a85a7c62688f9f2 (diff) |
Merge pull request #241708 from Julow/ocamlformat-move
ocamlPackages.ocamlformat: Move into 'ocamlPackages'
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/ocaml-modules/ocamlformat/generic.nix | 6 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix | 4 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix (renamed from pkgs/development/tools/ocaml/ocamlformat/generic.nix) | 11 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/ocamlformat/default.nix | 18 |
4 files changed, 7 insertions, 32 deletions
diff --git a/pkgs/development/ocaml-modules/ocamlformat/generic.nix b/pkgs/development/ocaml-modules/ocamlformat/generic.nix index 9f9f7cff1301b..0e998af86ff74 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/generic.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/generic.nix @@ -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"; diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix index a95f8d9a410b2..cefae4af027cd 100644 --- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix @@ -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; diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix index d63d0d9894b01..275c20dea8659 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix @@ -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"; diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix deleted file mode 100644 index f0f38777f1c2d..0000000000000 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ /dev/null @@ -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 {}; -} |