treewide: with stdenv.lib; in meta -> with lib;

Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix

27 files changed, 54 insertions, 54 deletions

diff --git a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix
index 70780ee385fa6..513c0a17c01d1 100644
--- a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane, async_kernel, bin_prot, core_kernel,
+{lib, stdenv, buildOcamlJane, async_kernel, bin_prot, core_kernel,
  fieldslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test,
  ppx_jane, sexplib, typerep, variantslib}:
 
@@ -9,7 +9,7 @@ buildOcamlJane {
     ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane
     sexplib typerep variantslib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/async_rpc_kernel";
     description = "Platform-independent core of Async RPC library";
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix
index 1eb6b6a95f86f..871fade158aaf 100644
--- a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix
+++ b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane, type_conv}:
+{lib, stdenv, buildOcamlJane, type_conv}:
 
 buildOcamlJane {
   name = "bin_prot";
@@ -8,7 +8,7 @@ buildOcamlJane {
 
   propagatedBuildInputs = [ type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/bin_prot";
     description = "Binary protocol generator ";
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/core_bench.nix b/pkgs/development/ocaml-modules/janestreet/core_bench.nix
index 1956a7f3b7057..160fb30ee23ef 100644
--- a/pkgs/development/ocaml-modules/janestreet/core_bench.nix
+++ b/pkgs/development/ocaml-modules/janestreet/core_bench.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , buildOcamlJane
 , core
 , core_extended
@@ -11,7 +11,7 @@ buildOcamlJane {
   propagatedBuildInputs =
     [ core core_extended textutils ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/core_bench";
     description = "Micro-benchmarking library for OCaml";
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix
index 39aeb7047177e..75b894a8c14f5 100644
--- a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix
+++ b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix
@@ -1,4 +1,4 @@
-{ stdenv, type_conv, buildOcamlJane }:
+{ lib, stdenv, type_conv, buildOcamlJane }:
 
 buildOcamlJane {
   name = "fieldslib";
@@ -10,7 +10,7 @@ buildOcamlJane {
 
   propagatedBuildInputs = [ type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://ocaml.janestreet.com/";
     description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values";
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
index f77b793bcaabc..eba4e8f94a7fb 100644
--- a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
+++ b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildOcaml, fetchurl, ocaml_oasis, opaline }:
+{ lib, stdenv, buildOcaml, fetchurl, ocaml_oasis, opaline }:
 
 buildOcaml rec {
   name = "js-build-tools";
@@ -21,7 +21,7 @@ buildOcaml rec {
 
   patches = [ ./js-build-tools-darwin.patch ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Jane Street Build Tools";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix
index 3ed7106e7b652..bd38d963034e3 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_compare, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools, ppx_type_conv, sexplib}:
 
 buildOcamlJane {
@@ -8,7 +8,7 @@ buildOcamlJane {
     [ ppx_compare ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools
       ppx_type_conv sexplib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Assert-like extension nodes that raise useful errors on failure";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix
index 9e5df431e04c2..131af5367db61 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_core, ppx_driver, ppx_inline_test, ppx_tools}:
 
 buildOcamlJane {
@@ -10,7 +10,7 @@ buildOcamlJane {
 
   propagatedBuildInputs = [ ppx_core ppx_driver ppx_inline_test ppx_tools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Syntax extension for writing in-line benchmarks in ocaml code";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix
index d7f333d4cf4c5..c742d6fbe8080 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_core, ppx_tools, ppx_type_conv, bin_prot}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "0kwmrrrybdkmphqczsr3lg3imsxcjb8iy41syvn44s3kcjfyyzbz";
   propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv bin_prot ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generation of bin_prot readers and writers from types";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix
index 0bfdd7bd540ce..51b18de65e6ab 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_core, ppx_driver, ppx_tools, ppx_type_conv}:
 
 buildOcamlJane {
@@ -7,7 +7,7 @@ buildOcamlJane {
   propagatedBuildInputs =
     [ppx_core ppx_driver ppx_tools ppx_type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generation of fast comparison functions from type expressions and definitions";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix
index c652afa5fbfc9..f3a20425b73c7 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_core, ppx_driver, ppx_sexp_conv, ppx_tools}:
 
 buildOcamlJane {
@@ -7,7 +7,7 @@ buildOcamlJane {
 
   propagatedBuildInputs = [ ppx_core ppx_driver ppx_sexp_conv ppx_tools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Extensions to printf-style format-strings for user-defined string conversion";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix
index 2fdfede0f23df..d4c7c61a3992a 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_core, ppx_tools, ppx_type_conv}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "0m11921q2pjzkwckf21fynd2qfy83n9jjsgks23yagdai8a7ym16";
   propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generate a list containing all values of a finite type";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix
index f78f93ee1202b..b3dfcb68ed192 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_assert, ppx_compare, ppx_core, ppx_custom_printf, ppx_driver,
  ppx_fields_conv, ppx_here, ppx_inline_test, ppx_sexp_conv, ppx_tools,
  ppx_variants_conv, re, sexplib, variantslib, fieldslib}:
@@ -11,7 +11,7 @@ buildOcamlJane {
       ppx_fields_conv ppx_here ppx_inline_test ppx_sexp_conv ppx_tools
       ppx_variants_conv re sexplib variantslib fieldslib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Cram-like framework for OCaml";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix
index 551738573b369..7fdcdc4461283 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_core, ppx_tools, ppx_type_conv}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "11w9wfjgkv7yxv3rwlwi6m193zan6rhmi45q7n3ddi2s8ls3gra7";
   propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generation of accessor and iteration functions for ocaml records";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix
index ea3ac5e8e5aef..95ebb59faf9f5 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_core, ppx_driver}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "1mzdgn8k171zkwmbizf1a48l525ny0w3363c7gknpnifcinxniiw";
   propagatedBuildInputs = [ ppx_core ppx_driver ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A ppx rewriter that defines an extension node whose value is its source position";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix
index d0e4c84158c7d..811e529851b88 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_core, ppx_driver, ppx_tools}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "0ygapa54i0wwcj3jcqwiimrc6z0b7aafgjhbk37h6vvclnm5n7f6";
   propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Syntax extension for writing in-line tests in ocaml code";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix
index 1086059b19f3e..07577dbf1f7a8 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_assert,
  ppx_bench, ppx_bin_prot, ppx_compare, ppx_custom_printf, ppx_driver,
  ppx_enumerate, ppx_expect, ppx_fail, ppx_fields_conv, ppx_here,
@@ -14,7 +14,7 @@ buildOcamlJane {
       ppx_here ppx_inline_test ppx_let ppx_pipebang ppx_sexp_conv
       ppx_sexp_message ppx_sexp_value ppx_typerep_conv ppx_variants_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A ppx_driver including all standard ppx rewriters";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix
index 8c8b87d7112e8..370221c1d4813 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_core, ppx_driver}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "0whnfq4rgkq4apfqnvc100wlk25pmqdyvy6s21dsn3fcm9hff467";
   propagatedBuildInputs = [ ppx_core ppx_driver ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A ppx rewriter for monadic and applicative let bindings and match statements";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix
index 61fa66b77cc52..fe4f1753fa78c 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_core, ppx_tools}:
 
 buildOcamlJane {
@@ -7,7 +7,7 @@ buildOcamlJane {
   propagatedBuildInputs =
     [ ppx_core ppx_tools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ppx_optcomp stands for Optional Compilation. It is a tool used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, etc.";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix
index 209638f97b741..b1d8007936b6a 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_core, ppx_driver, ppx_tools}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "0k25bhj9ziiw89xvs4svz7cgazbbmprba9wbic2llffg55fp7acc";
   propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A ppx rewriter that inlines reverse application operators |> and |!";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
index 00361ee81ebed..c820464d10961 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_core, ppx_tools, ppx_type_conv, sexplib}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "1kgbmlc11w5jhbhmy5n0f734l44zwyry48342dm5qydi9sfzcgq2";
   propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "PPX syntax extension that generates code for converting OCaml types to and from s-expressions, as defined in the sexplib library";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix
index 2a8bf44bfab20..a710436000ecb 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "0inbff25qii868p141jb1y8n3vjfyz66jpnsl9nma6nkkyjkp05j";
   propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Easy construction of S-Expressions";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix
index 64fbe4bd9bb9c..e51a27ffaeefd 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "04602ppqfwx33ghjywam00hlqqzsz4d99r60k9q0v1mynk9pjhj0";
   propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A ppx rewriter that simplifies building S-Expression from OCaml Values";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix
index 472ec19b55884..b4d6288a179ca 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_core, ppx_tools, ppx_type_conv, typerep}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "0dldlx73r07j6w0i7h4hxly0v678naa79na5rafsk2974gs5ih9g";
   propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv typerep ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Automatic generation of runtime types from type definitions";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix
index 1d01b0bc321d1..7989ecaecea70 100644
--- a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix
+++ b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane,
+{lib, stdenv, buildOcamlJane,
  ppx_core, ppx_tools, ppx_type_conv, sexplib, variantslib}:
 
 buildOcamlJane {
@@ -6,7 +6,7 @@ buildOcamlJane {
   hash = "0kgal8b9yh7wrd75hllb9fyl6zbksfnr9k7pykpzdm3js98dirhn";
   propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib variantslib ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Generation of accessor and iteration functions for ocaml variant types";
     maintainers = [ maintainers.maurer ];
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib.nix b/pkgs/development/ocaml-modules/janestreet/sexplib.nix
index 1bb9d489b1484..df8f6591bdac6 100644
--- a/pkgs/development/ocaml-modules/janestreet/sexplib.nix
+++ b/pkgs/development/ocaml-modules/janestreet/sexplib.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane, type_conv}:
+{lib, stdenv, buildOcamlJane, type_conv}:
 
 buildOcamlJane {
   minimumSupportedOcamlVersion = "4.02";
@@ -9,7 +9,7 @@ buildOcamlJane {
 
   propagatedBuildInputs = [ type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://ocaml.janestreet.com/";
     description = "Library for serializing OCaml values to and from S-expressions";
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/typerep.nix b/pkgs/development/ocaml-modules/janestreet/typerep.nix
index 9ed037e52110e..ee751eb3cfc48 100644
--- a/pkgs/development/ocaml-modules/janestreet/typerep.nix
+++ b/pkgs/development/ocaml-modules/janestreet/typerep.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane, type_conv}:
+{lib, stdenv, buildOcamlJane, type_conv}:
 
 buildOcamlJane {
   name = "typerep";
@@ -10,7 +10,7 @@ buildOcamlJane {
 
   propagatedBuildInputs = [ type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/typerep";
     description = "Runtime types for OCaml (beta version)";
     license = licenses.asl20;
diff --git a/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/pkgs/development/ocaml-modules/janestreet/variantslib.nix
index 02e63291add29..3fd7877d2bb41 100644
--- a/pkgs/development/ocaml-modules/janestreet/variantslib.nix
+++ b/pkgs/development/ocaml-modules/janestreet/variantslib.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcamlJane, type_conv}:
+{lib, stdenv, buildOcamlJane, type_conv}:
 
 buildOcamlJane {
   name = "variantslib";
@@ -10,7 +10,7 @@ buildOcamlJane {
 
   propagatedBuildInputs = [ type_conv ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/janestreet/variantslib";
     description = "OCaml variants as first class values";
     license = licenses.asl20;