ocamlPackages.extlib: rename from ocaml_extlib
This matches the name used in dune and on OPAM.
This commit is contained in:
parent
a834cc840f
commit
a110f08f12
|
@ -992,6 +992,12 @@ signald -d /var/lib/signald/db \
|
||||||
<literal>[ "lua54" "luau" ]</literal>.
|
<literal>[ "lua54" "luau" ]</literal>.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
<literal>ocamlPackages.ocaml_extlib</literal> has been renamed
|
||||||
|
to <literal>ocamlPackages.extlib</literal>.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
<literal>pkgs.fetchNextcloudApp</literal> has been rewritten
|
<literal>pkgs.fetchNextcloudApp</literal> has been rewritten
|
||||||
|
|
|
@ -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" ]`.
|
- `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
|
- `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`
|
apply patches. This means that your hashes are out-of-date and the (previously required) attributes `name` and `version`
|
||||||
are no longer accepted.
|
are no longer accepted.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ lib, buildDunePackage, fetchFromGitHub
|
{ lib, buildDunePackage, fetchFromGitHub
|
||||||
, ocaml_extlib, ocamlfuse, gapi-ocaml, ocaml_sqlite3
|
, extlib, ocamlfuse, gapi-ocaml, ocaml_sqlite3
|
||||||
, tiny_httpd
|
, tiny_httpd
|
||||||
, ounit
|
, ounit
|
||||||
}:
|
}:
|
||||||
|
@ -18,7 +18,7 @@ buildDunePackage rec {
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
checkInputs = [ ounit ];
|
checkInputs = [ ounit ];
|
||||||
|
|
||||||
buildInputs = [ ocaml_extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ];
|
buildInputs = [ extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
inherit (src.meta) homepage;
|
inherit (src.meta) homepage;
|
||||||
|
|
|
@ -14,7 +14,7 @@ ocamlPackages.buildDunePackage rec {
|
||||||
useDune2 = true;
|
useDune2 = true;
|
||||||
|
|
||||||
buildInputs = with ocamlPackages; [
|
buildInputs = with ocamlPackages; [
|
||||||
gen sedlex ocaml_extlib dune-build-info linenoise
|
gen sedlex extlib dune-build-info linenoise
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -13,7 +13,7 @@ let
|
||||||
sha
|
sha
|
||||||
dune_2
|
dune_2
|
||||||
luv
|
luv
|
||||||
ocaml_extlib
|
extlib
|
||||||
] else if lib.versionAtLeast version "4.0"
|
] else if lib.versionAtLeast version "4.0"
|
||||||
then with ocaml-ng.ocamlPackages_4_10; [
|
then with ocaml-ng.ocamlPackages_4_10; [
|
||||||
ocaml
|
ocaml
|
||||||
|
@ -25,7 +25,7 @@ let
|
||||||
sha
|
sha
|
||||||
dune_2
|
dune_2
|
||||||
luv
|
luv
|
||||||
ocaml_extlib-1-7-7
|
extlib-1-7-7
|
||||||
] else with ocaml-ng.ocamlPackages_4_05; [
|
] else with ocaml-ng.ocamlPackages_4_05; [
|
||||||
ocaml
|
ocaml
|
||||||
camlp4
|
camlp4
|
||||||
|
|
|
@ -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 {
|
stdenv.mkDerivation {
|
||||||
pname = "ocaml${ocaml.version}-cudf";
|
pname = "ocaml${ocaml.version}-cudf";
|
||||||
|
@ -25,7 +25,7 @@ stdenv.mkDerivation {
|
||||||
stdlib-shims
|
stdlib-shims
|
||||||
];
|
];
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
ocaml_extlib
|
extlib
|
||||||
];
|
];
|
||||||
|
|
||||||
checkTarget = [
|
checkTarget = [
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{ lib, buildDunePackage, fetchFromGitLab
|
{ lib, buildDunePackage, fetchFromGitLab
|
||||||
, camlzip, ocamlgraph, parmap, re, stdlib-shims
|
, camlzip, ocamlgraph, parmap, re, stdlib-shims
|
||||||
, base64, bz2, ocaml_extlib, cudf
|
, base64, bz2, extlib, cudf
|
||||||
, dpkg, git, ocaml, ounit, python39, python39Packages
|
, dpkg, git, ocaml, ounit, python39, python39Packages
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ buildDunePackage rec {
|
||||||
bz2
|
bz2
|
||||||
camlzip
|
camlzip
|
||||||
cudf
|
cudf
|
||||||
ocaml_extlib
|
extlib
|
||||||
ocamlgraph
|
ocamlgraph
|
||||||
re
|
re
|
||||||
stdlib-shims
|
stdlib-shims
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, buildDunePackage, fetchurl, ocaml_extlib, lutils, rdbg }:
|
{ lib, buildDunePackage, fetchurl, extlib, lutils, rdbg }:
|
||||||
|
|
||||||
buildDunePackage rec {
|
buildDunePackage rec {
|
||||||
pname = "lustre-v6";
|
pname = "lustre-v6";
|
||||||
|
@ -14,7 +14,7 @@ buildDunePackage rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
ocaml_extlib
|
extlib
|
||||||
lutils
|
lutils
|
||||||
rdbg
|
rdbg
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, fetchFromGitHub, ocamlPackages, buildOasisPackage, ounit, ocaml_extlib, num }:
|
{ lib, fetchFromGitHub, ocamlPackages, buildOasisPackage, ounit, extlib, num }:
|
||||||
|
|
||||||
buildOasisPackage rec {
|
buildOasisPackage rec {
|
||||||
pname = "tcslib";
|
pname = "tcslib";
|
||||||
|
@ -14,7 +14,7 @@ buildOasisPackage rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ ounit ];
|
buildInputs = [ ounit ];
|
||||||
propagatedBuildInputs = [ ocaml_extlib num ];
|
propagatedBuildInputs = [ extlib num ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://github.com/tcsprojects/tcslib";
|
homepage = "https://github.com/tcsprojects/tcslib";
|
||||||
|
|
|
@ -411,6 +411,12 @@ let
|
||||||
|
|
||||||
ethernet = callPackage ../development/ocaml-modules/ethernet { };
|
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 { };
|
ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { };
|
||||||
|
|
||||||
ezxmlm = callPackage ../development/ocaml-modules/ezxmlm { };
|
ezxmlm = callPackage ../development/ocaml-modules/ezxmlm { };
|
||||||
|
@ -561,9 +567,7 @@ let
|
||||||
|
|
||||||
iter = callPackage ../development/ocaml-modules/iter { };
|
iter = callPackage ../development/ocaml-modules/iter { };
|
||||||
|
|
||||||
javalib = callPackage ../development/ocaml-modules/javalib {
|
javalib = callPackage ../development/ocaml-modules/javalib { };
|
||||||
extlib = ocaml_extlib;
|
|
||||||
};
|
|
||||||
|
|
||||||
dypgen = callPackage ../development/ocaml-modules/dypgen { };
|
dypgen = callPackage ../development/ocaml-modules/dypgen { };
|
||||||
|
|
||||||
|
@ -1260,12 +1264,6 @@ let
|
||||||
|
|
||||||
ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { };
|
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 { };
|
ocb-stubblr = callPackage ../development/ocaml-modules/ocb-stubblr { };
|
||||||
|
|
||||||
ocurl = callPackage ../development/ocaml-modules/ocurl { };
|
ocurl = callPackage ../development/ocaml-modules/ocurl { };
|
||||||
|
|
Loading…
Reference in a new issue