Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to name -> pname+version. Fortunately, almost everything was auto-resolved by kdiff3, and for now I just fixed up a couple evaluation problems, as verified by the tarball job. There might be some fallback to these conflicts, but I believe it should be minimal. Hydra nixpkgs: ?compare=1538299
This commit is contained in:
Vladimír Čunát
@@ -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 ];
|
||||
};
|
||||
}
|
||||
@@ -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";
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -20,6 +20,9 @@ let param = {
|
||||
"4.07" = {
|
||||
version = "5.1+4.06.0";
|
||||
sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw"; };
|
||||
"4.08" = {
|
||||
version = "5.3+4.08.0";
|
||||
sha256 = "0vdmhs3hpmh5iclx4lzgdpf362m4l35zprxs73r84z1yhr4jcr4m"; };
|
||||
}."${ocaml.meta.branch}";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@@ -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 {}
|
||||
))
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 = {
|
||||
|
||||
@@ -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 ];
|
||||
}
|
||||
@@ -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 ];
|
||||
|
||||
Reference in New Issue
Block a user