nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 10:23:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ocamlPackages: stdenv.lib → lib

Browse Source 
This change was produced by searching for remaining occurrences of
stdenv.lib and replacing them manually.

Reference #108938.
This commit is contained in:
sternenseemann 2021-01-11 13:49:15 +01:00 committed by Profpatsch
parent ff3057f61a
commit 4e42cac49d
159 changed files with 419 additions and 419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/ocaml-modules/angstrom-async/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildDunePackage, angstrom, async }: { lib, fetchFromGitHub, buildDunePackage, angstrom, async }:
buildDunePackage rec { buildDunePackage rec {
pname = "angstrom-async"; pname = "angstrom-async";
@ -14,6 +14,6 @@ buildDunePackage rec {
meta = { meta = {
inherit (angstrom.meta) homepage license; inherit (angstrom.meta) homepage license;
description = "Async support for Angstrom"; description = "Async support for Angstrom";
maintainers = with stdenv.lib.maintainers; [ romildo ]; maintainers = with lib.maintainers; [ romildo ];
}; };
} }

4
pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildDunePackage, angstrom, ocaml_lwt }: { lib, fetchFromGitHub, buildDunePackage, angstrom, ocaml_lwt }:
buildDunePackage rec { buildDunePackage rec {
pname = "angstrom-lwt-unix"; pname = "angstrom-lwt-unix";
@ -14,6 +14,6 @@ buildDunePackage rec {
meta = { meta = {
inherit (angstrom.meta) homepage license; inherit (angstrom.meta) homepage license;
description = "Lwt_unix support for Angstrom"; description = "Lwt_unix support for Angstrom";
maintainers = with stdenv.lib.maintainers; [ romildo ]; maintainers = with lib.maintainers; [ romildo ];
}; };
} }

4
pkgs/development/ocaml-modules/angstrom-unix/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildDunePackage, angstrom }: { lib, fetchFromGitHub, buildDunePackage, angstrom }:
buildDunePackage rec { buildDunePackage rec {
pname = "angstrom-unix"; pname = "angstrom-unix";
@ -14,6 +14,6 @@ buildDunePackage rec {
meta = { meta = {
inherit (angstrom.meta) homepage license; inherit (angstrom.meta) homepage license;
description = "Unix support for Angstrom"; description = "Unix support for Angstrom";
maintainers = with stdenv.lib.maintainers; [ romildo ]; maintainers = with lib.maintainers; [ romildo ];
}; };
} }

6
pkgs/development/ocaml-modules/apron/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-apron-${version}"; name = "ocaml${ocaml.version}-apron-${version}";
@ -30,9 +30,9 @@ stdenv.mkDerivation rec {
''; '';
meta = { meta = {
license = stdenv.lib.licenses.lgpl21; license = lib.licenses.lgpl21;
homepage = "http://apron.cri.ensmp.fr/library/"; homepage = "http://apron.cri.ensmp.fr/library/";
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
description = "Numerical abstract domain library"; description = "Numerical abstract domain library";
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };

8
pkgs/development/ocaml-modules/astring/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg }: { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }:
let let
# Use astring 0.8.3 for OCaml < 4.05 # Use astring 0.8.3 for OCaml < 4.05
param = param =
if stdenv.lib.versionAtLeast ocaml.version "4.05" if lib.versionAtLeast ocaml.version "4.05"
then { then {
version = "0.8.5"; version = "0.8.5";
sha256 = "1ykhg9gd3iy7zsgyiy2p9b1wkpqg9irw5pvcqs3sphq71iir4ml6"; sha256 = "1ykhg9gd3iy7zsgyiy2p9b1wkpqg9irw5pvcqs3sphq71iir4ml6";
@ -41,7 +41,7 @@ stdenv.mkDerivation {
adds a few missing functions and fully exploits OCaml's newfound string adds a few missing functions and fully exploits OCaml's newfound string
immutability. immutability.
''; '';
license = stdenv.lib.licenses.isc; license = lib.licenses.isc;
maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; maintainers = with lib.maintainers; [ sternenseemann ];
}; };
} }

4
pkgs/development/ocaml-modules/bap/default.nix
View File

@ -8,11 +8,11 @@
, z3 , 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}" then throw "BAP is not available for OCaml ${ocaml.version}"
else 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)" then throw "BAP needs core_kernel-0.12 (hence OCaml 4.07)"
else else

8
pkgs/development/ocaml-modules/batteries/default.nix
View File

@ -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 let version = "3.2.0"; in
@ -14,7 +14,7 @@ stdenv.mkDerivation {
checkInputs = [ qtest ]; checkInputs = [ qtest ];
propagatedBuildInputs = [ num ]; propagatedBuildInputs = [ num ];
doCheck = stdenv.lib.versionAtLeast ocaml.version "4.04" && !stdenv.isAarch64; doCheck = lib.versionAtLeast ocaml.version "4.04" && !stdenv.isAarch64;
checkTarget = "test"; checkTarget = "test";
createFindlibDestdir = true; createFindlibDestdir = true;
@ -27,10 +27,10 @@ stdenv.mkDerivation {
and comprehensive development platform for the OCaml programming and comprehensive development platform for the OCaml programming
language. language.
''; '';
license = stdenv.lib.licenses.lgpl21Plus; license = lib.licenses.lgpl21Plus;
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers = [
stdenv.lib.maintainers.maggesi lib.maintainers.maggesi
]; ];
}; };
} }

6
pkgs/development/ocaml-modules/benchmark/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ocaml_pcre }: { stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild, ocaml_pcre }:
let version = "1.4"; in let version = "1.4"; in
@ -18,7 +18,7 @@ stdenv.mkDerivation {
homepage = "http://ocaml-benchmark.forge.ocamlcore.org/"; homepage = "http://ocaml-benchmark.forge.ocamlcore.org/";
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
description = "Benchmark running times of code"; description = "Benchmark running times of code";
license = stdenv.lib.licenses.lgpl21; license = lib.licenses.lgpl21;
maintainers = with stdenv.lib.maintainers; [ volth ]; maintainers = with lib.maintainers; [ volth ];
}; };
} }

4
pkgs/development/ocaml-modules/bin_prot/default.nix
View File

@ -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}" then throw "bin_prot-112.24.00 is not available for OCaml ${ocaml.version}"
else else

2
pkgs/development/ocaml-modules/biniou/1.0.nix
View File

@ -5,7 +5,7 @@ let
webpage = "http://mjambon.com/${pname}.html"; webpage = "http://mjambon.com/${pname}.html";
in in
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11"; assert lib.versionAtLeast (lib.getVersion ocaml) "3.11";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

6
pkgs/development/ocaml-modules/biniou/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildDunePackage, easy-format }: { lib, fetchFromGitHub, buildDunePackage, easy-format }:
buildDunePackage rec { buildDunePackage rec {
pname = "biniou"; pname = "biniou";
@ -20,7 +20,7 @@ buildDunePackage rec {
meta = { meta = {
inherit (src.meta) homepage; inherit (src.meta) homepage;
description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve";
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
}; };
} }

8
pkgs/development/ocaml-modules/bitv/default.nix
View File

@ -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}" then throw "bitv is not available for OCaml ${ocaml.version}"
else else
@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A bit vector library for OCaml"; description = "A bit vector library for OCaml";
license = stdenv.lib.licenses.lgpl21; license = lib.licenses.lgpl21;
homepage = "https://github.com/backtracking/bitv"; homepage = "https://github.com/backtracking/bitv";
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

2
pkgs/development/ocaml-modules/bolt/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, which, camlp4 }: { 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 ocaml) "4.00.0";
assert versionAtLeast (getVersion findlib) "1.3.3"; assert versionAtLeast (getVersion findlib) "1.3.3";

6
pkgs/development/ocaml-modules/bos/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg
, astring, fmt, fpath, logs, rresult , astring, fmt, fpath, logs, rresult
}: }:
@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Basic OS interaction for OCaml"; description = "Basic OS interaction for OCaml";
homepage = "https://erratique.ch/software/bos"; homepage = "https://erratique.ch/software/bos";
license = stdenv.lib.licenses.isc; license = lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

4
pkgs/development/ocaml-modules/calendar/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib}: {stdenv, lib, fetchurl, ocaml, findlib}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-calendar-2.5"; name = "ocaml-calendar-2.5";
@ -17,7 +17,7 @@ stdenv.mkDerivation {
license = "LGPL"; license = "LGPL";
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers = [
stdenv.lib.maintainers.gal_bolle lib.maintainers.gal_bolle
]; ];
}; };
} }

2
pkgs/development/ocaml-modules/camlpdf/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, which, ocaml, findlib }: { 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}" then throw "camlpdf is not available for OCaml ${ocaml.version}"
else else

2
pkgs/development/ocaml-modules/camlzip/default.nix
View File

@ -2,7 +2,7 @@
let let
param = param =
if stdenv.lib.versionAtLeast ocaml.version "4.02" if lib.versionAtLeast ocaml.version "4.02"
then { then {
version = "1.10"; version = "1.10";
url = "https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz"; url = "https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz";

8
pkgs/development/ocaml-modules/camomile/0.8.2.nix
View File

@ -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}" then throw "camomile-0.8.2 is not available for OCaml ${ocaml.version}"
else else
@ -20,11 +20,11 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "http://camomile.sourceforge.net/"; homepage = "http://camomile.sourceforge.net/";
description = "A comprehensive Unicode library for OCaml"; description = "A comprehensive Unicode library for OCaml";
license = stdenv.lib.licenses.lgpl21; license = lib.licenses.lgpl21;
branch = "0.8.2"; branch = "0.8.2";
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers = [
stdenv.lib.maintainers.maggesi lib.maintainers.maggesi
]; ];
}; };
} }

6
pkgs/development/ocaml-modules/camomile/0.8.5.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}: {stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, camlp4}:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "camomile"; pname = "camomile";
@ -21,10 +21,10 @@ stdenv.mkDerivation {
meta = { meta = {
homepage = "https://github.com/yoriyuki/Camomile/tree/master/Camomile"; homepage = "https://github.com/yoriyuki/Camomile/tree/master/Camomile";
description = "A comprehensive Unicode library for OCaml"; description = "A comprehensive Unicode library for OCaml";
license = stdenv.lib.licenses.lgpl21; license = lib.licenses.lgpl21;
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers = [
stdenv.lib.maintainers.maggesi lib.maintainers.maggesi
]; ];
}; };
} }

6
pkgs/development/ocaml-modules/camomile/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildDunePackage, cppo }: { stdenv, lib, fetchFromGitHub, buildDunePackage, cppo }:
buildDunePackage rec { buildDunePackage rec {
pname = "camomile"; pname = "camomile";
@ -17,8 +17,8 @@ buildDunePackage rec {
meta = { meta = {
inherit (src.meta) homepage; inherit (src.meta) homepage;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
license = stdenv.lib.licenses.lgpl21; license = lib.licenses.lgpl21;
description = "A Unicode library for OCaml"; description = "A Unicode library for OCaml";
}; };
} }

2
pkgs/development/ocaml-modules/cil/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, perl, ocaml, findlib, ocamlbuild }: { 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}" then throw "cil is not available for OCaml ${ocaml.version}"
else else

4
pkgs/development/ocaml-modules/cmdliner/default.nix
View File

@ -4,10 +4,10 @@ let
pname = "cmdliner"; pname = "cmdliner";
in in
assert stdenv.lib.versionAtLeast ocaml.version "4.01.0"; assert lib.versionAtLeast ocaml.version "4.01.0";
let param = let param =
if stdenv.lib.versionAtLeast ocaml.version "4.03" then { if lib.versionAtLeast ocaml.version "4.03" then {
version = "1.0.4"; version = "1.0.4";
sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw"; sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw";
} else { } else {

6
pkgs/development/ocaml-modules/cohttp/async.nix
View File

@ -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 }: , logs, magic-mime }:
if !stdenv.lib.versionAtLeast cohttp.version "0.99" then if !lib.versionAtLeast cohttp.version "0.99" then
cohttp 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)" throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)"
else else

4
pkgs/development/ocaml-modules/cohttp/lwt-unix.nix
View File

@ -1,9 +1,9 @@
{ stdenv, buildDunePackage, cohttp-lwt { lib, buildDunePackage, cohttp-lwt
, conduit-lwt-unix, ppx_sexp_conv , conduit-lwt-unix, ppx_sexp_conv
, cmdliner, fmt, magic-mime , cmdliner, fmt, magic-mime
}: }:
if !stdenv.lib.versionAtLeast cohttp-lwt.version "0.99" if !lib.versionAtLeast cohttp-lwt.version "0.99"
then cohttp-lwt then cohttp-lwt
else else

6
pkgs/development/ocaml-modules/cohttp/lwt.nix
View File

@ -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 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}" then throw "cohttp-lwt is not available for ppx_sexp_conv version ${ppx_sexp_conv.version}"
else else

4
pkgs/development/ocaml-modules/conduit/async.nix
View File

@ -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 then conduit
else else

6
pkgs/development/ocaml-modules/conduit/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, buildDunePackage { lib, fetchurl, buildDunePackage
, ppx_sexp_conv, sexplib, astring, uri, logs , ppx_sexp_conv, sexplib, astring, uri, logs
, ipaddr, ipaddr-sexp , ipaddr, ipaddr-sexp
}: }:
@ -20,8 +20,8 @@ buildDunePackage rec {
meta = { meta = {
description = "A network connection establishment library"; description = "A network connection establishment library";
license = stdenv.lib.licenses.isc; license = lib.licenses.isc;
maintainers = with stdenv.lib.maintainers; [ alexfmpe vbgl ]; maintainers = with lib.maintainers; [ alexfmpe vbgl ];
homepage = "https://github.com/mirage/ocaml-conduit"; homepage = "https://github.com/mirage/ocaml-conduit";
}; };
} }

