NixOS · wegank · Jul 17, 2024 · Jul 16, 2024
diff --git a/pkgs/development/ocaml-modules/alcotest/lwt.nix b/pkgs/development/ocaml-modules/alcotest/lwt.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, alcotest, logs, lwt, fmt
+{ buildDunePackage, alcotest, logs, lwt, fmt
 , re, cmdliner
 }:
 

diff --git a/pkgs/development/ocaml-modules/asetmap/default.nix b/pkgs/development/ocaml-modules/asetmap/default.nix
@@ -1,5 +1,4 @@
-{ lib
-, fetchurl
+{ fetchurl
 , buildDunePackage
 , topkg
 , findlib

diff --git a/pkgs/development/ocaml-modules/atdgen/default.nix b/pkgs/development/ocaml-modules/atdgen/default.nix
@@ -1,4 +1,4 @@
-{ buildDunePackage, alcotest, atd, atdgen-codec-runtime, atdgen-runtime, biniou, re, yojson
+{ buildDunePackage, alcotest, atd, atdgen-codec-runtime, atdgen-runtime, re
 , python3
 }:
 

diff --git a/pkgs/development/ocaml-modules/awa/default.nix b/pkgs/development/ocaml-modules/awa/default.nix
@@ -2,7 +2,7 @@
 , ppx_sexp_conv
 , mirage-crypto, mirage-crypto-ec, mirage-crypto-rng, mirage-crypto-pk
 , x509, cstruct, cstruct-unix, cstruct-sexp, sexplib, eqaf-cstruct
-, rresult, mtime, logs, fmt, cmdliner, base64
+, mtime, logs, fmt, cmdliner, base64
 , zarith
 }:
 

diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, buildDunePackage, ocaml, qtest, qcheck, num, camlp-streams
+{ lib, fetchFromGitHub, buildDunePackage, ocaml, qtest, qcheck, num, camlp-streams
 , doCheck ? lib.versionAtLeast ocaml.version "4.08"
 }:
 

diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, bigarray-compat, pkg-config }:
+{ lib, fetchFromGitHub, buildDunePackage, alcotest, pkg-config }:
 
 buildDunePackage rec {
   pname = "bigstringaf";

diff --git a/pkgs/development/ocaml-modules/caqti/async.nix b/pkgs/development/ocaml-modules/caqti/async.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, async_kernel, async_unix, caqti, core_kernel }:
+{ buildDunePackage, async_kernel, async_unix, caqti, core_kernel }:
 
 buildDunePackage {
   pname = "caqti-async";

diff --git a/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix b/pkgs/development/ocaml-modules/caqti/driver-mariadb.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, caqti, mariadb }:
+{ buildDunePackage, caqti, mariadb }:
 
 buildDunePackage {
   pname = "caqti-driver-mariadb";

diff --git a/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix b/pkgs/development/ocaml-modules/caqti/driver-postgresql.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, caqti, postgresql }:
+{ buildDunePackage, caqti, postgresql }:
 
 buildDunePackage {
   pname = "caqti-driver-postgresql";

diff --git a/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix b/pkgs/development/ocaml-modules/caqti/driver-sqlite3.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, caqti, ocaml_sqlite3, alcotest }:
+{ buildDunePackage, caqti, ocaml_sqlite3, alcotest }:
 
 buildDunePackage {
   pname = "caqti-driver-sqlite3";

diff --git a/pkgs/development/ocaml-modules/caqti/dynload.nix b/pkgs/development/ocaml-modules/caqti/dynload.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, caqti, findlib }:
+{ buildDunePackage, caqti, findlib }:
 
 buildDunePackage {
   pname = "caqti-dynload";

diff --git a/pkgs/development/ocaml-modules/caqti/lwt.nix b/pkgs/development/ocaml-modules/caqti/lwt.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, caqti, logs, lwt }:
+{ buildDunePackage, caqti, logs, lwt }:
 
 buildDunePackage {
   pname = "caqti-lwt";

diff --git a/pkgs/development/ocaml-modules/caqti/type-calendar.nix b/pkgs/development/ocaml-modules/caqti/type-calendar.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, calendar, caqti }:
+{ buildDunePackage, calendar, caqti }:
 
 buildDunePackage {
   pname = "caqti-type-calendar";

diff --git a/pkgs/development/ocaml-modules/carton/git.nix b/pkgs/development/ocaml-modules/carton/git.nix
@@ -1,8 +1,6 @@
 { buildDunePackage, carton, carton-lwt
 , bigstringaf, lwt, fpath, result
 , fmt, decompress, astring
-, alcotest, alcotest-lwt, cstruct, logs
-, mirage-flow, rresult, ke
 }:
 
 buildDunePackage {

diff --git a/pkgs/development/ocaml-modules/cmdliner/1_0.nix b/pkgs/development/ocaml-modules/cmdliner/1_0.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }:
+{ lib, stdenv, fetchurl, ocaml }:
 
 assert (lib.versionAtLeast ocaml.version "4.03");
 

diff --git a/pkgs/development/ocaml-modules/cmdliner/1_1.nix b/pkgs/development/ocaml-modules/cmdliner/1_1.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, result }:
+{ lib, stdenv, fetchurl, ocaml }:
 
 lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
   "cmdliner 1.1 is not available for OCaml ${ocaml.version}"

diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildDunePackage
+{ buildDunePackage
 , ppx_sexp_conv
 , base
 , async

diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -1,6 +1,6 @@
 { lib, fetchurl, buildDunePackage
 , ppx_sexp_conv, base64, jsonm, re, stringext, uri-sexp
-, ocaml, fmt, alcotest
+, fmt, alcotest
 , crowbar
 }:
 

diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-jsoo.nix b/pkgs/development/ocaml-modules/cohttp/lwt-jsoo.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage
+{ buildDunePackage
 , cohttp, cohttp-lwt, logs, lwt, js_of_ocaml, js_of_ocaml-ppx, js_of_ocaml-lwt
 , nodejs, lwt_ppx
 }:

diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, cohttp-lwt
+{ buildDunePackage, cohttp-lwt
 , conduit-lwt-unix, conduit-lwt, ppx_sexp_conv
 , cmdliner, fmt, logs, magic-mime
 , ounit

diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, cohttp, lwt, uri, ppx_sexp_conv, logs, sexplib0 }:
+{ buildDunePackage, cohttp, lwt, uri, ppx_sexp_conv, logs, sexplib0 }:
 
 buildDunePackage {
   pname = "cohttp-lwt";

diff --git a/pkgs/development/ocaml-modules/cohttp/top.nix b/pkgs/development/ocaml-modules/cohttp/top.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, cohttp }:
+{ buildDunePackage, cohttp }:
 
 buildDunePackage {
   pname = "cohttp-top";

diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, async, async_ssl ? null, ppx_sexp_conv, ppx_here, uri, conduit
+{ buildDunePackage, async, async_ssl ? null, ppx_sexp_conv, ppx_here, uri, conduit
 , core, ipaddr, ipaddr-sexp, sexplib
 }:
 

diff --git a/pkgs/development/ocaml-modules/cstruct/async.nix b/pkgs/development/ocaml-modules/cstruct/async.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, cstruct, async_unix, async, core }:
+{ buildDunePackage, cstruct, async_unix, async, core }:
 
 buildDunePackage rec {
   pname = "cstruct-async";

diff --git a/pkgs/development/ocaml-modules/csv/csvtool.nix b/pkgs/development/ocaml-modules/csv/csvtool.nix
@@ -1,4 +1,4 @@
-{ lib, ocamlPackages }:
+{ ocamlPackages }:
 
 let inherit (ocamlPackages) buildDunePackage csv uutf; in
 

diff --git a/pkgs/development/ocaml-modules/csv/lwt.nix b/pkgs/development/ocaml-modules/csv/lwt.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, csv, lwt }:
+{ buildDunePackage, csv, lwt }:
 
 buildDunePackage {
   pname = "csv-lwt";

diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, buildDunePackage, fetchurl, ocaml
-, result, alcotest, cohttp-lwt-unix, odoc, curl, cacert
+, result, alcotest, cohttp-lwt-unix, curl, cacert
 }:
 
 buildDunePackage rec {

diff --git a/pkgs/development/ocaml-modules/data-encoding/default.nix b/pkgs/development/ocaml-modules/data-encoding/default.nix
@@ -9,8 +9,6 @@
 , hex
 , json-data-encoding
 , json-data-encoding-bson
-, alcotest
-, crowbar
 , ppx_expect
 }:
 

diff --git a/pkgs/development/ocaml-modules/dns/client-lwt.nix b/pkgs/development/ocaml-modules/dns/client-lwt.nix
@@ -1,9 +1,8 @@
-{ lib, buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time
-, mirage-random, mirage-crypto-rng, mtime, randomconv
-, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest
-, ca-certs, ca-certs-nss
+{ buildDunePackage, dns, dns-client, lwt
+, mirage-crypto-rng, mtime
+, ipaddr, alcotest
+, ca-certs
 , happy-eyeballs
-, tcpip
 , tls-lwt
 }:
 

diff --git a/pkgs/development/ocaml-modules/dns/client-mirage.nix b/pkgs/development/ocaml-modules/dns/client-mirage.nix
@@ -1,7 +1,7 @@
-{ lib, buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time
-, mirage-random, mirage-crypto-rng, mtime, randomconv
-, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest
-, ca-certs, ca-certs-nss
+{ buildDunePackage, dns, dns-client, lwt, mirage-clock, mirage-time
+, mirage-random
+, domain-name, ipaddr
+, ca-certs-nss
 , happy-eyeballs
 , tcpip
 , tls, tls-mirage

diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix
@@ -1,10 +1,6 @@
-{ lib, buildDunePackage, dns, lwt, mirage-clock, mirage-time
-, mirage-random, mirage-crypto-rng, mtime, randomconv
-, cstruct, fmt, logs, rresult, domain-name, ipaddr, alcotest
-, ca-certs, ca-certs-nss
-, happy-eyeballs
-, tcpip
-, tls, tls-mirage
+{ buildDunePackage, dns
+, mirage-crypto-rng, mtime, randomconv
+, domain-name, alcotest
 }:
 
 buildDunePackage {

diff --git a/pkgs/development/ocaml-modules/dyn/default.nix b/pkgs/development/ocaml-modules/dyn/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, dune_3, ordering }:
+{ buildDunePackage, dune_3, ordering }:
 
 buildDunePackage {
   pname = "dyn";

diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/pkgs/development/ocaml-modules/earley/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, ocaml, buildDunePackage
+{ lib, fetchFromGitHub, buildDunePackage
 , stdlib-shims
 }:
 

diff --git a/pkgs/development/ocaml-modules/earlybird/default.nix b/pkgs/development/ocaml-modules/earlybird/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, ocaml, buildDunePackage
+{ lib, fetchFromGitHub, buildDunePackage
 , cmdliner, dap, fmt, iter, logs, lru, lwt_ppx, lwt_react, menhir, menhirLib, path_glob, ppx_deriving_yojson
 , ppx_optcomp
 , gitUpdater

diff --git a/pkgs/development/ocaml-modules/eio/default.nix b/pkgs/development/ocaml-modules/eio/default.nix
@@ -5,7 +5,6 @@
 , bigstringaf
 , cstruct
 , domain-local-await
-, dune-configurator
 , fetchurl
 , fmt
 , hmap

diff --git a/pkgs/development/ocaml-modules/emile/default.nix b/pkgs/development/ocaml-modules/emile/default.nix
@@ -1,7 +1,6 @@
 { lib
 , buildDunePackage
 , fetchurl
-, ocaml
 , angstrom
 , ipaddr
 , base64

diff --git a/pkgs/development/ocaml-modules/faraday/async.nix b/pkgs/development/ocaml-modules/faraday/async.nix
@@ -1,4 +1,4 @@
-{ buildDunePackage, lib, faraday, core_unix ? null, async }:
+{ buildDunePackage, faraday, core_unix ? null, async }:
 
 buildDunePackage rec {
   pname = "faraday-async";

diff --git a/pkgs/development/ocaml-modules/faraday/default.nix b/pkgs/development/ocaml-modules/faraday/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, bigstringaf }:
+{ lib, fetchFromGitHub, buildDunePackage, alcotest, bigstringaf }:
 
 buildDunePackage rec {
   pname = "faraday";

diff --git a/pkgs/development/ocaml-modules/ff/default.nix b/pkgs/development/ocaml-modules/ff/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, ff-pbt, ff-sig, zarith, alcotest }:
+{ buildDunePackage, ff-pbt, ff-sig, zarith, alcotest }:
 
 buildDunePackage rec {
   pname = "ff";

diff --git a/pkgs/development/ocaml-modules/ff/pbt.nix b/pkgs/development/ocaml-modules/ff/pbt.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, zarith, ff-sig, alcotest }:
+{ buildDunePackage, zarith, ff-sig, alcotest }:
 
 buildDunePackage {
   pname = "ff-pbt";

diff --git a/pkgs/development/ocaml-modules/ffmpeg/default.nix b/pkgs/development/ocaml-modules/ffmpeg/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, callPackage
+{ buildDunePackage, callPackage
 , ffmpeg-base ? callPackage ./base.nix { }
 , ffmpeg-avutil
 , ffmpeg-avcodec

diff --git a/pkgs/development/ocaml-modules/fiber/default.nix b/pkgs/development/ocaml-modules/fiber/default.nix
@@ -2,7 +2,6 @@
 , buildDunePackage
 , dyn
 , fetchurl
-, ocaml
 , ppx_expect
 , stdune
 }:

diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, buildDunePackage, ocaml
+{ lib, fetchFromGitHub, buildDunePackage
 , camlp-streams, cppo, cryptokit, ocurl, yojson
 , ounit2
 }:

diff --git a/pkgs/development/ocaml-modules/git/mirage.nix b/pkgs/development/ocaml-modules/git/mirage.nix
@@ -1,5 +1,4 @@
-{ lib
-, buildDunePackage
+{ buildDunePackage
 , git
 , mimic
 , mimic-happy-eyeballs

diff --git a/pkgs/development/ocaml-modules/git/paf.nix b/pkgs/development/ocaml-modules/git/paf.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage
+{ buildDunePackage
 , git
 , mimic
 , paf

diff --git a/pkgs/development/ocaml-modules/github/data.nix b/pkgs/development/ocaml-modules/github/data.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, github
+{ buildDunePackage, github
 , yojson, atdgen
 }:
 

diff --git a/pkgs/development/ocaml-modules/github/jsoo.nix b/pkgs/development/ocaml-modules/github/jsoo.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, github
+{ buildDunePackage, github
 , cohttp, cohttp-lwt-jsoo, js_of_ocaml-lwt
 }:
 

diff --git a/pkgs/development/ocaml-modules/github/unix.nix b/pkgs/development/ocaml-modules/github/unix.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, github
+{ buildDunePackage, github
 , cohttp, cohttp-lwt-unix, stringext, cmdliner, lwt
 }:
 

diff --git a/pkgs/development/ocaml-modules/gitlab/jsoo.nix b/pkgs/development/ocaml-modules/gitlab/jsoo.nix
@@ -1,5 +1,4 @@
 {
-  lib,
   buildDunePackage,
   gitlab,
   cohttp,

diff --git a/pkgs/development/ocaml-modules/gitlab/unix.nix b/pkgs/development/ocaml-modules/gitlab/unix.nix
@@ -1,5 +1,4 @@
 {
-  lib,
   buildDunePackage,
   gitlab,
   cmdliner,

diff --git a/pkgs/development/ocaml-modules/gluten/eio.nix b/pkgs/development/ocaml-modules/gluten/eio.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, gluten, eio }:
+{ buildDunePackage, gluten, eio }:
 
 buildDunePackage {
   pname = "gluten-eio";

diff --git a/pkgs/development/ocaml-modules/h2/default.nix b/pkgs/development/ocaml-modules/h2/default.nix
@@ -1,7 +1,5 @@
 { buildDunePackage
-, lib
 , fetchFromGitHub
-, ocaml
 , hpack
 , angstrom
 , faraday

diff --git a/pkgs/development/ocaml-modules/hacl-star/default.nix b/pkgs/development/ocaml-modules/hacl-star/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage, hacl-star-raw, zarith, cppo, alcotest, secp256k1-internal, qcheck-core, cstruct }:
+{ buildDunePackage, hacl-star-raw, zarith, cppo, alcotest, secp256k1-internal, qcheck-core, cstruct }:
 
 
 buildDunePackage {

diff --git a/pkgs/development/ocaml-modules/hacl-star/raw.nix b/pkgs/development/ocaml-modules/hacl-star/raw.nix
@@ -2,11 +2,9 @@
 , which
 , stdenv
 , fetchzip
-, opaline
 , cmake
 , ocaml
 , findlib
-, hacl-star
 , ctypes
 , cppo
 }:

diff --git a/pkgs/development/ocaml-modules/httpaf/lwt-unix.nix b/pkgs/development/ocaml-modules/httpaf/lwt-unix.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage
+{ buildDunePackage
 , httpaf
 , faraday-lwt-unix
 , lwt

diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix
@@ -1,7 +1,6 @@
 { lib
 , fetchurl
 , buildDunePackage
-, ocaml
 , decompress
 , stdlib-shims
 , alcotest

diff --git a/pkgs/development/ocaml-modules/ipaddr/cstruct.nix b/pkgs/development/ocaml-modules/ipaddr/cstruct.nix
@@ -1,4 +1,4 @@
-{ lib, buildDunePackage
+{ buildDunePackage
 , ipaddr, cstruct
 }:
-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     {
-      lib,
       buildDunePackage,
       gitlab,
       cohttp,
@@ Expand Down @@