public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-08-28 08:26:42 +02:00
parent a2538606e3 98640fd482
commit 5061fe0c2c
1209 changed files with 36685 additions and 18393 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/charInfo_width/default.nix
+19
View File
@@ -0,0 +1,19 @@
{ lib, fetchzip, buildDunePackage, camomile, result }:
buildDunePackage rec {
pname = "charInfo_width";
version = "1.1.0";
src = fetchzip {
url = "https://bitbucket.org/zandoye/charinfo_width/get/${version}.tar.bz2";
sha256 = "19mnq9a1yr16srqs8n6hddahr4f9d2gbpmld62pvlw1ps7nfrp9w";
};
propagatedBuildInputs = [ camomile result ];
meta = {
homepage = "https://bitbucket.org/zandoye/charinfo_width/";
description = "Determine column width for a character";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.vbgl ];
};
}
pkgs/development/ocaml-modules/cohttp/default.nix
+4 -4
View File
@@ -1,22 +1,22 @@
{ lib, fetchFromGitHub, buildDunePackage
, ppx_fields_conv, ppx_sexp_conv
, base64, fieldslib, jsonm, re, stringext, uri
, base64, fieldslib, jsonm, re, stringext, uri-sexp
}:
buildDunePackage rec {
pname = "cohttp";
version = "2.0.0";
version = "2.1.3";
src = fetchFromGitHub {
owner = "mirage";
repo = "ocaml-cohttp";
rev = "v${version}";
sha256 = "0nz9y7l5s9a2rq5sb1m5705h99wvf4dk3fhcgragwhy5nwwzcya8";
sha256 = "16k4ldmz6ljryhr139adlma130frb5wh13qswkrwc5gxx6d2wh8d";
};
buildInputs = [ jsonm ppx_fields_conv ppx_sexp_conv ];
propagatedBuildInputs = [ base64 fieldslib re stringext uri ];
propagatedBuildInputs = [ base64 fieldslib re stringext uri-sexp ];
meta = {
description = "HTTP(S) library for Lwt, Async and Mirage";
pkgs/development/ocaml-modules/javalib/default.nix
+10 -13
View File
@@ -1,24 +1,21 @@
{ stdenv, fetchzip, which, ocaml, findlib, camlp4
, camlzip, camomile, extlib
{ stdenv, fetchzip, which, ocaml, findlib
, camlzip, extlib
}:
if !stdenv.lib.versionAtLeast ocaml.version "4"
then throw "javalib not supported for ocaml ${ocaml.version}"
if !stdenv.lib.versionAtLeast ocaml.version "4.04"
then throw "javalib is not available for OCaml ${ocaml.version}"
else
let
pname = "javalib";
in
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-${pname}-${version}";
version = "3.0";
name = "ocaml${ocaml.version}-javalib-${version}";
version = "3.1.1";
src = fetchzip {
url = "https://github.com/javalib-team/javalib/archive/v${version}.tar.gz";
sha256 = "02zgn1z1wj3rbg9xqmbagys91bnsy27iwrngkivzhlykyaw9vf6n";
sha256 = "1myrf7kw7pi04pmp0bi4747nj4h4vfxlla05sz2hp4w8k76iscld";
};
buildInputs = [ which ocaml findlib camlp4 ];
buildInputs = [ which ocaml findlib ];
patches = [ ./configure.sh.patch ./Makefile.config.example.patch ];
@@ -29,13 +26,13 @@ stdenv.mkDerivation rec {
configureScript = "./configure.sh";
dontAddPrefix = "true";
propagatedBuildInputs = [ camlzip camomile extlib ];
propagatedBuildInputs = [ camlzip extlib ];
meta = with stdenv.lib; {
description = "A library that parses Java .class files into OCaml data structures";
homepage = https://javalib-team.github.io/javalib/;
license = licenses.lgpl3;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms or [];
inherit (ocaml.meta) platforms;
};
}
pkgs/development/ocaml-modules/logs/default.nix
+3 -1
View File
@@ -5,7 +5,9 @@ let
webpage = "https://erratique.ch/software/${pname}";
in
assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
if !stdenv.lib.versionAtLeast ocaml.version "4.03"
then throw "logs is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}";
pkgs/development/ocaml-modules/lwt_log/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
buildDunePackage rec {
pname = "lwt_log";
version = "1.1.0";
version = "1.1.1";
minimumOCamlVersion = "4.02";
@@ -10,7 +10,7 @@ buildDunePackage rec {
owner = "aantron";
repo = pname;
rev = version;
sha256 = "1c58gkqfvyf2j11jwj2nh4iq999wj9xpnmr80hz9d0nk9fv333pi";
sha256 = "1n12i1rmn9cjn6p8yr6qn5dwbrwvym7ckr7bla04a1xnq8qlcyj7";
};
propagatedBuildInputs = [ lwt ];
pkgs/development/ocaml-modules/mtime/default.nix
+2 -2
View File
@@ -7,8 +7,8 @@ with lib;
let param =
if versionAtLeast ocaml.version "4.03"
then {
version = "1.1.0";
sha256 = "1qb4ljwirrc3g8brh97s76rjky2cpmy7zm87y7iqd6pxix52ydk3";
version = "1.2.0";
sha256 = "0zm1jvqkz3ghznfsm3bbv9q2zinp9grggdf7k9phjazjvny68xb8";
} else {
version = "0.8.4";
sha256 = "1adm8sc3lkjly99hyi5gqnxas748k7h62ljgn8x423nkn8gyp8dh";
pkgs/development/ocaml-modules/ocurl/default.nix
+6 -2
View File
@@ -1,10 +1,14 @@
{ stdenv, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses }:
if stdenv.lib.versionOlder ocaml.version "4.02"
then throw "ocurl is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
name = "ocurl-0.8.1";
name = "ocurl-0.8.2";
src = fetchurl {
url = "http://ygrek.org.ua/p/release/ocurl/${name}.tar.gz";
sha256 = "08ldzbx1k3mbjc01fmzsn86ll4paf331bcjss6iig6y6hgc9q3ry";
sha256 = "1ax3xdlzgb1zg7d0wr9nwgmh6a45a764m0wk8p6mx07ad94hz0q9";
};
buildInputs = [ pkgconfig ocaml findlib ncurses ];
pkgs/development/ocaml-modules/otr/default.nix
+8 -21
View File
@@ -1,35 +1,22 @@
{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, findlib, topkg
, ppx_tools, ppx_sexp_conv, cstruct, ppx_cstruct, sexplib, rresult, nocrypto
, astring
{ lib, fetchFromGitHub, buildDunePackage
, cstruct, sexplib0, rresult, nocrypto, astring
}:
if !stdenv.lib.versionAtLeast ocaml.version "4.03"
then throw "otr is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-otr-${version}";
version = "0.3.4";
buildDunePackage rec {
pname = "otr";
version = "0.3.6";
src = fetchFromGitHub {
owner = "hannesm";
repo = "ocaml-otr";
rev = "${version}";
sha256 = "0ixf0jvccmcbhk5mhzqakfzimvz200wkdkq3z2d0bdzyggslbdl4";
sha256 = "0iz6p85a0jxng9aq9blqsky173zaqfr6wlc5j48ad55lgwzlbih5";
};
buildInputs = [ ocaml ocamlbuild findlib topkg ppx_tools ppx_sexp_conv ppx_cstruct ];
propagatedBuildInputs = [ cstruct sexplib rresult nocrypto astring ];
buildPhase = "${topkg.run} build --tests true";
inherit (topkg) installPhase;
propagatedBuildInputs = [ cstruct sexplib0 rresult nocrypto astring ];
doCheck = true;
checkPhase = "${topkg.run} test";
meta = with stdenv.lib; {
inherit (ocaml.meta) platforms;
meta = with lib; {
homepage = https://github.com/hannesm/ocaml-otr;
description = "Off-the-record messaging protocol, purely in OCaml";
license = licenses.bsd2;
pkgs/development/ocaml-modules/ppx_deriving/default.nix
+10 -29
View File
@@ -1,41 +1,22 @@
{ stdenv, ocaml, findlib, ocamlbuild, fetchzip
, cppo, ppx_tools, ppx_derivers, result, ounit, ocaml-migrate-parsetree
{ lib, fetchzip, buildDunePackage
, cppo, ppxfind, ppx_tools, ppx_derivers, result, ounit, ocaml-migrate-parsetree
}:
if !stdenv.lib.versionAtLeast ocaml.version "4.02"
then throw "ppx_deriving is not available for OCaml ${ocaml.version}"
else
let param =
if ocaml.version == "4.03.0"
then {
version = "4.1";
sha256 = "0cy9p8d8cbcxvqyyv8fz2z9ypi121zrgaamdlp4ld9f3jnwz7my9";
extraPropagatedBuildInputs = [];
} else {
version = "4.2.1";
sha256 = "1yhhjnncbbb7fsif7qplndh01s1xd72dqm8f3jkgx9y4ariqqvf9";
extraPropagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers ];
}; in
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ppx_deriving-${version}";
inherit (param) version;
buildDunePackage rec {
pname = "ppx_deriving";
version = "4.4";
src = fetchzip {
url = "https://github.com/ocaml-ppx/ppx_deriving/archive/v${version}.tar.gz";
inherit (param) sha256;
sha256 = "0b2gaxlh54pcz3b4891yd143nx852mwggcy0yhq8g85dl3iisxzq";
};
buildInputs = [ ocaml findlib ocamlbuild cppo ounit ];
propagatedBuildInputs = param.extraPropagatedBuildInputs ++
[ ppx_tools result ];
buildInputs = [ ppxfind cppo ounit ];
propagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers ppx_tools result ];
createFindlibDestdir = true;
doCheck = true;
installPhase = "OCAMLPATH=$OCAMLPATH:`ocamlfind printconf destdir` make install";
meta = with stdenv.lib; {
meta = with lib; {
description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02.";
maintainers = [ maintainers.maurer ];
license = licenses.mit;
pkgs/development/ocaml-modules/ppx_tools/default.nix
+4 -1
View File
@@ -20,7 +20,10 @@ let param = {
"4.07" = {
version = "5.1+4.06.0";
sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; };
}.${ocaml.meta.branch};
"4.08" = {
version = "5.3+4.08.0";
sha256 = "0vdmhs3hpmh5iclx4lzgdpf362m4l35zprxs73r84z1yhr4jcr4m"; };
}."${ocaml.meta.branch}";
in
stdenv.mkDerivation {
name = "ocaml${ocaml.version}-ppx_tools-${param.version}";
pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix
+8 -12
View File
@@ -1,23 +1,19 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, ocaml-migrate-parsetree }:
{ lib, fetchFromGitHub, buildDunePackage, ocaml-migrate-parsetree }:
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ppx_tools_versioned-${version}";
version = "5.1";
buildDunePackage rec {
pname = "ppx_tools_versioned";
version = "5.2.3";
src = fetchFromGitHub {
owner = "let-def";
repo = "ppx_tools_versioned";
owner = "ocaml-ppx";
repo = pname;
rev = version;
sha256 = "1c7kvca67qpyr4hiy492yik5x31lmkhyhy5wpl0l0fbx7fr7l624";
sha256 = "1hcmpnw26zf70a71r3d2c2c0mn8q084gdn1r36ynng6fv9hq6j0y";
};
buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ ocaml-migrate-parsetree ];
createFindlibDestdir = true;
meta = with stdenv.lib; {
meta = with lib; {
homepage = https://github.com/let-def/ppx_tools_versioned;
description = "Tools for authors of syntactic tools (such as ppx rewriters)";
license = licenses.gpl2;
pkgs/development/ocaml-modules/ppxfind/default.nix
+7 -3
View File
@@ -1,6 +1,6 @@
{ lib, buildDunePackage, fetchurl, ocaml-migrate-parsetree }:
{ lib, buildDunePackage, fetchurl, ocaml, ocaml-migrate-parsetree }:
buildDunePackage rec {
buildDunePackage (rec {
pname = "ppxfind";
version = "1.3";
src = fetchurl {
@@ -18,4 +18,8 @@ buildDunePackage rec {
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.vbgl ];
};
}
} // (
if lib.versions.majorMinor ocaml.version == "4.04" then {
dontStrip = true;
} else {}
))
pkgs/development/ocaml-modules/ppxlib/default.nix
+2 -2
View File
@@ -4,13 +4,13 @@
buildDunePackage rec {
pname = "ppxlib";
version = "0.6.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "ocaml-ppx";
repo = pname;
rev = version;
sha256 = "0my9x7sxb329h0lzshppdaawiyfbaw6g5f41yiy7bhl071rnlvbv";
sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6";
};
propagatedBuildInputs = [
pkgs/development/ocaml-modules/sedlex/default.nix
+4 -4
View File
@@ -6,11 +6,11 @@ else
stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-sedlex-${version}";
version = "1.99.4";
version = "1.99.5";
src = fetchzip {
url = "https://github.com/alainfrisch/sedlex/archive/v${version}.tar.gz";
sha256 = "1b7nqxyfcz8i7m4b8zil2rn6ygh2czy26f9v64xnxn8r0hy9sh1m";
url = "https://github.com/ocaml-community/sedlex/archive/fb84e1766fc4b29e79ec40029ffee5cdb37b392f.tar.gz";
sha256 = "0phnqyn6mpv5byr1kkphl24y9q9fb2k3xg9yb457h5816q6ya72n";
};
buildInputs = [ ocaml findlib ppx_tools_versioned ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
dontStrip = true;
meta = {
homepage = https://github.com/alainfrisch/sedlex;
homepage = https://github.com/ocaml-community/sedlex;
description = "An OCaml lexer generator for Unicode";
license = stdenv.lib.licenses.mit;
inherit (ocaml.meta) platforms;
pkgs/development/ocaml-modules/uri/default.nix
+5 -5
View File
@@ -1,18 +1,18 @@
{ lib, fetchurl, buildDunePackage, ppx_sexp_conv, ounit
, re, sexplib0, stringext
{ lib, fetchurl, buildDunePackage, ounit
, re, stringext
}:
buildDunePackage rec {
pname = "uri";
version = "2.2.0";
version = "3.0.0";
src = fetchurl {
url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz";
sha256 = "1q0xmc93l46dilxclkmai7w952bdi745rhvsx5vissaigcj9wbwi";
sha256 = "1yhrgm3hbn0hh4jdmcrvxinazgg8vrm0vn425sg8ggzblvxk9cwg";
};
buildInputs = [ ounit ];
propagatedBuildInputs = [ ppx_sexp_conv re sexplib0 stringext ];
propagatedBuildInputs = [ re stringext ];
doCheck = true;
meta = {
pkgs/development/ocaml-modules/uri/sexp.nix
+13
View File
@@ -0,0 +1,13 @@
{ lib, ocaml, buildDunePackage, uri, ounit, ppx_sexp_conv, sexplib0 }:
if !lib.versionAtLeast ocaml.version "4.04"
then throw "uri-sexp is not available for OCaml ${ocaml.version}"
else
buildDunePackage {
pname = "uri-sexp";
inherit (uri) version src doCheck meta;
buildInputs = [ ounit ];
propagatedBuildInputs = [ ppx_sexp_conv sexplib0 uri ];
}
pkgs/development/ocaml-modules/uuidm/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, cmdliner }:
stdenv.mkDerivation rec {
version = "0.9.6";
version = "0.9.7";
pname = "uuidm";
src = fetchurl {
url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz";
sha256 = "0hz4fdx0x16k0pw9995vkz5d1hmzz6b16wck9li399rcbfnv5jlc";
sha256 = "1ivxb3hxn9bk62rmixx6px4fvn52s4yr1bpla7rgkcn8981v45r8";
};
buildInputs = [ ocaml findlib ocamlbuild topkg cmdliner ];
pkgs/development/ocaml-modules/vg/default.nix
+5 -3
View File
@@ -11,11 +11,13 @@ let
inherit (stdenv.lib) optionals versionAtLeast;
pname = "vg";
version = "0.9.1";
version = "0.9.3";
webpage = "https://erratique.ch/software/${pname}";
in
assert versionAtLeast ocaml.version "4.02.0";
if !versionAtLeast ocaml.version "4.03"
then throw "vg is not available for OCaml ${ocaml.version}"
else
stdenv.mkDerivation rec {
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
sha256 = "07h9a464v0x066mjg3ldkaq94ah47b7rvh54z4rndrg7v6bk7kyp";
sha256 = "0jj5hrqxdb6yyplnz0r7am4mbjzgcn876qp7sqs2x93a97fk6lwd";
};
buildInputs = [ ocaml findlib ocamlbuild topkg ];