6
pkgs/development/ocaml-modules/config-file/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, camlp4 }: { stdenv, lib, fetchurl, ocaml, findlib, camlp4 }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-config-file-1.2"; name = "ocaml-config-file-1.2";
@ -16,7 +16,7 @@ stdenv.mkDerivation {
homepage = "http://config-file.forge.ocamlcore.org/"; homepage = "http://config-file.forge.ocamlcore.org/";
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
description = "An OCaml library used to manage the configuration file(s) of an application"; description = "An OCaml library used to manage the configuration file(s) of an application";
license = stdenv.lib.licenses.lgpl2Plus; license = lib.licenses.lgpl2Plus;
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
}; };
} }

2
pkgs/development/ocaml-modules/cpu/default.nix
View File

@ -18,7 +18,7 @@ buildDunePackage rec {
buildInputs = [ autoconf ]; buildInputs = [ autoconf ];
hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow";
meta = with lib; { meta = with lib; {
inherit (src.meta) homepage; inherit (src.meta) homepage;

8
pkgs/development/ocaml-modules/cryptgps/default.nix
View File

@ -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}" then throw "cryptgps is not available for OCaml ${ocaml.version}"
else else
@ -28,10 +28,10 @@ stdenv.mkDerivation {
i.e. this is not a binding to some C library, but the implementation i.e. this is not a binding to some C library, but the implementation
itself. itself.
''; '';
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers = [
stdenv.lib.maintainers.maggesi lib.maintainers.maggesi
]; ];
}; };
} }

4
pkgs/development/ocaml-modules/cstruct/1.9.0.nix
View File

@ -2,7 +2,7 @@
, async ? null, lwt ? null , 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 let version = "1.9.0"; in
@ -29,7 +29,7 @@ stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/mirage/ocaml-cstruct"; homepage = "https://github.com/mirage/ocaml-cstruct";
description = "Map OCaml arrays onto C-like structs"; description = "Map OCaml arrays onto C-like structs";
license = stdenv.lib.licenses.isc; license = lib.licenses.isc;
maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; maintainers = [ maintainers.vbgl maintainers.ericbmerritt ];
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
}; };

6
pkgs/development/ocaml-modules/csv/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, buildDunePackage }: { lib, fetchurl, buildDunePackage }:
buildDunePackage rec { buildDunePackage rec {
pname = "csv"; pname = "csv";
@ -13,8 +13,8 @@ buildDunePackage rec {
meta = { meta = {
description = "A pure OCaml library to read and write CSV files"; description = "A pure OCaml library to read and write CSV files";
license = stdenv.lib.licenses.lgpl21; license = lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
homepage = "https://github.com/Chris00/ocaml-csv"; homepage = "https://github.com/Chris00/ocaml-csv";
}; };
} }

2
pkgs/development/ocaml-modules/ctypes/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkgconfig, ncurses, integers }: { 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}" then throw "ctypes is not available for OCaml ${ocaml.version}"
else else

4
pkgs/development/ocaml-modules/curly/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, buildDunePackage, fetchurl, ocaml { stdenv, lib, buildDunePackage, fetchurl, ocaml
, result, alcotest, cohttp-lwt-unix, odoc, curl }: , result, alcotest, cohttp-lwt-unix, odoc, curl }:
buildDunePackage rec { buildDunePackage rec {
@ -17,7 +17,7 @@ buildDunePackage rec {
propagatedBuildInputs = [ result ]; propagatedBuildInputs = [ result ];
checkInputs = [ alcotest cohttp-lwt-unix ]; checkInputs = [ alcotest cohttp-lwt-unix ];
# test dependencies are only available for >= 4.08 # 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 # Some test fails in macOS sandbox
# > Fatal error: exception Unix.Unix_error(Unix.EPERM, "bind", "") # > Fatal error: exception Unix.Unix_error(Unix.EPERM, "bind", "")
&& !stdenv.isDarwin; && !stdenv.isDarwin;

6
pkgs/development/ocaml-modules/dolmen/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }: { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-dolmen-${version}"; name = "ocaml${ocaml.version}-dolmen-${version}";
@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "An OCaml library providing clean and flexible parsers for input languages"; description = "An OCaml library providing clean and flexible parsers for input languages";
license = stdenv.lib.licenses.bsd2; license = lib.licenses.bsd2;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage; inherit (src.meta) homepage;
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };

6
pkgs/development/ocaml-modules/dolog/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: { stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }:
let version = "3.0"; in let version = "3.0"; in
@ -21,7 +21,7 @@ stdenv.mkDerivation {
homepage = "https://github.com/UnixJunkie/dolog"; homepage = "https://github.com/UnixJunkie/dolog";
description = "Minimalistic lazy logger in OCaml"; description = "Minimalistic lazy logger in OCaml";
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
}; };
} }

4
pkgs/development/ocaml-modules/dtoa/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, buildDunePackage }: { stdenv, lib, fetchurl, buildDunePackage }:
buildDunePackage rec { buildDunePackage rec {
pname = "dtoa"; pname = "dtoa";
@ -11,7 +11,7 @@ buildDunePackage rec {
sha256 = "0zkhn0rdq82g6gamsv6nkx6i44s8104nh6jg5xydazl9jl1704xn"; sha256 = "0zkhn0rdq82g6gamsv6nkx6i44s8104nh6jg5xydazl9jl1704xn";
}; };
hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow";
meta = with lib; { meta = with lib; {
homepage = "https://github.com/flowtype/ocaml-dtoa"; homepage = "https://github.com/flowtype/ocaml-dtoa";

6
pkgs/development/ocaml-modules/dypgen/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, ocaml, findlib}: {stdenv, lib, fetchurl, ocaml, findlib}:
let let
pname = "dypgen"; pname = "dypgen";
in 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}" then throw "${pname} is not available for OCaml ${ocaml.version}"
else else
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "http://dypgen.free.fr"; homepage = "http://dypgen.free.fr";
description = "Dypgen GLR self extensible parser generator"; description = "Dypgen GLR self extensible parser generator";
license = stdenv.lib.licenses.cecill-b; license = lib.licenses.cecill-b;
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
}; };
} }

2
pkgs/development/ocaml-modules/eigen/default.nix
View File

@ -15,7 +15,7 @@ buildDunePackage rec {
minimumOCamlVersion = "4.02"; 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 ]; propagatedBuildInputs = [ ctypes ];

8
pkgs/development/ocaml-modules/elina/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
version = "1.1"; version = "1.1";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
"--use-opam" "--use-opam"
"--apron-prefix" apron "--apron-prefix" apron
] ]
++ stdenv.lib.optional stdenv.isDarwin "--absolute-dylibs" ++ lib.optional stdenv.isDarwin "--absolute-dylibs"
; ;
createFindlibDestdir = true; createFindlibDestdir = true;
@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "ETH LIbrary for Numerical Analysis"; description = "ETH LIbrary for Numerical Analysis";
homepage = "http://elina.ethz.ch/"; homepage = "http://elina.ethz.ch/";
license = stdenv.lib.licenses.lgpl3; license = lib.licenses.lgpl3;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

