ocamlPackages.ppx_import: 1.8.0 -> 1.9.1 (#156399)
* ocamlPackages.ppx_import: 1.8.0 -> 1.9.1 * coqPackages.serapi: fix compilation with ppx_import-1.9.1
This commit is contained in:
parent
aebb99a823
commit
a01cad0d0f
|
@ -1,19 +1,6 @@
|
||||||
{ lib, fetchzip, mkCoqDerivation, coq, version ? null }:
|
{ lib, fetchzip, mkCoqDerivation, coq, version ? null }:
|
||||||
|
|
||||||
let
|
let
|
||||||
ocamlPackages =
|
|
||||||
coq.ocamlPackages.overrideScope'
|
|
||||||
(self: super: {
|
|
||||||
ppxlib = super.ppxlib.override { version = "0.15.0"; };
|
|
||||||
# the following does not work
|
|
||||||
ppx_sexp_conv = super.ppx_sexp_conv.overrideAttrs (_: {
|
|
||||||
src = fetchzip {
|
|
||||||
url = "https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.1.tar.gz";
|
|
||||||
sha256 = "04bx5id99clrgvkg122nx03zig1m7igg75piphhyx04w33shgkz2";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
release = {
|
release = {
|
||||||
"8.14.0+0.14.0".sha256 = "sha256:1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d";
|
"8.14.0+0.14.0".sha256 = "sha256:1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d";
|
||||||
"8.14+rc1+0.14.0".sha256 = "1w7d7anvcfx8vz51mnrf1jkw6rlpzjkjlr06avf58wlhymww7pja";
|
"8.14+rc1+0.14.0".sha256 = "1w7d7anvcfx8vz51mnrf1jkw6rlpzjkjlr06avf58wlhymww7pja";
|
||||||
|
@ -29,8 +16,6 @@ in
|
||||||
inherit version release;
|
inherit version release;
|
||||||
|
|
||||||
defaultVersion = with versions;
|
defaultVersion = with versions;
|
||||||
if isGe "4.12" coq.ocamlPackages.ocaml.version then null
|
|
||||||
else
|
|
||||||
switch coq.version [
|
switch coq.version [
|
||||||
{ case = isEq "8.14"; out = "8.14.0+0.14.0"; }
|
{ case = isEq "8.14"; out = "8.14.0+0.14.0"; }
|
||||||
{ case = isEq "8.13"; out = "8.13.0+0.13.0"; }
|
{ case = isEq "8.13"; out = "8.13.0+0.13.0"; }
|
||||||
|
@ -42,7 +27,7 @@ in
|
||||||
useDune2 = true;
|
useDune2 = true;
|
||||||
|
|
||||||
propagatedBuildInputs =
|
propagatedBuildInputs =
|
||||||
with ocamlPackages; [
|
with coq.ocamlPackages; [
|
||||||
cmdliner
|
cmdliner
|
||||||
findlib # run time dependency of SerAPI
|
findlib # run time dependency of SerAPI
|
||||||
ppx_deriving
|
ppx_deriving
|
||||||
|
|
|
@ -1,27 +1,42 @@
|
||||||
{ lib, fetchurl, buildDunePackage
|
{ lib
|
||||||
, ppx_tools_versioned
|
, fetchurl
|
||||||
, ocaml-migrate-parsetree
|
, buildDunePackage
|
||||||
|
, ounit
|
||||||
|
, ppx_deriving
|
||||||
|
, ppx_sexp_conv
|
||||||
|
, ppxlib
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
lib.throwIfNot (lib.versionAtLeast ppxlib.version "0.24.0")
|
||||||
|
"ppx_import is not available with ppxlib-${ppxlib.version}"
|
||||||
|
|
||||||
buildDunePackage rec {
|
buildDunePackage rec {
|
||||||
pname = "ppx_import";
|
pname = "ppx_import";
|
||||||
version = "1.8.0";
|
version = "1.9.1";
|
||||||
|
|
||||||
useDune2 = true;
|
useDune2 = true;
|
||||||
|
|
||||||
minimumOCamlVersion = "4.04";
|
minimalOCamlVersion = "4.05";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/ocaml-ppx/ppx_import/releases/download/v${version}/ppx_import-${version}.tbz";
|
url = "https://github.com/ocaml-ppx/ppx_import/releases/download/${version}/ppx_import-${version}.tbz";
|
||||||
sha256 = "0zqcj70yyp4ik4jc6jz3qs2xhb94vxc6yq9ij0d5cyak28klc3gv";
|
sha256 = "1li1f9b1i0yhjy655k74hgzhd05palz726zjbhwcy3iqxvi9id6i";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
ppx_tools_versioned ocaml-migrate-parsetree
|
ppxlib
|
||||||
];
|
];
|
||||||
|
|
||||||
|
checkInputs = [
|
||||||
|
ounit
|
||||||
|
ppx_deriving
|
||||||
|
ppx_sexp_conv
|
||||||
|
];
|
||||||
|
|
||||||
|
doCheck = true;
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "A syntax extension that allows to pull in types or signatures from other compiled interface files";
|
description = "A syntax extension for importing declarations from interface files";
|
||||||
license = lib.licenses.mit;
|
license = lib.licenses.mit;
|
||||||
homepage = "https://github.com/ocaml-ppx/ppx_import";
|
homepage = "https://github.com/ocaml-ppx/ppx_import";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue