3
0
Fork 0
forked from mirrors/nixpkgs

ocamlPackages.extlib: rename from ocaml_extlib

This matches the name used in dune and on OPAM.
This commit is contained in:
sternenseemann 2022-11-16 13:12:28 +01:00 committed by Vincent Laporte
parent a834cc840f
commit a110f08f12
10 changed files with 28 additions and 22 deletions

View file

@ -992,6 +992,12 @@ signald -d /var/lib/signald/db \
<literal>[ &quot;lua54&quot; &quot;luau&quot; ]</literal>.
</para>
</listitem>
<listitem>
<para>
<literal>ocamlPackages.ocaml_extlib</literal> has been renamed
to <literal>ocamlPackages.extlib</literal>.
</para>
</listitem>
<listitem>
<para>
<literal>pkgs.fetchNextcloudApp</literal> has been rewritten

View file

@ -307,6 +307,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
- `stylua` no longer accepts `lua52Support` and `luauSupport` overrides, use `features` instead, which defaults to `[ "lua54" "luau" ]`.
- `ocamlPackages.ocaml_extlib` has been renamed to `ocamlPackages.extlib`.
- `pkgs.fetchNextcloudApp` has been rewritten to circumvent impurities in e.g. tarballs from GitHub and to make it easier to
apply patches. This means that your hashes are out-of-date and the (previously required) attributes `name` and `version`
are no longer accepted.

View file

@ -1,5 +1,5 @@
{ lib, buildDunePackage, fetchFromGitHub
, ocaml_extlib, ocamlfuse, gapi-ocaml, ocaml_sqlite3
, extlib, ocamlfuse, gapi-ocaml, ocaml_sqlite3
, tiny_httpd
, ounit
}:
@ -18,7 +18,7 @@ buildDunePackage rec {
doCheck = true;
checkInputs = [ ounit ];
buildInputs = [ ocaml_extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ];
buildInputs = [ extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ];
meta = {
inherit (src.meta) homepage;

View file

@ -14,7 +14,7 @@ ocamlPackages.buildDunePackage rec {
useDune2 = true;
buildInputs = with ocamlPackages; [
gen sedlex ocaml_extlib dune-build-info linenoise
gen sedlex extlib dune-build-info linenoise
];
postPatch = ''

View file

@ -13,7 +13,7 @@ let
sha
dune_2
luv
ocaml_extlib
extlib
] else if lib.versionAtLeast version "4.0"
then with ocaml-ng.ocamlPackages_4_10; [
ocaml
@ -25,7 +25,7 @@ let
sha
dune_2
luv
ocaml_extlib-1-7-7
extlib-1-7-7
] else with ocaml-ng.ocamlPackages_4_05; [
ocaml
camlp4

View file

@ -1,4 +1,4 @@
{ lib, fetchurl, stdenv, ocaml, ocamlbuild, findlib, ocaml_extlib, glib, perl, pkg-config, stdlib-shims, ounit }:
{ lib, fetchurl, stdenv, ocaml, ocamlbuild, findlib, extlib, glib, perl, pkg-config, stdlib-shims, ounit }:
stdenv.mkDerivation {
pname = "ocaml${ocaml.version}-cudf";
@ -25,7 +25,7 @@ stdenv.mkDerivation {
stdlib-shims
];
propagatedBuildInputs = [
ocaml_extlib
extlib
];
checkTarget = [

View file

@ -1,6 +1,6 @@
{ lib, buildDunePackage, fetchFromGitLab
, camlzip, ocamlgraph, parmap, re, stdlib-shims
, base64, bz2, ocaml_extlib, cudf
, base64, bz2, extlib, cudf
, dpkg, git, ocaml, ounit, python39, python39Packages
}:
@ -27,7 +27,7 @@ buildDunePackage rec {
bz2
camlzip
cudf
ocaml_extlib
extlib
ocamlgraph
re
stdlib-shims

View file

@ -1,4 +1,4 @@
{ lib, buildDunePackage, fetchurl, ocaml_extlib, lutils, rdbg }:
{ lib, buildDunePackage, fetchurl, extlib, lutils, rdbg }:
buildDunePackage rec {
pname = "lustre-v6";
@ -14,7 +14,7 @@ buildDunePackage rec {
};
propagatedBuildInputs = [
ocaml_extlib
extlib
lutils
rdbg
];

View file

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, ocamlPackages, buildOasisPackage, ounit, ocaml_extlib, num }:
{ lib, fetchFromGitHub, ocamlPackages, buildOasisPackage, ounit, extlib, num }:
buildOasisPackage rec {
pname = "tcslib";
@ -14,7 +14,7 @@ buildOasisPackage rec {
};
buildInputs = [ ounit ];
propagatedBuildInputs = [ ocaml_extlib num ];
propagatedBuildInputs = [ extlib num ];
meta = {
homepage = "https://github.com/tcsprojects/tcslib";

View file

@ -411,6 +411,12 @@ let
ethernet = callPackage ../development/ocaml-modules/ethernet { };
extlib = extlib-1-7-9;
extlib-1-7-9 = callPackage ../development/ocaml-modules/extlib { };
extlib-1-7-7 = callPackage ../development/ocaml-modules/extlib/1.7.7.nix { };
ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { };
ezxmlm = callPackage ../development/ocaml-modules/ezxmlm { };
@ -561,9 +567,7 @@ let
iter = callPackage ../development/ocaml-modules/iter { };
javalib = callPackage ../development/ocaml-modules/javalib {
extlib = ocaml_extlib;
};
javalib = callPackage ../development/ocaml-modules/javalib { };
dypgen = callPackage ../development/ocaml-modules/dypgen { };
@ -1260,12 +1264,6 @@ let
ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { };
ocaml_extlib = ocaml_extlib-1-7-9;
ocaml_extlib-1-7-9 = callPackage ../development/ocaml-modules/extlib { };
ocaml_extlib-1-7-7 = callPackage ../development/ocaml-modules/extlib/1.7.7.nix { };
ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { };
ocurl = callPackage ../development/ocaml-modules/ocurl { };