8
pkgs/development/ocaml-modules/eliom/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, which, ocsigen_server, ocaml, { stdenv, lib, fetchzip, which, ocsigen_server, ocaml,
lwt_react, lwt_react,
opaline, ppx_deriving, findlib opaline, ppx_deriving, findlib
, ppx_tools_versioned , ppx_tools_versioned
@ -8,7 +8,7 @@
, lwt_ppx , 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}" then throw "eliom is not available for OCaml ${ocaml.version}"
else else
@ -54,8 +54,8 @@ stdenv.mkDerivation rec
distinguish both parts and the client side is compiled to JS using distinguish both parts and the client side is compiled to JS using
Ocsigen Js_of_ocaml.''; Ocsigen Js_of_ocaml.'';
license = stdenv.lib.licenses.lgpl21; license = lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.gal_bolle ]; maintainers = [ lib.maintainers.gal_bolle ];
}; };
} }

8
pkgs/development/ocaml-modules/enumerate/default.nix
View File

@ -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}" then throw "enumerate-111.08.00 is not available for OCaml ${ocaml.version}"
else else
@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = { meta = {
homepage = "https://ocaml.janestreet.com/"; homepage = "https://ocaml.janestreet.com/";
description = "Quotation expanders for enumerating finite types"; description = "Quotation expanders for enumerating finite types";
license = stdenv.lib.licenses.asl20; license = lib.licenses.asl20;
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
}; };
} }

8
pkgs/development/ocaml-modules/erm_xml/default.nix
View File

@ -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}" then throw "erm_xml is not available for OCaml ${ocaml.version}"
else else
@ -22,7 +22,7 @@ stdenv.mkDerivation {
homepage = "https://github.com/hannesm/xml"; homepage = "https://github.com/hannesm/xml";
description = "XML Parser for discrete data"; description = "XML Parser for discrete data";
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
}; };
} }

6
pkgs/development/ocaml-modules/erm_xmpp/default.nix
View File

@ -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 , erm_xml, mirage-crypto, mirage-crypto-rng, base64
}: }:
@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "https://github.com/hannesm/xmpp"; homepage = "https://github.com/hannesm/xmpp";
description = "OCaml based XMPP implementation (fork)"; description = "OCaml based XMPP implementation (fork)";
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; maintainers = with lib.maintainers; [ sternenseemann ];
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

4
pkgs/development/ocaml-modules/estring/default.nix
View File

@ -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}" then throw "estring is not available for OCaml ${ocaml.version}"
else else

6
pkgs/development/ocaml-modules/expat/0.9.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, ounit, expat}: {stdenv, lib, fetchurl, ocaml, findlib, ounit, expat}:
let let
pname = "ocaml-expat"; pname = "ocaml-expat";
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "http://www.xs4all.nl/~mmzeeman/ocaml/"; homepage = "http://www.xs4all.nl/~mmzeeman/ocaml/";
description = "An ocaml wrapper for the Expat XML parsing library"; description = "An ocaml wrapper for the Expat XML parsing library";
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.roconnor ]; maintainers = [ lib.maintainers.roconnor ];
}; };
} }

8
pkgs/development/ocaml-modules/expat/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, expat, ocaml, findlib, ounit }: { stdenv, lib, fetchFromGitHub, expat, ocaml, findlib, ounit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-expat-${version}"; name = "ocaml${ocaml.version}-expat-${version}";
@ -17,15 +17,15 @@ stdenv.mkDerivation rec {
buildInputs = [ ocaml findlib expat ounit ]; buildInputs = [ ocaml findlib expat ounit ];
doCheck = !stdenv.lib.versionAtLeast ocaml.version "4.06"; doCheck = !lib.versionAtLeast ocaml.version "4.06";
checkTarget = "testall"; checkTarget = "testall";
createFindlibDestdir = true; createFindlibDestdir = true;
meta = { meta = {
description = "OCaml wrapper for the Expat XML parsing library"; description = "OCaml wrapper for the Expat XML parsing library";
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage; inherit (src.meta) homepage;
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };

6
pkgs/development/ocaml-modules/extlib/default.nix
View File

@ -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 { stdenv.mkDerivation {
name = "ocaml${ocaml.version}-extlib-1.7.7"; name = "ocaml${ocaml.version}-extlib-1.7.7";
@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = { meta = {
homepage = "https://github.com/ygrek/ocaml-extlib"; homepage = "https://github.com/ygrek/ocaml-extlib";
description = "Enhancements to the OCaml Standard Library modules"; description = "Enhancements to the OCaml Standard Library modules";
license = stdenv.lib.licenses.lgpl21; license = lib.licenses.lgpl21;
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
}; };
} }

6
pkgs/development/ocaml-modules/ezjsonm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, buildDunePackage, jsonm, hex, sexplib0 }: { stdenv, lib, fetchurl, buildDunePackage, jsonm, hex, sexplib0 }:
buildDunePackage rec { buildDunePackage rec {
pname = "ezjsonm"; pname = "ezjsonm";
@ -16,7 +16,7 @@ buildDunePackage rec {
meta = { meta = {
description = "An easy interface on top of the Jsonm library"; description = "An easy interface on top of the Jsonm library";
homepage = "https://github.com/mirage/ezjsonm"; homepage = "https://github.com/mirage/ezjsonm";
license = stdenv.lib.licenses.isc; license = lib.licenses.isc;
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
}; };
} }

4
pkgs/development/ocaml-modules/faillib/default.nix
View File

@ -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}" then throw "faillib-111.17.00 is not available for OCaml ${ocaml.version}"
else else

8
pkgs/development/ocaml-modules/farfadet/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg
, faraday , 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}" then throw "farfadet is not available for OCaml ${ocaml.version}"
else else
@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "A printf-like for Faraday library"; description = "A printf-like for Faraday library";
homepage = "https://github.com/oklm-wsh/Farfadet"; homepage = "https://github.com/oklm-wsh/Farfadet";
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

4
pkgs/development/ocaml-modules/fieldslib/default.nix
View File

@ -1,8 +1,8 @@
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: { 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}" then throw "fieldslib-109.20.03 is not available for OCaml ${ocaml.version}"
else else

6
pkgs/development/ocaml-modules/fileutils/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, ounit }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml${ocaml.version}-fileutils-0.5.3"; name = "ocaml${ocaml.version}-fileutils-0.5.3";
@ -22,7 +22,7 @@ stdenv.mkDerivation {
homepage = "https://forge.ocamlcore.org/projects/ocaml-fileutils/"; homepage = "https://forge.ocamlcore.org/projects/ocaml-fileutils/";
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
description = "Library to provide pure OCaml functions to manipulate real file (POSIX like) and filename"; description = "Library to provide pure OCaml functions to manipulate real file (POSIX like) and filename";
license = stdenv.lib.licenses.lgpl21Plus; license = lib.licenses.lgpl21Plus;
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
}; };
} }

2
pkgs/development/ocaml-modules/fix/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: { 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 { stdenv.mkDerivation {

2
pkgs/development/ocaml-modules/fmt/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner, seq, stdlib-shims }: { 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}" then throw "fmt is not available for OCaml ${ocaml.version}"
else else

8
pkgs/development/ocaml-modules/fontconfig/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, fontconfig, ocaml }: { stdenv, lib, fetchFromGitHub, pkgconfig, fontconfig, ocaml }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-fontconfig-20131103"; name = "ocaml-fontconfig-20131103";
@ -12,14 +12,14 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ ocaml fontconfig ]; buildInputs = [ ocaml fontconfig ];
makeFlags = [ 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" "OCAML_HAVE_OCAMLOPT=yes"
]; ];
meta = { meta = {
description = "Fontconfig bindings for OCaml"; description = "Fontconfig bindings for OCaml";
license = stdenv.lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
}; };
} }

8
pkgs/development/ocaml-modules/fpath/default.nix
View File

@ -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}" then throw "fpath is not available for OCaml ${ocaml.version}"
else else
@ -20,8 +20,8 @@ stdenv.mkDerivation {
meta = { meta = {
description = "An OCaml module for handling file system paths with POSIX and Windows conventions"; description = "An OCaml module for handling file system paths with POSIX and Windows conventions";
homepage = "https://erratique.ch/software/fpath"; homepage = "https://erratique.ch/software/fpath";
license = stdenv.lib.licenses.isc; license = lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

4
pkgs/development/ocaml-modules/functory/default.nix
View File

@ -1,9 +1,9 @@
{ lib, stdenv, fetchurl, ocaml, findlib }: { 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 = let param =
if stdenv.lib.versionAtLeast ocaml.version "4.02" then { if lib.versionAtLeast ocaml.version "4.02" then {
version = "0.6"; version = "0.6";
sha256 = "18wpyxblz9jh5bfp0hpffnd0q8cq1b0dqp0f36vhqydfknlnpx8y"; sha256 = "18wpyxblz9jh5bfp0hpffnd0q8cq1b0dqp0f36vhqydfknlnpx8y";
} else { } else {

4
pkgs/development/ocaml-modules/gen/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }:
let version = "0.5"; in let version = "0.5"; in
@ -26,7 +26,7 @@ stdenv.mkDerivation {
meta = { meta = {
homepage = "https://github.com/c-cube/gen"; homepage = "https://github.com/c-cube/gen";
description = "Simple, efficient iterators for OCaml"; description = "Simple, efficient iterators for OCaml";
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
}; };
} }

2
pkgs/development/ocaml-modules/gg/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }: { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }:
let let
inherit (stdenv.lib) getVersion versionAtLeast; inherit (lib) getVersion versionAtLeast;
pname = "gg"; pname = "gg";
version = "0.9.1"; version = "0.9.1";

4
pkgs/development/ocaml-modules/git/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, buildDunePackage { stdenv, lib, fetchurl, buildDunePackage
, alcotest, mtime, mirage-crypto-rng, tls, git-binary , alcotest, mtime, mirage-crypto-rng, tls, git-binary
, angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum , angstrom, astring, cstruct, decompress, digestif, encore, duff, fmt, checkseum
, fpath, hex, ke, logs, lru, ocaml_lwt, ocamlgraph, ocplib-endian, uri, rresult , 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 ]; checkInputs = [ alcotest mtime mirage-crypto-rng tls git-binary ];
doCheck = !stdenv.isAarch64; doCheck = !stdenv.isAarch64;
meta = with stdenv; { meta = {
description = "Git format and protocol in pure OCaml"; description = "Git format and protocol in pure OCaml";
license = lib.licenses.isc; license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];

6
pkgs/development/ocaml-modules/gmetadom/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}: {stdenv, lib, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}:
let let
pname = "gmetadom"; pname = "gmetadom";
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "http://gmetadom.sourceforge.net/"; homepage = "http://gmetadom.sourceforge.net/";
description = "A collection of librares, each library providing a DOM implementation"; description = "A collection of librares, each library providing a DOM implementation";
license = stdenv.lib.licenses.lgpl21Plus; license = lib.licenses.lgpl21Plus;
maintainers = [ stdenv.lib.maintainers.roconnor ]; maintainers = [ lib.maintainers.roconnor ];
}; };
} }

2
pkgs/development/ocaml-modules/gsl/default.nix
View File

@ -12,7 +12,7 @@ buildDunePackage rec {
}; };
buildInputs = [ dune-configurator gsl pkg-config ]; 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; { meta = with lib; {
homepage = "https://mmottl.github.io/gsl-ocaml/"; homepage = "https://mmottl.github.io/gsl-ocaml/";

8
pkgs/development/ocaml-modules/gtktop/default.nix
View File

@ -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 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}" then throw "${pname} is not available for OCaml ${ocaml.version}"
else else
@ -22,8 +22,8 @@ stdenv.mkDerivation {
meta = { meta = {
homepage = "http://zoggy.github.io/gtktop/"; homepage = "http://zoggy.github.io/gtktop/";
description = "A small OCaml library to ease the creation of graphical toplevels"; description = "A small OCaml library to ease the creation of graphical toplevels";
license = stdenv.lib.licenses.lgpl3; license = lib.licenses.lgpl3;
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
}; };
} }

2
pkgs/development/ocaml-modules/herelib/default.nix
View File

@ -14,7 +14,7 @@ buildOcaml rec {
meta = with lib; { meta = with lib; {
homepage = "https://github.com/janestreet/herelib"; homepage = "https://github.com/janestreet/herelib";
description = "Syntax extension for inserting the current location"; description = "Syntax extension for inserting the current location";
license = stdenv.lib.licenses.asl20; license = licenses.asl20;
maintainers = [ maintainers.ericbmerritt ]; maintainers = [ maintainers.ericbmerritt ];
}; };
} }

6
pkgs/development/ocaml-modules/hex/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, buildDunePackage, bigarray-compat, cstruct }: { stdenv, lib, fetchurl, buildDunePackage, bigarray-compat, cstruct }:
buildDunePackage rec { buildDunePackage rec {
pname = "hex"; pname = "hex";
@ -19,7 +19,7 @@ buildDunePackage rec {
meta = { meta = {
description = "Mininal OCaml library providing hexadecimal converters"; description = "Mininal OCaml library providing hexadecimal converters";
homepage = "https://github.com/mirage/ocaml-hex"; homepage = "https://github.com/mirage/ocaml-hex";
license = stdenv.lib.licenses.isc; license = lib.licenses.isc;
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
}; };
} }

2
pkgs/development/ocaml-modules/http/default.nix
View File

@ -1,6 +1,6 @@
{lib, stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}: {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}" then throw "ocaml-http is not available for OCaml ${ocaml.version}"
else else

4
pkgs/development/ocaml-modules/inifiles/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }: { stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml${ocaml.version}-inifiles-1.2"; name = "ocaml${ocaml.version}-inifiles-1.2";
@ -22,7 +22,7 @@ stdenv.mkDerivation {
meta = { meta = {
description = "A small OCaml library to read and write .ini files"; description = "A small OCaml library to read and write .ini files";
license = stdenv.lib.licenses.lgpl21Plus; license = lib.licenses.lgpl21Plus;
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

12
pkgs/development/ocaml-modules/inotify/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ocamlbuild { stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, ocamlbuild
, ocaml_lwt # optional lwt support , ocaml_lwt # optional lwt support
, ounit, fileutils # only for tests , ounit, fileutils # only for tests
}: }:
@ -23,9 +23,9 @@ stdenv.mkDerivation rec {
checkInputs = [ ounit fileutils ]; checkInputs = [ ounit fileutils ];
configureFlags = [ "--enable-lwt" configureFlags = [ "--enable-lwt"
(stdenv.lib.optionalString doCheck "--enable-tests") ]; (lib.optionalString doCheck "--enable-tests") ];
postConfigure = stdenv.lib.optionalString doCheck '' postConfigure = lib.optionalString doCheck ''
echo '<lib_test/test_inotify_lwt.*>: pkg_threads' | tee -a _tags echo '<lib_test/test_inotify_lwt.*>: pkg_threads' | tee -a _tags
''; '';
@ -36,9 +36,9 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Bindings for Linux’s filesystem monitoring interface, inotify"; description = "Bindings for Linux’s filesystem monitoring interface, inotify";
license = stdenv.lib.licenses.lgpl21; license = lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage; inherit (src.meta) homepage;
platforms = stdenv.lib.platforms.linux; platforms = lib.platforms.linux;
}; };
} }

