lol

ocamlPackages.ppx_deriving: 4.1 -> 4.2

This fixes compilation of ppx_deriving with OCaml 4.05.

js_of_ocaml_2: mark as broken with OCaml 4.05

ocamlPackages.cohttp: propagates ppx_deriving

authored by

Théo Zimmermann and committed by
Vincent Laporte
a9be3c20 2a191ed8

+19 -7
+2 -2
pkgs/development/ocaml-modules/cohttp/default.nix
··· 1 { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder 2 - , ppx_fields_conv, ppx_sexp_conv 3 , base64, fieldslib, jsonm, logs, re, stringext, uri 4 }: 5 ··· 16 17 buildInputs = [ ocaml findlib jbuilder jsonm ppx_fields_conv ppx_sexp_conv ]; 18 19 - propagatedBuildInputs = [ base64 fieldslib re stringext uri ]; 20 21 buildPhase = "jbuilder build -p cohttp"; 22
··· 1 { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder 2 + , ppx_fields_conv, ppx_sexp_conv, ppx_deriving 3 , base64, fieldslib, jsonm, logs, re, stringext, uri 4 }: 5 ··· 16 17 buildInputs = [ ocaml findlib jbuilder jsonm ppx_fields_conv ppx_sexp_conv ]; 18 19 + propagatedBuildInputs = [ ppx_deriving base64 fieldslib re stringext uri ]; 20 21 buildPhase = "jbuilder build -p cohttp"; 22
+16 -5
pkgs/development/ocaml-modules/ppx_deriving/default.nix
··· 1 { stdenv, buildOcaml, ocaml, fetchzip 2 - , cppo, ppx_tools, result, ounit 3 }: 4 5 buildOcaml rec { 6 name = "ppx_deriving"; 7 - version = "4.1"; 8 9 minimumSupportedOcamlVersion = "4.02"; 10 11 src = fetchzip { 12 url = "https://github.com/whitequark/${name}/archive/v${version}.tar.gz"; 13 - sha256 = "0cy9p8d8cbcxvqyyv8fz2z9ypi121zrgaamdlp4ld9f3jnwz7my9"; 14 }; 15 16 hasSharedObjects = true; 17 18 buildInputs = [ cppo ounit ]; 19 - propagatedBuildInputs = 20 [ ppx_tools result ]; 21 22 installPhase = "OCAMLPATH=$OCAMLPATH:`ocamlfind printconf destdir` make install"; ··· 25 description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02."; 26 maintainers = [ maintainers.maurer ]; 27 license = licenses.mit; 28 - broken = versionAtLeast ocaml.version "4.05"; 29 }; 30 }
··· 1 { stdenv, buildOcaml, ocaml, fetchzip 2 + , cppo, ppx_tools, ppx_derivers, result, ounit, ocaml-migrate-parsetree 3 }: 4 5 + let param = 6 + if ocaml.version == "4.03.0" 7 + then { 8 + version = "4.1"; 9 + sha256 = "0cy9p8d8cbcxvqyyv8fz2z9ypi121zrgaamdlp4ld9f3jnwz7my9"; 10 + extraPropagatedBuildInputs = []; 11 + } else { 12 + version = "4.2"; 13 + sha256 = "0scsg45wp6xdqj648fz155r4yngyl2xcd3hdszfzqwdpbax33914"; 14 + extraPropagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers ]; 15 + }; in 16 + 17 buildOcaml rec { 18 name = "ppx_deriving"; 19 + inherit (param) version; 20 21 minimumSupportedOcamlVersion = "4.02"; 22 23 src = fetchzip { 24 url = "https://github.com/whitequark/${name}/archive/v${version}.tar.gz"; 25 + inherit (param) sha256; 26 }; 27 28 hasSharedObjects = true; 29 30 buildInputs = [ cppo ounit ]; 31 + propagatedBuildInputs = param.extraPropagatedBuildInputs ++ 32 [ ppx_tools result ]; 33 34 installPhase = "OCAMLPATH=$OCAMLPATH:`ocamlfind printconf destdir` make install"; ··· 37 description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02."; 38 maintainers = [ maintainers.maurer ]; 39 license = licenses.mit; 40 }; 41 }
+1
pkgs/development/tools/ocaml/js_of_ocaml/default.nix
··· 34 maintainers = [ 35 maintainers.gal_bolle 36 ]; 37 }; 38 }
··· 34 maintainers = [ 35 maintainers.gal_bolle 36 ]; 37 + broken = versionAtLeast ocaml.version "4.05"; 38 }; 39 }