diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2022-01-26 09:16:24 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-26 13:16:24 +0100 |
| commit | a01cad0d0f38269b544ab21c0fbfd8df2da072f7 (patch) | |
| tree | 9d3fe024363467a191270f65e523011ed0374d04 /pkgs/development/coq-modules | |
| parent | aebb99a823daabd2e7f549af41a9a1d10e14710f (diff) | |
| download | nixpkgs-a01cad0d0f38269b544ab21c0fbfd8df2da072f7.tar nixpkgs-a01cad0d0f38269b544ab21c0fbfd8df2da072f7.tar.gz nixpkgs-a01cad0d0f38269b544ab21c0fbfd8df2da072f7.tar.bz2 nixpkgs-a01cad0d0f38269b544ab21c0fbfd8df2da072f7.tar.lz nixpkgs-a01cad0d0f38269b544ab21c0fbfd8df2da072f7.tar.xz nixpkgs-a01cad0d0f38269b544ab21c0fbfd8df2da072f7.tar.zst nixpkgs-a01cad0d0f38269b544ab21c0fbfd8df2da072f7.zip | |
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
Diffstat (limited to 'pkgs/development/coq-modules')
| -rw-r--r-- | pkgs/development/coq-modules/serapi/default.nix | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index 383151a1cb5..5820f98fa0f 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -1,19 +1,6 @@ { lib, fetchzip, mkCoqDerivation, coq, version ? null }: 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 = { "8.14.0+0.14.0".sha256 = "sha256:1kh80yb791yl771qbqkvwhbhydfii23a7lql0jgifvllm2k8hd8d"; "8.14+rc1+0.14.0".sha256 = "1w7d7anvcfx8vz51mnrf1jkw6rlpzjkjlr06avf58wlhymww7pja"; @@ -29,8 +16,6 @@ in inherit version release; defaultVersion = with versions; - if isGe "4.12" coq.ocamlPackages.ocaml.version then null - else switch coq.version [ { case = isEq "8.14"; out = "8.14.0+0.14.0"; } { case = isEq "8.13"; out = "8.13.0+0.13.0"; } @@ -42,7 +27,7 @@ in useDune2 = true; propagatedBuildInputs = - with ocamlPackages; [ + with coq.ocamlPackages; [ cmdliner findlib # run time dependency of SerAPI ppx_deriving |