6
pkgs/development/ocaml-modules/io-page/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, buildDunePackage, cstruct, bigarray-compat, ounit }: { stdenv, lib, fetchurl, buildDunePackage, cstruct, bigarray-compat, ounit }:
buildDunePackage rec { buildDunePackage rec {
pname = "io-page"; pname = "io-page";
@ -18,8 +18,8 @@ buildDunePackage rec {
meta = { meta = {
homepage = "https://github.com/mirage/io-page"; homepage = "https://github.com/mirage/io-page";
license = stdenv.lib.licenses.isc; license = lib.licenses.isc;
description = "IO memory page library for Mirage backends"; description = "IO memory page library for Mirage backends";
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
}; };
} }

8
pkgs/development/ocaml-modules/iri/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitLab, ocaml, findlib { stdenv, lib, fetchFromGitLab, ocaml, findlib
, sedlex, uunf, uutf , sedlex, uunf, uutf
}: }:
if !stdenv.lib.versionAtLeast ocaml.version "4.03" if !lib.versionAtLeast ocaml.version "4.03"
then throw "iri is not available for OCaml ${ocaml.version}" then throw "iri is not available for OCaml ${ocaml.version}"
else else
@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "IRI (RFC3987) native OCaml implementation"; description = "IRI (RFC3987) native OCaml implementation";
license = stdenv.lib.licenses.lgpl3; license = lib.licenses.lgpl3;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage; inherit (src.meta) homepage;
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };

6
pkgs/development/ocaml-modules/iso8601/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: { stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }:
let version = "0.2.4"; in let version = "0.2.4"; in
@ -16,8 +16,8 @@ stdenv.mkDerivation {
meta = { meta = {
homepage = "https://ocaml-community.github.io/ISO8601.ml/"; homepage = "https://ocaml-community.github.io/ISO8601.ml/";
description = "ISO 8601 and RFC 3999 date parsing for OCaml"; description = "ISO 8601 and RFC 3999 date parsing for OCaml";
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
}; };
} }

4
pkgs/development/ocaml-modules/janestreet/janePackage.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.11.0" }: { stdenv, lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.11.0" }:
{ pname, version ? defaultVersion, hash, ...}@args: { pname, version ? defaultVersion, hash, ...}@args:
@ -14,6 +14,6 @@ buildDunePackage (args // {
sha256 = hash; sha256 = hash;
}; };
meta.license = stdenv.lib.licenses.asl20; meta.license = lib.licenses.asl20;
meta.homepage = "https://github.com/janestreet/${pname}"; meta.homepage = "https://github.com/janestreet/${pname}";
}) })

2
pkgs/development/ocaml-modules/javalib/default.nix
View File

@ -2,7 +2,7 @@
, camlzip, extlib , camlzip, extlib
}: }:
if !stdenv.lib.versionAtLeast ocaml.version "4.04" if !lib.versionAtLeast ocaml.version "4.04"
then throw "javalib is not available for OCaml ${ocaml.version}" then throw "javalib is not available for OCaml ${ocaml.version}"
else else

6
pkgs/development/ocaml-modules/jsonm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }: { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, uutf }:
let version = "1.0.1"; in let version = "1.0.1"; in
@ -19,8 +19,8 @@ stdenv.mkDerivation {
meta = { meta = {
description = "An OCaml non-blocking streaming codec to decode and encode the JSON data format"; description = "An OCaml non-blocking streaming codec to decode and encode the JSON data format";
homepage = "https://erratique.ch/software/jsonm"; homepage = "https://erratique.ch/software/jsonm";
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
}; };
} }

6
pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }: { stdenv, lib, fetchurl, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-lablgtk-extras-1.4"; name = "ocaml-lablgtk-extras-1.4";
@ -14,10 +14,10 @@ stdenv.mkDerivation {
meta = { meta = {
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
homepage = "http://gtk-extras.forge.ocamlcore.org/"; homepage = "http://gtk-extras.forge.ocamlcore.org/";
description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications"; description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications";
license = stdenv.lib.licenses.lgpl2Plus; license = lib.licenses.lgpl2Plus;
branch = "1.4"; branch = "1.4";
}; };
} }

8
pkgs/development/ocaml-modules/lablgtk-extras/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }: { stdenv, lib, fetchFromGitHub, ocaml, findlib, camlp4, config-file, lablgtk, xmlm }:
assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02"; assert lib.versionAtLeast (lib.getVersion ocaml) "4.02";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.6"; version = "1.6";
@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
meta = { meta = {
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
homepage = "http://gtk-extras.forge.ocamlcore.org/"; homepage = "http://gtk-extras.forge.ocamlcore.org/";
description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications"; description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications";
license = stdenv.lib.licenses.lgpl2Plus; license = lib.licenses.lgpl2Plus;
}; };
} }

10
pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: { stdenv, lib, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }:
if stdenv.lib.versionAtLeast ocaml.version "4.04" if lib.versionAtLeast ocaml.version "4.04"
then throw "lablgtk-2.14 is not available for OCaml ${ocaml.version}" else then throw "lablgtk-2.14 is not available for OCaml ${ocaml.version}" else
let let
@ -31,11 +31,11 @@ stdenv.mkDerivation (rec {
branch = "2.14"; branch = "2.14";
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers = [
stdenv.lib.maintainers.maggesi lib.maintainers.maggesi
stdenv.lib.maintainers.roconnor lib.maintainers.roconnor
]; ];
homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html"; homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html";
description = "LablGTK is is an Objective Caml interface to GTK"; description = "LablGTK is is an Objective Caml interface to GTK";
license = stdenv.lib.licenses.lgpl21Plus; license = lib.licenses.lgpl21Plus;
}; };
}) })

