Commit a110f08f authored by sternenseemann's avatar sternenseemann Committed by Vincent Laporte
Browse files

ocamlPackages.extlib: rename from ocaml_extlib

This matches the name used in dune and on OPAM.
parent a834cc84
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -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
+2 −0
Original line number Diff line number Diff line
@@ -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.
+2 −2
Original line number Diff line number Diff line
{ 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;
+1 −1
Original line number Diff line number Diff line
@@ -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 = ''
+2 −2
Original line number Diff line number Diff line
@@ -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
Loading