From a110f08f12eb10a25e1e0c7545c13e1246d0da25 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 16 Nov 2022 13:12:28 +0100 Subject: [PATCH] ocamlPackages.extlib: rename from ocaml_extlib This matches the name used in dune and on OPAM. --- .../from_md/release-notes/rl-2211.section.xml | 6 ++++++ .../doc/manual/release-notes/rl-2211.section.md | 2 ++ .../google-drive-ocamlfuse/default.nix | 4 ++-- .../science/logic/beluga/default.nix | 2 +- pkgs/development/compilers/haxe/default.nix | 4 ++-- pkgs/development/ocaml-modules/cudf/default.nix | 4 ++-- pkgs/development/ocaml-modules/dose3/default.nix | 4 ++-- .../ocaml-modules/lustre-v6/default.nix | 4 ++-- .../development/ocaml-modules/tcslib/default.nix | 4 ++-- pkgs/top-level/ocaml-packages.nix | 16 +++++++--------- 10 files changed, 28 insertions(+), 22 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index a584292bffe..100ce3b1a2f 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -992,6 +992,12 @@ signald -d /var/lib/signald/db \ [ "lua54" "luau" ]. + + + ocamlPackages.ocaml_extlib has been renamed + to ocamlPackages.extlib. + + pkgs.fetchNextcloudApp has been rewritten diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index a3d6f0f5ca6..a69c35acf45 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -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. diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 612bb0eaf16..a61458155d0 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -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; diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index 9af0cd694b7..6a94d3f639e 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -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 = '' diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index b70a3e13ab1..7a6c019c16d 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -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 diff --git a/pkgs/development/ocaml-modules/cudf/default.nix b/pkgs/development/ocaml-modules/cudf/default.nix index 54e96e047e5..c3b0a3c29c0 100644 --- a/pkgs/development/ocaml-modules/cudf/default.nix +++ b/pkgs/development/ocaml-modules/cudf/default.nix @@ -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 = [ diff --git a/pkgs/development/ocaml-modules/dose3/default.nix b/pkgs/development/ocaml-modules/dose3/default.nix index daf5b3779d7..5f71375dc46 100644 --- a/pkgs/development/ocaml-modules/dose3/default.nix +++ b/pkgs/development/ocaml-modules/dose3/default.nix @@ -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 diff --git a/pkgs/development/ocaml-modules/lustre-v6/default.nix b/pkgs/development/ocaml-modules/lustre-v6/default.nix index 3cc7a25a36a..419ae432ed3 100644 --- a/pkgs/development/ocaml-modules/lustre-v6/default.nix +++ b/pkgs/development/ocaml-modules/lustre-v6/default.nix @@ -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 ]; diff --git a/pkgs/development/ocaml-modules/tcslib/default.nix b/pkgs/development/ocaml-modules/tcslib/default.nix index a8ddea79b77..4454359d584 100644 --- a/pkgs/development/ocaml-modules/tcslib/default.nix +++ b/pkgs/development/ocaml-modules/tcslib/default.nix @@ -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"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 85464170df3..95abd5d3d68 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -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 { };