2
pkgs/development/ocaml-modules/lablgtk/default.nix
View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: { lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }:
let param = let param =
let check = stdenv.lib.versionAtLeast ocaml.version; in let check = lib.versionAtLeast ocaml.version; in
if check "4.06" then rec { if check "4.06" then rec {
version = "2.18.10"; version = "2.18.10";
src = fetchFromGitHub { src = fetchFromGitHub {

8
pkgs/development/ocaml-modules/labltk/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchzip, ocaml, findlib, tcl, tk }: { stdenv, lib, fetchurl, fetchzip, ocaml, findlib, tcl, tk }:
let OCamlVersionAtLeast = stdenv.lib.versionAtLeast ocaml.version; in let OCamlVersionAtLeast = lib.versionAtLeast ocaml.version; in
if !OCamlVersionAtLeast "4.04" if !OCamlVersionAtLeast "4.04"
then throw "labltk is not available for OCaml ${ocaml.version}" then throw "labltk is not available for OCaml ${ocaml.version}"
@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "OCaml interface to Tcl/Tk, including OCaml library explorer OCamlBrowser"; description = "OCaml interface to Tcl/Tk, including OCaml library explorer OCamlBrowser";
homepage = "http://labltk.forge.ocamlcore.org/"; homepage = "http://labltk.forge.ocamlcore.org/";
license = stdenv.lib.licenses.lgpl21; license = lib.licenses.lgpl21;
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
}; };
} }

2
pkgs/development/ocaml-modules/lacaml/default.nix
View File

@ -19,7 +19,7 @@ buildDunePackage rec {
buildInputs = [ dune-configurator ]; buildInputs = [ dune-configurator ];
propagatedBuildInputs = [ lapack blas ] ++ propagatedBuildInputs = [ lapack blas ] ++
stdenv.lib.optionals stdenv.isDarwin lib.optionals stdenv.isDarwin
[ darwin.apple_sdk.frameworks.Accelerate ]; [ darwin.apple_sdk.frameworks.Accelerate ];
meta = with lib; { meta = with lib; {

6
pkgs/development/ocaml-modules/linenoise/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildDunePackage, result }: { lib, fetchFromGitHub, buildDunePackage, result }:
buildDunePackage rec { buildDunePackage rec {
pname = "linenoise"; pname = "linenoise";
@ -17,8 +17,8 @@ buildDunePackage rec {
meta = { meta = {
description = "OCaml bindings to linenoise"; description = "OCaml bindings to linenoise";
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage; inherit (src.meta) homepage;
}; };
} }

8
pkgs/development/ocaml-modules/llvm/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchpatch, python, cmake, llvm, ocaml, findlib, ctypes }: { stdenv, lib, fetchpatch, python, cmake, llvm, ocaml, findlib, ctypes }:
let version = stdenv.lib.getVersion llvm; in let version = lib.getVersion llvm; in
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "ocaml-llvm"; pname = "ocaml-llvm";
@ -20,7 +20,7 @@ stdenv.mkDerivation {
cmakeFlags = [ cmakeFlags = [
"-DLLVM_OCAML_OUT_OF_TREE=TRUE" "-DLLVM_OCAML_OUT_OF_TREE=TRUE"
"-DLLVM_OCAML_INSTALL_PATH=${placeholder "out"}/ocaml" "-DLLVM_OCAML_INSTALL_PATH=${placeholder "out"}/ocaml"
"-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${stdenv.lib.getLib llvm}/lib" "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${lib.getLib llvm}/lib"
]; ];
buildFlags = [ "ocaml_all" ]; buildFlags = [ "ocaml_all" ];
@ -41,7 +41,7 @@ stdenv.mkDerivation {
inherit (llvm.meta) license homepage; inherit (llvm.meta) license homepage;
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
description = "OCaml bindings distributed with LLVM"; description = "OCaml bindings distributed with LLVM";
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
}; };
} }

2
pkgs/development/ocaml-modules/logs/default.nix
View File

@ -5,7 +5,7 @@ let
webpage = "https://erratique.ch/software/${pname}"; webpage = "https://erratique.ch/software/${pname}";
in in
if !stdenv.lib.versionAtLeast ocaml.version "4.03" if !lib.versionAtLeast ocaml.version "4.03"
then throw "logs is not available for OCaml ${ocaml.version}" then throw "logs is not available for OCaml ${ocaml.version}"
else else

8
pkgs/development/ocaml-modules/lua-ml/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }: { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild, dune }:
if !stdenv.lib.versionAtLeast ocaml.version "4.07" if !lib.versionAtLeast ocaml.version "4.07"
then throw "lua-ml is not available for OCaml ${ocaml.version}" then throw "lua-ml is not available for OCaml ${ocaml.version}"
else else
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
description = "An embeddable Lua 2.5 interpreter implemented in OCaml"; description = "An embeddable Lua 2.5 interpreter implemented in OCaml";
inherit (src.meta) homepage; inherit (src.meta) homepage;
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
license = stdenv.lib.licenses.bsd2; license = lib.licenses.bsd2;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
}; };
} }

6
pkgs/development/ocaml-modules/lwt_log/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, buildDunePackage, lwt }: { lib, fetchFromGitHub, buildDunePackage, lwt }:
buildDunePackage rec { buildDunePackage rec {
pname = "lwt_log"; pname = "lwt_log";
@ -18,7 +18,7 @@ buildDunePackage rec {
meta = { meta = {
description = "Lwt logging library (deprecated)"; description = "Lwt logging library (deprecated)";
homepage = "https://github.com/aantron/lwt_log"; homepage = "https://github.com/aantron/lwt_log";
license = stdenv.lib.licenses.lgpl21; license = lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
}; };
} }

6
pkgs/development/ocaml-modules/lwt_ssl/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, buildDunePackage, ssl, lwt }: { lib, fetchzip, buildDunePackage, ssl, lwt }:
buildDunePackage rec { buildDunePackage rec {
pname = "lwt_ssl"; pname = "lwt_ssl";
@ -16,7 +16,7 @@ buildDunePackage rec {
meta = { meta = {
homepage = "https://github.com/aantron/lwt_ssl"; homepage = "https://github.com/aantron/lwt_ssl";
description = "OpenSSL binding with concurrent I/O"; description = "OpenSSL binding with concurrent I/O";
license = stdenv.lib.licenses.lgpl21; license = lib.licenses.lgpl21;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
}; };
} }

6
pkgs/development/ocaml-modules/magic-mime/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: { stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }:
let version = "1.0.0"; in let version = "1.0.0"; in
@ -21,7 +21,7 @@ stdenv.mkDerivation {
homepage = "https://github.com/mirage/ocaml-magic-mime"; homepage = "https://github.com/mirage/ocaml-magic-mime";
description = "Convert file extensions to MIME types"; description = "Convert file extensions to MIME types";
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
license = stdenv.lib.licenses.isc; license = lib.licenses.isc;
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
}; };
} }

8
pkgs/development/ocaml-modules/magick/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, which, pkgconfig, ocaml, findlib, imagemagick }: { stdenv, lib, fetchurl, which, pkgconfig, ocaml, findlib, imagemagick }:
if stdenv.lib.versionAtLeast ocaml.version "4.06" if lib.versionAtLeast ocaml.version "4.06"
then throw "magick is not available for OCaml ${ocaml.version}" then throw "magick is not available for OCaml ${ocaml.version}"
else else
@ -23,8 +23,8 @@ stdenv.mkDerivation {
meta = { meta = {
homepage = "http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/"; homepage = "http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/";
description = "ImageMagick Binding for OCaml"; description = "ImageMagick Binding for OCaml";
license = stdenv.lib.licenses.mit; license = lib.licenses.mit;
platforms = imagemagick.meta.platforms; platforms = imagemagick.meta.platforms;
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
}; };
} }

