pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #241708 from Julow/ocamlformat-move

ocamlPackages.ocamlformat: Move into 'ocamlPackages'

authored by

Ulrik Strid and committed by
GitHub 7f769394 4333f887

+22 -33
unified split
+3 -3
pkgs/development/ocaml-modules/ocamlformat/generic.nix
··· 1 - { lib, fetchurl, ocaml-ng, version }: 1 + { lib, fetchurl, version, astring, base, camlp-streams, cmdliner_1_0 2 + , cmdliner_1_1, csexp, dune-build-info, either, fix, fpath, menhirLib, menhirSdk 3 + , ocaml-version, ocp-indent, odoc-parser, result, stdio, uuseg, uutf }: 2 4 3 5 # The ocamlformat package have been split into two in version 0.25.1: 4 6 # one for the library and one for the executable. 5 7 # Both have the same sources and very similar dependencies. 6 - 7 - with ocaml-ng.ocamlPackages; 8 8 9 9 rec { 10 10 tarballName = "ocamlformat-${version}.tbz";
+1 -3
pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix
··· 1 - { lib, callPackage, ocaml-ng, version ? "0.25.1" }: 2 - 3 - with ocaml-ng.ocamlPackages; 1 + { lib, callPackage, buildDunePackage, menhir, version ? "0.25.1" }: 4 2 5 3 let inherit (callPackage ./generic.nix { inherit version; }) src library_deps; 6 4
-18
pkgs/development/tools/ocaml/ocamlformat/default.nix
··· 1 - { lib, fetchurl, fetchzip, callPackage }: 2 - 3 - # Older versions should be removed when their usage decrease 4 - # This script scraps Github looking for OCamlformat's options and versions usage: 5 - # https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433 6 - 7 - rec { 8 - ocamlformat_0_19_0 = ocamlformat.override { version = "0.19.0"; }; 9 - ocamlformat_0_20_0 = ocamlformat.override { version = "0.20.0"; }; 10 - ocamlformat_0_20_1 = ocamlformat.override { version = "0.20.1"; }; 11 - ocamlformat_0_21_0 = ocamlformat.override { version = "0.21.0"; }; 12 - ocamlformat_0_22_4 = ocamlformat.override { version = "0.22.4"; }; 13 - ocamlformat_0_23_0 = ocamlformat.override { version = "0.23.0"; }; 14 - ocamlformat_0_24_1 = ocamlformat.override { version = "0.24.1"; }; 15 - ocamlformat_0_25_1 = ocamlformat.override { version = "0.25.1"; }; 16 - 17 - ocamlformat = callPackage ./generic.nix {}; 18 - }
+3 -8
pkgs/development/tools/ocaml/ocamlformat/generic.nix pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
··· 1 - { lib, callPackage, ocaml-ng, version ? "0.25.1" }: 2 - 3 - with ocaml-ng.ocamlPackages; 1 + { lib, callPackage, buildDunePackage, re, ocamlformat-lib, menhir 2 + , version ? "0.25.1" }: 4 3 5 - let 6 - inherit (callPackage ../../../ocaml-modules/ocamlformat/generic.nix { 7 - inherit version; 8 - }) 9 - src library_deps; 4 + let inherit (callPackage ./generic.nix { inherit version; }) src library_deps; 10 5 11 6 in buildDunePackage { 12 7 pname = "ocamlformat";
+1 -1
pkgs/top-level/all-packages.nix
··· 16348 16348 16349 16349 ocaml-crunch = ocamlPackages.crunch.bin; 16350 16350 16351 - inherit (callPackage ../development/tools/ocaml/ocamlformat { }) 16351 + inherit (ocamlPackages) 16352 16352 ocamlformat # latest version 16353 16353 ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 16354 16354 ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_1 ocamlformat_0_25_1;
+14
pkgs/top-level/ocaml-packages.nix
··· 1170 1170 1171 1171 ocamlc-loc = callPackage ../development/ocaml-modules/ocamlc-loc { }; 1172 1172 1173 + # Older versions of OCamlformat should be removed when their usage decrease 1174 + # This script scraps Github looking for OCamlformat's options and versions usage: 1175 + # https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433 1176 + ocamlformat_0_19_0 = ocamlformat.override { version = "0.19.0"; }; 1177 + ocamlformat_0_20_0 = ocamlformat.override { version = "0.20.0"; }; 1178 + ocamlformat_0_20_1 = ocamlformat.override { version = "0.20.1"; }; 1179 + ocamlformat_0_21_0 = ocamlformat.override { version = "0.21.0"; }; 1180 + ocamlformat_0_22_4 = ocamlformat.override { version = "0.22.4"; }; 1181 + ocamlformat_0_23_0 = ocamlformat.override { version = "0.23.0"; }; 1182 + ocamlformat_0_24_1 = ocamlformat.override { version = "0.24.1"; }; 1183 + ocamlformat_0_25_1 = ocamlformat.override { version = "0.25.1"; }; 1184 + 1185 + ocamlformat = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat.nix {}; 1186 + 1173 1187 ocamlformat-lib = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat-lib.nix { }; 1174 1188 1175 1189 ocamlformat-rpc-lib = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix { };