From 4e42cac49df9b9e5ac931c975e8d04bd39b278cf Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 11 Jan 2021 13:49:15 +0100 Subject: =?UTF-8?q?ocamlPackages:=20stdenv.lib=20=E2=86=92=20lib?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change was produced by searching for remaining occurrences of stdenv.lib and replacing them manually. Reference #108938. --- pkgs/development/ocaml-modules/angstrom-async/default.nix | 4 ++-- pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix | 4 ++-- pkgs/development/ocaml-modules/angstrom-unix/default.nix | 4 ++-- pkgs/development/ocaml-modules/apron/default.nix | 6 +++--- pkgs/development/ocaml-modules/astring/default.nix | 8 ++++---- pkgs/development/ocaml-modules/bap/default.nix | 4 ++-- pkgs/development/ocaml-modules/batteries/default.nix | 8 ++++---- pkgs/development/ocaml-modules/benchmark/default.nix | 6 +++--- pkgs/development/ocaml-modules/bin_prot/default.nix | 4 ++-- pkgs/development/ocaml-modules/biniou/1.0.nix | 2 +- pkgs/development/ocaml-modules/biniou/default.nix | 6 +++--- pkgs/development/ocaml-modules/bitv/default.nix | 8 ++++---- pkgs/development/ocaml-modules/bolt/default.nix | 2 +- pkgs/development/ocaml-modules/bos/default.nix | 6 +++--- pkgs/development/ocaml-modules/calendar/default.nix | 4 ++-- pkgs/development/ocaml-modules/camlpdf/default.nix | 2 +- pkgs/development/ocaml-modules/camlzip/default.nix | 2 +- pkgs/development/ocaml-modules/camomile/0.8.2.nix | 8 ++++---- pkgs/development/ocaml-modules/camomile/0.8.5.nix | 6 +++--- pkgs/development/ocaml-modules/camomile/default.nix | 6 +++--- pkgs/development/ocaml-modules/cil/default.nix | 2 +- pkgs/development/ocaml-modules/cmdliner/default.nix | 4 ++-- pkgs/development/ocaml-modules/cohttp/async.nix | 6 +++--- pkgs/development/ocaml-modules/cohttp/lwt-unix.nix | 4 ++-- pkgs/development/ocaml-modules/cohttp/lwt.nix | 6 +++--- pkgs/development/ocaml-modules/conduit/async.nix | 4 ++-- pkgs/development/ocaml-modules/conduit/default.nix | 6 +++--- pkgs/development/ocaml-modules/config-file/default.nix | 6 +++--- pkgs/development/ocaml-modules/cpu/default.nix | 2 +- pkgs/development/ocaml-modules/cryptgps/default.nix | 8 ++++---- pkgs/development/ocaml-modules/cstruct/1.9.0.nix | 4 ++-- pkgs/development/ocaml-modules/csv/default.nix | 6 +++--- pkgs/development/ocaml-modules/ctypes/default.nix | 2 +- pkgs/development/ocaml-modules/curly/default.nix | 4 ++-- pkgs/development/ocaml-modules/dolmen/default.nix | 6 +++--- pkgs/development/ocaml-modules/dolog/default.nix | 6 +++--- pkgs/development/ocaml-modules/dtoa/default.nix | 4 ++-- pkgs/development/ocaml-modules/dypgen/default.nix | 6 +++--- pkgs/development/ocaml-modules/eigen/default.nix | 2 +- pkgs/development/ocaml-modules/elina/default.nix | 8 ++++---- pkgs/development/ocaml-modules/eliom/default.nix | 8 ++++---- pkgs/development/ocaml-modules/enumerate/default.nix | 8 ++++---- pkgs/development/ocaml-modules/erm_xml/default.nix | 8 ++++---- pkgs/development/ocaml-modules/erm_xmpp/default.nix | 6 +++--- pkgs/development/ocaml-modules/estring/default.nix | 4 ++-- pkgs/development/ocaml-modules/expat/0.9.nix | 6 +++--- pkgs/development/ocaml-modules/expat/default.nix | 8 ++++---- pkgs/development/ocaml-modules/extlib/default.nix | 6 +++--- pkgs/development/ocaml-modules/ezjsonm/default.nix | 6 +++--- pkgs/development/ocaml-modules/faillib/default.nix | 4 ++-- pkgs/development/ocaml-modules/farfadet/default.nix | 8 ++++---- pkgs/development/ocaml-modules/fieldslib/default.nix | 4 ++-- pkgs/development/ocaml-modules/fileutils/default.nix | 6 +++--- pkgs/development/ocaml-modules/fix/default.nix | 2 +- pkgs/development/ocaml-modules/fmt/default.nix | 2 +- pkgs/development/ocaml-modules/fontconfig/default.nix | 8 ++++---- pkgs/development/ocaml-modules/fpath/default.nix | 8 ++++---- pkgs/development/ocaml-modules/functory/default.nix | 4 ++-- pkgs/development/ocaml-modules/gen/default.nix | 4 ++-- pkgs/development/ocaml-modules/gg/default.nix | 2 +- pkgs/development/ocaml-modules/git/default.nix | 4 ++-- pkgs/development/ocaml-modules/gmetadom/default.nix | 6 +++--- pkgs/development/ocaml-modules/gsl/default.nix | 2 +- pkgs/development/ocaml-modules/gtktop/default.nix | 8 ++++---- pkgs/development/ocaml-modules/herelib/default.nix | 2 +- pkgs/development/ocaml-modules/hex/default.nix | 6 +++--- pkgs/development/ocaml-modules/http/default.nix | 2 +- pkgs/development/ocaml-modules/inifiles/default.nix | 4 ++-- pkgs/development/ocaml-modules/inotify/default.nix | 12 ++++++------ pkgs/development/ocaml-modules/io-page/default.nix | 6 +++--- pkgs/development/ocaml-modules/iri/default.nix | 8 ++++---- pkgs/development/ocaml-modules/iso8601/default.nix | 6 +++--- pkgs/development/ocaml-modules/janestreet/janePackage.nix | 4 ++-- pkgs/development/ocaml-modules/javalib/default.nix | 2 +- pkgs/development/ocaml-modules/jsonm/default.nix | 6 +++--- pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix | 6 +++--- pkgs/development/ocaml-modules/lablgtk-extras/default.nix | 8 ++++---- pkgs/development/ocaml-modules/lablgtk/2.14.0.nix | 10 +++++----- pkgs/development/ocaml-modules/lablgtk/default.nix | 2 +- pkgs/development/ocaml-modules/labltk/default.nix | 8 ++++---- pkgs/development/ocaml-modules/lacaml/default.nix | 2 +- pkgs/development/ocaml-modules/linenoise/default.nix | 6 +++--- pkgs/development/ocaml-modules/llvm/default.nix | 8 ++++---- pkgs/development/ocaml-modules/logs/default.nix | 2 +- pkgs/development/ocaml-modules/lua-ml/default.nix | 8 ++++---- pkgs/development/ocaml-modules/lwt_log/default.nix | 6 +++--- pkgs/development/ocaml-modules/lwt_ssl/default.nix | 6 +++--- pkgs/development/ocaml-modules/magic-mime/default.nix | 6 +++--- pkgs/development/ocaml-modules/magick/default.nix | 8 ++++---- pkgs/development/ocaml-modules/menhir/default.nix | 2 +- pkgs/development/ocaml-modules/mlgmp/default.nix | 4 ++-- pkgs/development/ocaml-modules/mlgmpidl/default.nix | 6 +++--- pkgs/development/ocaml-modules/mparser/default.nix | 6 +++--- pkgs/development/ocaml-modules/mtime/default.nix | 2 +- pkgs/development/ocaml-modules/mysql/default.nix | 6 +++--- pkgs/development/ocaml-modules/nocrypto/default.nix | 8 ++++---- pkgs/development/ocaml-modules/notty/default.nix | 4 ++-- pkgs/development/ocaml-modules/num/default.nix | 2 +- pkgs/development/ocaml-modules/ocaml-cairo/default.nix | 6 +++--- pkgs/development/ocaml-modules/ocaml-text/default.nix | 4 ++-- pkgs/development/ocaml-modules/ocamlfuse/default.nix | 8 ++++---- pkgs/development/ocaml-modules/ocamlgraph/default.nix | 10 +++++----- pkgs/development/ocaml-modules/ocamlmake/default.nix | 4 ++-- pkgs/development/ocaml-modules/ocamlnat/default.nix | 4 ++-- pkgs/development/ocaml-modules/ocamlnet/default.nix | 6 +++--- pkgs/development/ocaml-modules/ocamlsdl/default.nix | 6 +++--- pkgs/development/ocaml-modules/ocb-stubblr/default.nix | 6 +++--- pkgs/development/ocaml-modules/ocf/default.nix | 4 ++-- pkgs/development/ocaml-modules/ocp-ocamlres/default.nix | 8 ++++---- pkgs/development/ocaml-modules/ocplib-endian/default.nix | 6 +++--- pkgs/development/ocaml-modules/ocplib-simplex/default.nix | 6 +++--- pkgs/development/ocaml-modules/ocsigen-deriving/default.nix | 8 ++++---- pkgs/development/ocaml-modules/ocsigen-server/default.nix | 8 ++++---- pkgs/development/ocaml-modules/ocsigen-start/default.nix | 6 +++--- pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix | 6 +++--- pkgs/development/ocaml-modules/octavius/default.nix | 8 ++++---- pkgs/development/ocaml-modules/ocurl/default.nix | 8 ++++---- pkgs/development/ocaml-modules/odn/default.nix | 2 +- pkgs/development/ocaml-modules/omd/default.nix | 6 +++--- pkgs/development/ocaml-modules/opam-file-format/default.nix | 6 +++--- pkgs/development/ocaml-modules/optcomp/default.nix | 8 ++++---- pkgs/development/ocaml-modules/otfm/default.nix | 2 +- pkgs/development/ocaml-modules/pa_bench/default.nix | 4 ++-- pkgs/development/ocaml-modules/pa_ounit/default.nix | 4 ++-- pkgs/development/ocaml-modules/pprint/default.nix | 4 ++-- pkgs/development/ocaml-modules/ppx_derivers/default.nix | 6 +++--- pkgs/development/ocaml-modules/ppx_tools/default.nix | 2 +- pkgs/development/ocaml-modules/process/default.nix | 6 +++--- pkgs/development/ocaml-modules/psmt2-frontend/default.nix | 8 ++++---- pkgs/development/ocaml-modules/ptime/default.nix | 6 +++--- pkgs/development/ocaml-modules/reactivedata/default.nix | 2 +- pkgs/development/ocaml-modules/rope/default.nix | 8 ++++---- pkgs/development/ocaml-modules/rresult/default.nix | 6 +++--- pkgs/development/ocaml-modules/sawja/default.nix | 2 +- pkgs/development/ocaml-modules/sedlex/default.nix | 8 ++++---- pkgs/development/ocaml-modules/seq/default.nix | 8 ++++---- pkgs/development/ocaml-modules/sodium/default.nix | 4 ++-- pkgs/development/ocaml-modules/sqlite3EZ/default.nix | 4 ++-- pkgs/development/ocaml-modules/stringext/default.nix | 10 +++++----- pkgs/development/ocaml-modules/syslog/default.nix | 2 +- pkgs/development/ocaml-modules/topkg/default.nix | 8 ++++---- pkgs/development/ocaml-modules/tsdl/default.nix | 2 +- pkgs/development/ocaml-modules/type_conv/108.08.00.nix | 4 ++-- pkgs/development/ocaml-modules/type_conv/109.60.01.nix | 10 +++++----- pkgs/development/ocaml-modules/type_conv/112.01.01.nix | 6 +++--- pkgs/development/ocaml-modules/uchar/default.nix | 2 +- pkgs/development/ocaml-modules/ulex/default.nix | 8 ++++---- pkgs/development/ocaml-modules/uucp/default.nix | 2 +- pkgs/development/ocaml-modules/uunf/default.nix | 2 +- pkgs/development/ocaml-modules/variantslib/default.nix | 2 +- pkgs/development/ocaml-modules/vg/default.nix | 2 +- pkgs/development/ocaml-modules/wasm/default.nix | 8 ++++---- pkgs/development/ocaml-modules/webbrowser/default.nix | 6 +++--- pkgs/development/ocaml-modules/xml-light/default.nix | 6 +++--- pkgs/development/ocaml-modules/xmlm/default.nix | 2 +- pkgs/development/ocaml-modules/xtmpl/default.nix | 4 ++-- pkgs/development/ocaml-modules/yojson/default.nix | 2 +- pkgs/development/ocaml-modules/zarith/default.nix | 2 +- pkgs/development/ocaml-modules/zed/default.nix | 8 ++++---- 159 files changed, 419 insertions(+), 419 deletions(-) (limited to 'pkgs/development/ocaml-modules') diff --git a/pkgs/development/ocaml-modules/angstrom-async/default.nix b/pkgs/development/ocaml-modules/angstrom-async/default.nix index 60e774918d5d..8c9f97f81abc 100644 --- a/pkgs/development/ocaml-modules/angstrom-async/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-async/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, angstrom, async }: +{ lib, fetchFromGitHub, buildDunePackage, angstrom, async }: buildDunePackage rec { pname = "angstrom-async"; @@ -14,6 +14,6 @@ buildDunePackage rec { meta = { inherit (angstrom.meta) homepage license; description = "Async support for Angstrom"; - maintainers = with stdenv.lib.maintainers; [ romildo ]; + maintainers = with lib.maintainers; [ romildo ]; }; } diff --git a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix index eb4de44d7a6e..1bb8833cf079 100644 --- a/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, angstrom, ocaml_lwt }: +{ lib, fetchFromGitHub, buildDunePackage, angstrom, ocaml_lwt }: buildDunePackage rec { pname = "angstrom-lwt-unix"; @@ -14,6 +14,6 @@ buildDunePackage rec { meta = { inherit (angstrom.meta) homepage license; description = "Lwt_unix support for Angstrom"; - maintainers = with stdenv.lib.maintainers; [ romildo ]; + maintainers = with lib.maintainers; [ romildo ]; }; } diff --git a/pkgs/development/ocaml-modules/angstrom-unix/default.nix b/pkgs/development/ocaml-modules/angstrom-unix/default.nix index 134c161d266f..af72c7f8d2d9 100644 --- a/pkgs/development/ocaml-modules/angstrom-unix/default.nix +++ b/pkgs/development/ocaml-modules/angstrom-unix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, angstrom }: +{ lib, fetchFromGitHub, buildDunePackage, angstrom }: buildDunePackage rec { pname = "angstrom-unix"; @@ -14,6 +14,6 @@ buildDunePackage rec { meta = { inherit (angstrom.meta) homepage license; description = "Unix support for Angstrom"; - maintainers = with stdenv.lib.maintainers; [ romildo ]; + maintainers = with lib.maintainers; [ romildo ]; }; } diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index 79c4d8a50024..959a7203dfa9 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }: +{ stdenv, lib, fetchFromGitHub, perl, gmp, mpfr, ppl, ocaml, findlib, camlidl, mlgmpidl }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-apron-${version}"; @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { ''; meta = { - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; homepage = "http://apron.cri.ensmp.fr/library/"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; description = "Numerical abstract domain library"; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix index f790a87e22c5..ba8cd98327fa 100644 --- a/pkgs/development/ocaml-modules/astring/default.nix +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }: let # Use astring 0.8.3 for OCaml < 4.05 param = - if stdenv.lib.versionAtLeast ocaml.version "4.05" + if lib.versionAtLeast ocaml.version "4.05" then { version = "0.8.5"; sha256 = "1ykhg9gd3iy7zsgyiy2p9b1wkpqg9irw5pvcqs3sphq71iir4ml6"; @@ -41,7 +41,7 @@ stdenv.mkDerivation { adds a few missing functions and fully exploits OCaml's newfound string immutability. ''; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ sternenseemann ]; }; } diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index f24896ba2e99..9284bbaf9c62 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -8,11 +8,11 @@ , z3 }: -if !stdenv.lib.versionAtLeast ocaml.version "4.07" +if !lib.versionAtLeast ocaml.version "4.07" then throw "BAP is not available for OCaml ${ocaml.version}" else -if stdenv.lib.versionAtLeast core_kernel.version "0.13" +if lib.versionAtLeast core_kernel.version "0.13" then throw "BAP needs core_kernel-0.12 (hence OCaml 4.07)" else diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 87622ab0fbf0..d4b7f3ff9a12 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: let version = "3.2.0"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { checkInputs = [ qtest ]; propagatedBuildInputs = [ num ]; - doCheck = stdenv.lib.versionAtLeast ocaml.version "4.04" && !stdenv.isAarch64; + doCheck = lib.versionAtLeast ocaml.version "4.04" && !stdenv.isAarch64; checkTarget = "test"; createFindlibDestdir = true; @@ -27,10 +27,10 @@ stdenv.mkDerivation { and comprehensive development platform for the OCaml programming language. ''; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix index 518a8756158b..07432dd7c6e7 100644 --- a/pkgs/development/ocaml-modules/benchmark/default.nix +++ b/pkgs/development/ocaml-modules/benchmark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ocaml_pcre }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, ocaml_pcre }: let version = "1.4"; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { homepage = "http://ocaml-benchmark.forge.ocamlcore.org/"; platforms = ocaml.meta.platforms or []; description = "Benchmark running times of code"; - license = stdenv.lib.licenses.lgpl21; - maintainers = with stdenv.lib.maintainers; [ volth ]; + license = lib.licenses.lgpl21; + maintainers = with lib.maintainers; [ volth ]; }; } diff --git a/pkgs/development/ocaml-modules/bin_prot/default.nix b/pkgs/development/ocaml-modules/bin_prot/default.nix index 1da1df752e89..50ef935aff6b 100644 --- a/pkgs/development/ocaml-modules/bin_prot/default.nix +++ b/pkgs/development/ocaml-modules/bin_prot/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, buildOcaml, fetchurl, ocaml, type_conv }: +{ lib, buildOcaml, fetchurl, ocaml, type_conv }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "bin_prot-112.24.00 is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/biniou/1.0.nix b/pkgs/development/ocaml-modules/biniou/1.0.nix index e98c9a40eea6..795e63401290 100644 --- a/pkgs/development/ocaml-modules/biniou/1.0.nix +++ b/pkgs/development/ocaml-modules/biniou/1.0.nix @@ -5,7 +5,7 @@ let webpage = "http://mjambon.com/${pname}.html"; in -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; +assert lib.versionAtLeast (lib.getVersion ocaml) "3.11"; stdenv.mkDerivation rec { diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index b97c78a399bf..8e0780ae6c5c 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, easy-format }: +{ lib, fetchFromGitHub, buildDunePackage, easy-format }: buildDunePackage rec { pname = "biniou"; @@ -20,7 +20,7 @@ buildDunePackage rec { meta = { inherit (src.meta) homepage; description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.bsd3; + maintainers = [ lib.maintainers.vbgl ]; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/ocaml-modules/bitv/default.nix b/pkgs/development/ocaml-modules/bitv/default.nix index 359d83b4762a..23e8d145a308 100644 --- a/pkgs/development/ocaml-modules/bitv/default.nix +++ b/pkgs/development/ocaml-modules/bitv/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, autoreconfHook, which, ocaml, findlib }: +{ stdenv, lib, fetchzip, autoreconfHook, which, ocaml, findlib }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "bitv is not available for OCaml ${ocaml.version}" else @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { meta = { description = "A bit vector library for OCaml"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; homepage = "https://github.com/backtracking/bitv"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index d14deedcb657..54bc28697ec4 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, which, camlp4 }: -let inherit (stdenv.lib) getVersion versionAtLeast; in +let inherit (lib) getVersion versionAtLeast; in assert versionAtLeast (getVersion ocaml) "4.00.0"; assert versionAtLeast (getVersion findlib) "1.3.3"; diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix index ca6c362b6fa5..84cee3d97cea 100644 --- a/pkgs/development/ocaml-modules/bos/default.nix +++ b/pkgs/development/ocaml-modules/bos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg , astring, fmt, fpath, logs, rresult }: @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "Basic OS interaction for OCaml"; homepage = "https://erratique.ch/software/bos"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index f23081a5f195..1210ed41dc2b 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{stdenv, lib, fetchurl, ocaml, findlib}: stdenv.mkDerivation { name = "ocaml-calendar-2.5"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { license = "LGPL"; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.gal_bolle + lib.maintainers.gal_bolle ]; }; } diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index ca9432a72b3d..18683d5f1709 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, which, ocaml, findlib }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "camlpdf is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index d8bbfafa98de..c2c2e98b2e06 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -2,7 +2,7 @@ let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" + if lib.versionAtLeast ocaml.version "4.02" then { version = "1.10"; url = "https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz"; diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index 6b18220dc8a9..79c7a46e6e99 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: +{stdenv, lib, fetchurl, ocaml, findlib, camlp4}: -if stdenv.lib.versionAtLeast ocaml.version "4.05" +if lib.versionAtLeast ocaml.version "4.05" then throw "camomile-0.8.2 is not available for OCaml ${ocaml.version}" else @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { meta = { homepage = "http://camomile.sourceforge.net/"; description = "A comprehensive Unicode library for OCaml"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; branch = "0.8.2"; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix index b975482ecf3e..67bd8b8c755d 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}: +{stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, camlp4}: stdenv.mkDerivation { pname = "camomile"; @@ -21,10 +21,10 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/yoriyuki/Camomile/tree/master/Camomile"; description = "A comprehensive Unicode library for OCaml"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/camomile/default.nix b/pkgs/development/ocaml-modules/camomile/default.nix index ff0cb4aa3fe0..bf5ca0f6990b 100644 --- a/pkgs/development/ocaml-modules/camomile/default.nix +++ b/pkgs/development/ocaml-modules/camomile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, cppo }: +{ stdenv, lib, fetchFromGitHub, buildDunePackage, cppo }: buildDunePackage rec { pname = "camomile"; @@ -17,8 +17,8 @@ buildDunePackage rec { meta = { inherit (src.meta) homepage; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; description = "A Unicode library for OCaml"; }; } diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix index 75e022449107..3aefe2eb874c 100644 --- a/pkgs/development/ocaml-modules/cil/default.nix +++ b/pkgs/development/ocaml-modules/cil/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, perl, ocaml, findlib, ocamlbuild }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "cil is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index b99804710430..7e49679406ab 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -4,10 +4,10 @@ let pname = "cmdliner"; in -assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; +assert lib.versionAtLeast ocaml.version "4.01.0"; let param = - if stdenv.lib.versionAtLeast ocaml.version "4.03" then { + if lib.versionAtLeast ocaml.version "4.03" then { version = "1.0.4"; sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw"; } else { diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix index 246397b60810..974c3aa2f9c3 100644 --- a/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/pkgs/development/ocaml-modules/cohttp/async.nix @@ -1,9 +1,9 @@ -{ stdenv, buildDunePackage, async, cohttp, conduit-async, uri, ppx_sexp_conv +{ lib, buildDunePackage, async, cohttp, conduit-async, uri, ppx_sexp_conv , logs, magic-mime }: -if !stdenv.lib.versionAtLeast cohttp.version "0.99" then +if !lib.versionAtLeast cohttp.version "0.99" then cohttp -else if !stdenv.lib.versionAtLeast async.version "0.13" then +else if !lib.versionAtLeast async.version "0.13" then throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)" else diff --git a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix index 3a99ed9536f0..455a76ce94dd 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt-unix.nix @@ -1,9 +1,9 @@ -{ stdenv, buildDunePackage, cohttp-lwt +{ lib, buildDunePackage, cohttp-lwt , conduit-lwt-unix, ppx_sexp_conv , cmdliner, fmt, magic-mime }: -if !stdenv.lib.versionAtLeast cohttp-lwt.version "0.99" +if !lib.versionAtLeast cohttp-lwt.version "0.99" then cohttp-lwt else diff --git a/pkgs/development/ocaml-modules/cohttp/lwt.nix b/pkgs/development/ocaml-modules/cohttp/lwt.nix index 8357d748ce8f..04f81e8e8df4 100644 --- a/pkgs/development/ocaml-modules/cohttp/lwt.nix +++ b/pkgs/development/ocaml-modules/cohttp/lwt.nix @@ -1,8 +1,8 @@ -{ stdenv, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs }: +{ lib, buildDunePackage, cohttp, ocaml_lwt, uri, ppx_sexp_conv, logs }: -if !stdenv.lib.versionAtLeast cohttp.version "0.99" +if !lib.versionAtLeast cohttp.version "0.99" then cohttp -else if !stdenv.lib.versionAtLeast ppx_sexp_conv.version "0.13" +else if !lib.versionAtLeast ppx_sexp_conv.version "0.13" then throw "cohttp-lwt is not available for ppx_sexp_conv version ${ppx_sexp_conv.version}" else diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix index f16819ed8aef..e289b5d711d5 100644 --- a/pkgs/development/ocaml-modules/conduit/async.nix +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -1,6 +1,6 @@ -{ stdenv, buildDunePackage, async, async_ssl, ppx_sexp_conv, conduit }: +{ lib, buildDunePackage, async, async_ssl, ppx_sexp_conv, conduit }: -if !stdenv.lib.versionAtLeast conduit.version "1.0" +if !lib.versionAtLeast conduit.version "1.0" then conduit else diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index b800d6b7ba4a..8c9b757f87c3 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage +{ lib, fetchurl, buildDunePackage , ppx_sexp_conv, sexplib, astring, uri, logs , ipaddr, ipaddr-sexp }: @@ -20,8 +20,8 @@ buildDunePackage rec { meta = { description = "A network connection establishment library"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ alexfmpe vbgl ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ alexfmpe vbgl ]; homepage = "https://github.com/mirage/ocaml-conduit"; }; } diff --git a/pkgs/development/ocaml-modules/config-file/default.nix b/pkgs/development/ocaml-modules/config-file/default.nix index 724c5b1e2d6a..29c7cd61c3f5 100644 --- a/pkgs/development/ocaml-modules/config-file/default.nix +++ b/pkgs/development/ocaml-modules/config-file/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, camlp4 }: +{ stdenv, lib, fetchurl, ocaml, findlib, camlp4 }: stdenv.mkDerivation { name = "ocaml-config-file-1.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { homepage = "http://config-file.forge.ocamlcore.org/"; platforms = ocaml.meta.platforms or []; description = "An OCaml library used to manage the configuration file(s) of an application"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/cpu/default.nix b/pkgs/development/ocaml-modules/cpu/default.nix index 2544723a902b..083f00d5d5f1 100644 --- a/pkgs/development/ocaml-modules/cpu/default.nix +++ b/pkgs/development/ocaml-modules/cpu/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { buildInputs = [ autoconf ]; - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index 2d9ac2a7b193..6011c6953baa 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, ocaml, findlib}: +{stdenv, lib, fetchurl, ocaml, findlib}: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "cryptgps is not available for OCaml ${ocaml.version}" else @@ -28,10 +28,10 @@ stdenv.mkDerivation { i.e. this is not a binding to some C library, but the implementation itself. ''; - license = stdenv.lib.licenses.mit; + license = lib.licenses.mit; platforms = ocaml.meta.platforms or []; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix index 33c1aa6b7ae8..750a153c1c48 100644 --- a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix +++ b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix @@ -2,7 +2,7 @@ , async ? null, lwt ? null }: -assert stdenv.lib.versionAtLeast ocaml.version "4.01"; +assert lib.versionAtLeast ocaml.version "4.01"; let version = "1.9.0"; in @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/mirage/ocaml-cstruct"; description = "Map OCaml arrays onto C-like structs"; - license = stdenv.lib.licenses.isc; + license = lib.licenses.isc; maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; platforms = ocaml.meta.platforms or []; }; diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index 60496ad28dac..8cf2918989e0 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage }: +{ lib, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "csv"; @@ -13,8 +13,8 @@ buildDunePackage rec { meta = { description = "A pure OCaml library to read and write CSV files"; - license = stdenv.lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl21; + maintainers = [ lib.maintainers.vbgl ]; homepage = "https://github.com/Chris00/ocaml-csv"; }; } diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index 1805f587cad6..92a4ff9535c9 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchzip, ocaml, findlib, libffi, pkgconfig, ncurses, integers }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "ctypes is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/curly/default.nix b/pkgs/development/ocaml-modules/curly/default.nix index 236b9c19c928..491b2844ef1d 100644 --- a/pkgs/development/ocaml-modules/curly/default.nix +++ b/pkgs/development/ocaml-modules/curly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildDunePackage, fetchurl, ocaml +{ stdenv, lib, buildDunePackage, fetchurl, ocaml , result, alcotest, cohttp-lwt-unix, odoc, curl }: buildDunePackage rec { @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ result ]; checkInputs = [ alcotest cohttp-lwt-unix ]; # test dependencies are only available for >= 4.08 - doCheck = stdenv.lib.versionAtLeast ocaml.version "4.08" + doCheck = lib.versionAtLeast ocaml.version "4.08" # Some test fails in macOS sandbox # > Fatal error: exception Unix.Unix_error(Unix.EPERM, "bind", "") && !stdenv.isDarwin; diff --git a/pkgs/development/ocaml-modules/dolmen/default.nix b/pkgs/development/ocaml-modules/dolmen/default.nix index 824da3030685..d4a47abcafa4 100644 --- a/pkgs/development/ocaml-modules/dolmen/default.nix +++ b/pkgs/development/ocaml-modules/dolmen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-dolmen-${version}"; @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = { description = "An OCaml library providing clean and flexible parsers for input languages"; - license = stdenv.lib.licenses.bsd2; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index f9eef4774f5f..690823c5358a 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: let version = "3.0"; in @@ -21,7 +21,7 @@ stdenv.mkDerivation { homepage = "https://github.com/UnixJunkie/dolog"; description = "Minimalistic lazy logger in OCaml"; platforms = ocaml.meta.platforms or []; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index 92f75fb3c334..62fa7cd08c8b 100644 --- a/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, buildDunePackage }: +{ stdenv, lib, fetchurl, buildDunePackage }: buildDunePackage rec { pname = "dtoa"; @@ -11,7 +11,7 @@ buildDunePackage rec { sha256 = "0zkhn0rdq82g6gamsv6nkx6i44s8104nh6jg5xydazl9jl1704xn"; }; - hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; + hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; meta = with lib; { homepage = "https://github.com/flowtype/ocaml-dtoa"; diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index ead672fa15ca..5b5b107b694b 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -1,10 +1,10 @@ -{stdenv, fetchurl, ocaml, findlib}: +{stdenv, lib, fetchurl, ocaml, findlib}: let pname = "dypgen"; in -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "${pname} is not available for OCaml ${ocaml.version}" else @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dypgen.free.fr"; description = "Dypgen GLR self extensible parser generator"; - license = stdenv.lib.licenses.cecill-b; + license = lib.licenses.cecill-b; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/eigen/default.nix b/pkgs/development/ocaml-modules/eigen/default.nix index e86d21da016a..c86b7cba0103 100644 --- a/pkgs/development/ocaml-modules/eigen/default.nix +++ b/pkgs/development/ocaml-modules/eigen/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { minimumOCamlVersion = "4.02"; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; propagatedBuildInputs = [ ctypes ]; diff --git a/pkgs/development/ocaml-modules/elina/default.nix b/pkgs/development/ocaml-modules/elina/default.nix index b41743f542d8..4eff6c2957de 100644 --- a/pkgs/development/ocaml-modules/elina/default.nix +++ b/pkgs/development/ocaml-modules/elina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, gmp, mpfr, ocaml, findlib, camlidl, apron }: +{ stdenv, lib, fetchurl, perl, gmp, mpfr, ocaml, findlib, camlidl, apron }: stdenv.mkDerivation rec { version = "1.1"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "--use-opam" "--apron-prefix" apron ] - ++ stdenv.lib.optional stdenv.isDarwin "--absolute-dylibs" + ++ lib.optional stdenv.isDarwin "--absolute-dylibs" ; createFindlibDestdir = true; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "ETH LIbrary for Numerical Analysis"; homepage = "http://elina.ethz.ch/"; - license = stdenv.lib.licenses.lgpl3; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.lgpl3; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 5d3c53100449..4c845273d714 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, which, ocsigen_server, ocaml, +{ stdenv, lib, fetchzip, which, ocsigen_server, ocaml, lwt_react, opaline, ppx_deriving, findlib , ppx_tools_versioned @@ -8,7 +8,7 @@ , lwt_ppx }: -if !stdenv.lib.versionAtLeast ocaml.version "4.07" +if !lib.versionAtLeast ocaml.version "4.07" then throw "eliom is not available for OCaml ${ocaml.version}" else @@ -54,8 +54,8 @@ stdenv.mkDerivation rec distinguish both parts and the client side is compiled to JS using Ocsigen Js_of_ocaml.''; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; - maintainers = [ stdenv.lib.maintainers.gal_bolle ]; + maintainers = [ lib.maintainers.gal_bolle ]; }; } diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/pkgs/development/ocaml-modules/enumerate/default.nix index 22a6d12792c7..eb0495be797f 100644 --- a/pkgs/development/ocaml-modules/enumerate/default.nix +++ b/pkgs/development/ocaml-modules/enumerate/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; +assert lib.versionAtLeast (lib.getVersion ocaml) "4.00"; -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "enumerate-111.08.00 is not available for OCaml ${ocaml.version}" else @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "https://ocaml.janestreet.com/"; description = "Quotation expanders for enumerating finite types"; - license = stdenv.lib.licenses.asl20; + license = lib.licenses.asl20; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix index ebfcbc90a504..56b5c9295708 100644 --- a/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !lib.versionAtLeast ocaml.version "4.02" then throw "erm_xml is not available for OCaml ${ocaml.version}" else @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = "https://github.com/hannesm/xml"; description = "XML Parser for discrete data"; platforms = ocaml.meta.platforms or []; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index c3534d146f8a..cff155f47098 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, camlp4, ocamlbuild +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, camlp4, ocamlbuild , erm_xml, mirage-crypto, mirage-crypto-rng, base64 }: @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/hannesm/xmpp"; description = "OCaml based XMPP implementation (fork)"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/estring/default.nix b/pkgs/development/ocaml-modules/estring/default.nix index 782ebce9cb86..7424d14220dc 100644 --- a/pkgs/development/ocaml-modules/estring/default.nix +++ b/pkgs/development/ocaml-modules/estring/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, buildOcaml, ocaml, fetchurl }: +{ lib, buildOcaml, ocaml, fetchurl }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "estring is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/expat/0.9.nix b/pkgs/development/ocaml-modules/expat/0.9.nix index 886f346012c1..219b8164e7c9 100644 --- a/pkgs/development/ocaml-modules/expat/0.9.nix +++ b/pkgs/development/ocaml-modules/expat/0.9.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ounit, expat}: +{stdenv, lib, fetchurl, ocaml, findlib, ounit, expat}: let pname = "ocaml-expat"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.xs4all.nl/~mmzeeman/ocaml/"; description = "An ocaml wrapper for the Expat XML parsing library"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index 6058c87e7bd5..9675fa881510 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, expat, ocaml, findlib, ounit }: +{ stdenv, lib, fetchFromGitHub, expat, ocaml, findlib, ounit }: stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-expat-${version}"; @@ -17,15 +17,15 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib expat ounit ]; - doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.06"; + doCheck = !lib.versionAtLeast ocaml.version "4.06"; checkTarget = "testall"; createFindlibDestdir = true; meta = { description = "OCaml wrapper for the Expat XML parsing library"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 5e04c73c3025..a8b1810e51f1 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib, cppo, minimal ? true }: +{ stdenv, lib, fetchurl, ocaml, findlib, cppo, minimal ? true }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; +assert lib.versionAtLeast (lib.getVersion ocaml) "3.11"; stdenv.mkDerivation { name = "ocaml${ocaml.version}-extlib-1.7.7"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/ygrek/ocaml-extlib"; description = "Enhancements to the OCaml Standard Library modules"; - license = stdenv.lib.licenses.lgpl21; + license = lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index 269288ef3cd9..733d1d008a8d 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage, jsonm, hex, sexplib0 }: +{ stdenv, lib, fetchurl, buildDunePackage, jsonm, hex, sexplib0 }: buildDunePackage rec { pname = "ezjsonm"; @@ -16,7 +16,7 @@ buildDunePackage rec { meta = { description = "An easy interface on top of the Jsonm library"; homepage = "https://github.com/mirage/ezjsonm"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/faillib/default.nix b/pkgs/development/ocaml-modules/faillib/default.nix index 64993c4912d4..d045bd5a37af 100644 --- a/pkgs/development/ocaml-modules/faillib/default.nix +++ b/pkgs/development/ocaml-modules/faillib/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, buildOcaml, fetchurl, ocaml, herelib, camlp4 }: +{ lib, buildOcaml, fetchurl, ocaml, herelib, camlp4 }: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "faillib-111.17.00 is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/farfadet/default.nix b/pkgs/development/ocaml-modules/farfadet/default.nix index 96423a213a19..77eef7f29a98 100644 --- a/pkgs/development/ocaml-modules/farfadet/default.nix +++ b/pkgs/development/ocaml-modules/farfadet/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg , faraday }: -if !stdenv.lib.versionAtLeast ocaml.version "4.3" +if !lib.versionAtLeast ocaml.version "4.3" then throw "farfadet is not available for OCaml ${ocaml.version}" else @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "A printf-like for Faraday library"; homepage = "https://github.com/oklm-wsh/Farfadet"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix index 9a90c7e5d0d2..4adddbfe54d2 100644 --- a/pkgs/development/ocaml-modules/fieldslib/default.nix +++ b/pkgs/development/ocaml-modules/fieldslib/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: -assert stdenv.lib.versionOlder "4.00" (stdenv.lib.getVersion ocaml); +assert lib.versionOlder "4.00" (lib.getVersion ocaml); -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "fieldslib-109.20.03 is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 031680b1e337..39c41e8eba04 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-fileutils-0.5.3"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { homepage = "https://forge.ocamlcore.org/projects/ocaml-fileutils/"; platforms = ocaml.meta.platforms or []; description = "Library to provide pure OCaml functions to manipulate real file (POSIX like) and filename"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix index cdf585683d76..d4ce484653b9 100644 --- a/pkgs/development/ocaml-modules/fix/default.nix +++ b/pkgs/development/ocaml-modules/fix/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; +assert lib.versionAtLeast (lib.getVersion ocaml) "3.12"; stdenv.mkDerivation { diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index adac4c199c03..a66976b4a2b5 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, seq, stdlib-shims }: -if !stdenv.lib.versionAtLeast ocaml.version "4.05" +if !lib.versionAtLeast ocaml.version "4.05" then throw "fmt is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/fontconfig/default.nix b/pkgs/development/ocaml-modules/fontconfig/default.nix index ce17cc60ebf8..8f804988129b 100644 --- a/pkgs/development/ocaml-modules/fontconfig/default.nix +++ b/pkgs/development/ocaml-modules/fontconfig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, fontconfig, ocaml }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, fontconfig, ocaml }: stdenv.mkDerivation { name = "ocaml-fontconfig-20131103"; @@ -12,14 +12,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ocaml fontconfig ]; makeFlags = [ - "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${stdenv.lib.getVersion ocaml}/site-lib/" + "OCAML_STDLIB_DIR=$(out)/lib/ocaml/${lib.getVersion ocaml}/site-lib/" "OCAML_HAVE_OCAMLOPT=yes" ]; meta = { description = "Fontconfig bindings for OCaml"; - license = stdenv.lib.licenses.gpl2Plus; + license = lib.licenses.gpl2Plus; platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/pkgs/development/ocaml-modules/fpath/default.nix index 4694e3ac6377..785a71e13a7f 100644 --- a/pkgs/development/ocaml-modules/fpath/default.nix +++ b/pkgs/development/ocaml-modules/fpath/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, astring }: +{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, astring }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" +if !lib.versionAtLeast ocaml.version "4.03" then throw "fpath is not available for OCaml ${ocaml.version}" else @@ -20,8 +20,8 @@ stdenv.mkDerivation { meta = { description = "An OCaml module for handling file system paths with POSIX and Windows conventions"; homepage = "https://erratique.ch/software/fpath"; - license = stdenv.lib.licenses.isc; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index e1078f420ba2..2f11001874f1 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl, ocaml, findlib }: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; +assert lib.versionAtLeast (lib.getVersion ocaml) "3.11"; let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + if lib.versionAtLeast ocaml.version "4.02" then { version = "0.6"; sha256 = "18wpyxblz9jh5bfp0hpffnd0q8cq1b0dqp0f36vhqydfknlnpx8y"; } else { diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 9e37d9b9a2d4..04d1a0816606 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: let version = "0.5"; in @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/c-cube/gen"; description = "Simple, efficient iterators for OCaml"; - license = stdenv.lib.licenses.bsd3; + license = lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index c772b9a8b547..58e2b67eacc6 100644 --- a/pkgs/development/ocaml-modules/gg/default.nix +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }: let - inherit (stdenv.lib) getVersion versionAtLeast; + inherit (lib) getVersion versionAtLeast; pname = "gg"; version = "0.9.1"; diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index d28e8ef2e7b4..ba2372090d8c 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage +{ stdenv, lib, fetchurl, buildDunePackage , alcotest, mtime, mirage-crypto-rng, tls, git-binary , angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum , fpath, hex, ke, logs, lru, ocaml_lwt, ocamlgraph, ocplib-endian, uri, rresult @@ -24,7 +24,7 @@ buildDunePackage rec { checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ]; doCheck = !stdenv.isAarch64; - meta = with stdenv; { + meta = { description = "Git format and protocol in pure OCaml"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index f01f3e8cad53..145cc3845299 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}: +{stdenv, lib, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}: let pname = "gmetadom"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gmetadom.sourceforge.net/"; description = "A collection of librares, each library providing a DOM implementation"; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.roconnor ]; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/gsl/default.nix b/pkgs/development/ocaml-modules/gsl/default.nix index 4780b7917ce5..046c92afca0a 100644 --- a/pkgs/development/ocaml-modules/gsl/default.nix +++ b/pkgs/development/ocaml-modules/gsl/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { }; buildInputs = [ dune-configurator gsl pkg-config ]; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; meta = with lib; { homepage = "https://mmottl.github.io/gsl-ocaml/"; diff --git a/pkgs/development/ocaml-modules/gtktop/default.nix b/pkgs/development/ocaml-modules/gtktop/default.nix index b0e17a28e51e..e1afefc6a79f 100644 --- a/pkgs/development/ocaml-modules/gtktop/default.nix +++ b/pkgs/development/ocaml-modules/gtktop/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, ocaml, camlp4, findlib, lablgtk-extras }: +{ stdenv, lib, fetchurl, ocaml, camlp4, findlib, lablgtk-extras }: let pname = "gtktop-2.0"; in -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "${pname} is not available for OCaml ${ocaml.version}" else @@ -22,8 +22,8 @@ stdenv.mkDerivation { meta = { homepage = "http://zoggy.github.io/gtktop/"; description = "A small OCaml library to ease the creation of graphical toplevels"; - license = stdenv.lib.licenses.lgpl3; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ vbgl ]; platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/herelib/default.nix b/pkgs/development/ocaml-modules/herelib/default.nix index 16bf0443d7ed..8e2ef0c449b3 100644 --- a/pkgs/development/ocaml-modules/herelib/default.nix +++ b/pkgs/development/ocaml-modules/herelib/default.nix @@ -14,7 +14,7 @@ buildOcaml rec { meta = with lib; { homepage = "https://github.com/janestreet/herelib"; description = "Syntax extension for inserting the current location"; - license = stdenv.lib.licenses.asl20; + license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; }; } diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix index 526989734abd..d20c69b9e711 100644 --- a/pkgs/development/ocaml-modules/hex/default.nix +++ b/pkgs/development/ocaml-modules/hex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildDunePackage, bigarray-compat, cstruct }: +{ stdenv, lib, fetchurl, buildDunePackage, bigarray-compat, cstruct }: buildDunePackage rec { pname = "hex"; @@ -19,7 +19,7 @@ buildDunePackage rec { meta = { description = "Mininal OCaml library providing hexadecimal converters"; homepage = "https://github.com/mirage/ocaml-hex"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index b1cae90a6184..f762e9c7b238 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -1,6 +1,6 @@ {lib, stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}: -if stdenv.lib.versionAtLeast ocaml.version "4.06" +if lib.versionAtLeast ocaml.version "4.06" then throw "ocaml-http is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/development/ocaml-modules/inifiles/default.nix b/pkgs/development/ocaml-modules/inifiles/default.nix index eeeaab8092fc..c141c73506d4 100644 --- a/pkgs/development/ocaml-modules/inifiles/default.nix +++ b/pkgs/development/ocaml-modules/inifiles/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }: +{ stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }: stdenv.mkDerivation { name = "ocaml${ocaml.version}-inifiles-1.2"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "A small OCaml library to read and write .ini files"; - license = stdenv.lib.licenses.lgpl21Plus; + license = lib.licenses.lgpl21Plus; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/ino