2
pkgs/development/ocaml-modules/menhir/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild { lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild
, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20190626" else "20140422" , version ? if lib.versionAtLeast (lib.getVersion ocaml) "4.02" then "20190626" else "20140422"
}@args: }@args:
let let

4
pkgs/development/ocaml-modules/mlgmp/default.nix
View File

@ -1,6 +1,6 @@
{stdenv, fetchurl, ocaml, findlib, gmp, mpfr, ncurses }: {stdenv, lib, fetchurl, ocaml, findlib, gmp, mpfr, ncurses }:
if stdenv.lib.versionAtLeast ocaml.version "4.03" if lib.versionAtLeast ocaml.version "4.03"
then throw "mlgmp is not available for OCaml ${ocaml.version}" else then throw "mlgmp is not available for OCaml ${ocaml.version}" else
let let

6
pkgs/development/ocaml-modules/mlgmpidl/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, perl, ocaml, findlib, camlidl, gmp, mpfr }: { stdenv, lib, fetchFromGitHub, perl, ocaml, findlib, camlidl, gmp, mpfr }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-mlgmpidl-${version}"; name = "ocaml${ocaml.version}-mlgmpidl-${version}";
@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "OCaml interface to the GMP library"; description = "OCaml interface to the GMP library";
homepage = "https://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/"; homepage = "https://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/";
license = stdenv.lib.licenses.lgpl21; license = lib.licenses.lgpl21;
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
}; };
} }

6
pkgs/development/ocaml-modules/mparser/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: { stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml${ocaml.version}-mparser-1.2.3"; name = "ocaml${ocaml.version}-mparser-1.2.3";
@ -17,9 +17,9 @@ stdenv.mkDerivation {
meta = { meta = {
description = "A simple monadic parser combinator OCaml library"; description = "A simple monadic parser combinator OCaml library";
license = stdenv.lib.licenses.lgpl21Plus; license = lib.licenses.lgpl21Plus;
homepage = "https://github.com/cakeplus/mparser"; homepage = "https://github.com/cakeplus/mparser";
maintainers = [ stdenv.lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
}; };
} }

2
pkgs/development/ocaml-modules/mtime/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ ocaml findlib ocamlbuild ]; nativeBuildInputs = [ ocaml findlib ocamlbuild ];
buildInputs = [ findlib topkg ] buildInputs = [ findlib topkg ]
++ stdenv.lib.optional jsooSupport js_of_ocaml; ++ optional jsooSupport js_of_ocaml;
buildPhase = "${topkg.buildPhase} --with-js_of_ocaml ${boolToString jsooSupport}"; buildPhase = "${topkg.buildPhase} --with-js_of_ocaml ${boolToString jsooSupport}";

6
pkgs/development/ocaml-modules/mysql/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, ocaml, findlib, libmysqlclient }: { stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, libmysqlclient }:
# TODO: la versione stabile da' un errore di compilazione dovuto a # TODO: la versione stabile da' un errore di compilazione dovuto a
# qualche cambiamento negli header .h # qualche cambiamento negli header .h
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "http://ocaml-mysql.forge.ocamlcore.org"; homepage = "http://ocaml-mysql.forge.ocamlcore.org";
description = "Bindings for interacting with MySQL databases from ocaml"; description = "Bindings for interacting with MySQL databases from ocaml";
license = stdenv.lib.licenses.lgpl21Plus; license = lib.licenses.lgpl21Plus;
maintainers = [ stdenv.lib.maintainers.roconnor ]; maintainers = [ lib.maintainers.roconnor ];
}; };
} }

8
pkgs/development/ocaml-modules/nocrypto/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg { stdenv, lib, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, topkg
, cpuid, ocb-stubblr, sexplib , cpuid, ocb-stubblr, sexplib
, cstruct, zarith, ppx_sexp_conv, ppx_deriving, writeScriptBin , cstruct, zarith, ppx_sexp_conv, ppx_deriving, writeScriptBin
, cstruct-lwt ? null , cstruct-lwt ? null
}: }:
with stdenv.lib; with lib;
let let
withLwt = cstruct-lwt != null; withLwt = cstruct-lwt != null;
# the build system will call 'cc' with no way to override # the build system will call 'cc' with no way to override
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "https://github.com/mirleft/ocaml-nocrypto"; homepage = "https://github.com/mirleft/ocaml-nocrypto";
description = "Simplest possible crypto to support TLS"; description = "Simplest possible crypto to support TLS";
license = stdenv.lib.licenses.bsd2; license = lib.licenses.bsd2;
maintainers = with stdenv.lib.maintainers; [ vbgl ]; maintainers = with lib.maintainers; [ vbgl ];
}; };
} }

4
pkgs/development/ocaml-modules/notty/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg, ocb-stubblr
, result, uucp, uuseg, uutf , result, uucp, uuseg, uutf
, lwt ? null }: , lwt ? null }:
with stdenv.lib; with lib;
if !versionAtLeast ocaml.version "4.05" if !versionAtLeast ocaml.version "4.05"
then throw "notty is not available for OCaml ${ocaml.version}" then throw "notty is not available for OCaml ${ocaml.version}"

2
pkgs/development/ocaml-modules/num/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Legacy Num library for arbitrary-precision integer and rational arithmetic"; description = "Legacy Num library for arbitrary-precision integer and rational arithmetic";
license = stdenv.lib.licenses.lgpl21; license = lib.licenses.lgpl21;
inherit (ocaml.meta) platforms; inherit (ocaml.meta) platforms;
inherit (src.meta) homepage; inherit (src.meta) homepage;
}; };

6
pkgs/development/ocaml-modules/ocaml-cairo/default.nix
View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }: {stdenv, lib, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }:
let let
pname = "ocaml-cairo"; pname = "ocaml-cairo";
in 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}" then throw "${pname} is not available for OCaml ${ocaml.version}"
else else
@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "http://cairographics.org/cairo-ocaml"; homepage = "http://cairographics.org/cairo-ocaml";
description = "ocaml bindings for cairo library"; description = "ocaml bindings for cairo library";
license = stdenv.lib.licenses.gpl2; license = lib.licenses.gpl2;
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
}; };
} }

4
pkgs/development/ocaml-modules/ocaml-text/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, libiconv, ocaml, findlib, ocamlbuild, ncurses }: { stdenv, lib, fetchzip, libiconv, ocaml, findlib, ocamlbuild, ncurses }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ocaml-text"; pname = "ocaml-text";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "http://ocaml-text.forge.ocamlcore.org/"; homepage = "http://ocaml-text.forge.ocamlcore.org/";
description = "A library for convenient text manipulation"; description = "A library for convenient text manipulation";
license = stdenv.lib.licenses.bsd3; license = lib.licenses.bsd3;
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
}; };
} }

Some files were not shown because too many files have changed in this diff Show More