Commit 97eb7ee0 authored by Vincent Laporte's avatar Vincent Laporte Committed by Vincent Laporte
Browse files

ocamlPackages.ppxlib: 0.33.0 → 0.36.0 

ocamlPackages.base_quickcheck: 0.17.0 → 0.17.1
ocamlPackages.optcomp: 0.17.0 → 0.17.1
ocamlPackages.ppx_bench: 0.17.0 → 0.17.1
ocamlPackages.ppx_bin_prot: 0.17.0 → 0.17.1
ocamlPackages.ppx_deriving: 6.0.3 → 6.1.0
ocamlPackages.ppx_deriving_qcheck: 0.6 → 0.7
ocamlPackages.ppx_deriving_yaml: 0.3.0 → 0.4.1
ocamlPackages.ppx_deriving_yojson: 3.9.0 → 3.10.0
ocamlPackages.ppx_diff: 0.17.0 → 0.17.1
ocamlPackages.ppx_expect: 0.17.2 → 0.17.3
ocamlPackages.ppx_globalize: 0.17.0 → 0.17.2
ocamlPackages.ppx_inline_test: 0.17.0 → 0.17.1
ocamlPackages.ppx_let: 0.17.0 → 0.17.1
ocamlPackages.ppx_stable: 0.17.0 → 0.17.1
ocamlPackages.ppx_tydi: 0.17.0 → 0.17.1
ocamlPackages.ppx_typeprep_conv: 0.17.0 → 0.17.1
ocamlPackages.ppx_variants_conv: 0.17.0 → 0.17.1
ocamlPackages.sexp_conv: 0.17.0 → 0.17.1
ocamlPackages.sexp_message: 0.17.2 → 0.17.4
reason: 3.15.0 → 3.16.0

ocamlPackages.bisect_ppx: make compatible with ppxlib 0.36
ocamlPackages.config: make compatible with ppxlib 0.36
ocamlPackages.lwt_ppx: make compatible with ppxlib 0.36
ocamlPackages.melange: make compatible with ppxlib 0.36
ocamlPackages.ppx_bitstring: make compatible with ppxlib 0.36
ocamlPackages.ppx_repr: make compatible with ppxlib 0.36

ocamlPackages.bistro: mark as broken
ocamlPackages.dream-html: mark as broken
ocamlPackages.ocsigen-ppx-rpc: mark as broken
ocamlPackages.ppx_deriving_cmdliner: mark as broken
ocamlPackages.reason-react-ppx: mark as broken
parent df50c984

pkgs/development/compilers/reason/default.nix

+17 −2
Original line number Diff line number Diff line
@@ -14,15 +14,30 @@ 
  dune-build-info,

}:



let

  param =

    if lib.versionAtLeast ppxlib.version "0.36" then

      {

        version = "3.16.0";

        hash = "sha256-R7DkOn00jiqFBlirS+xaT7u5/U/z7IocGBZRFVjFNk4=";

      }

    else

      {

        version = "3.15.0";



        hash = "sha256-7D0gJfQ5Hw0riNIFPmJ6haoa3dnFEyDp5yxpDgX7ZqY=";

      };

in



buildDunePackage rec {

  pname = "reason";

  version = "3.15.0";

  inherit (param) version;



  minimalOCamlVersion = "4.11";



  src = fetchurl {

    url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz";

    hash = "sha256-7D0gJfQ5Hw0riNIFPmJ6haoa3dnFEyDp5yxpDgX7ZqY=";

    inherit (param) hash;

  };



  nativeBuildInputs = [

pkgs/development/ocaml-modules/bisect_ppx/default.nix

+7 −0
Original line number Diff line number Diff line 
{

  lib,

  fetchFromGitHub,

  fetchpatch,

  buildDunePackage,

  cmdliner,

  ppxlib,
@@ -17,6 +18,12 @@ buildDunePackage rec { 
    hash = "sha256-3qXobZLPivFDtls/3WNqDuAgWgO+tslJV47kjQPoi6o=";

  };



  # Ensure compatibility with ppxlib 0.36

  patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch {

    url = "https://github.com/aantron/bisect_ppx/commit/f35fdf4bdcb82c308d70f7c9c313a77777f54bdf.patch";

    hash = "sha256-hQMDU6zrHDV9JszGAj2p4bd9zlqqjc1TLU+cfMEgz9c=";

  });



  minimalOCamlVersion = "4.11";



  buildInputs = [

pkgs/development/ocaml-modules/bistro/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
  rresult,

  sexplib,

  tyxml,

  ppxlib,

}:



buildDunePackage rec {
@@ -47,5 +48,6 @@ buildDunePackage rec { 
    description = "Build and execute typed scientific workflows";

    maintainers = [ lib.maintainers.vbgl ];

    license = lib.licenses.gpl2;

    meta.broken = lib.versionAtLeast ppxlib.version "0.36";

  };

}

pkgs/development/ocaml-modules/bitstring/ppx.nix

+5 −1
Original line number Diff line number Diff line 
{

  lib,

  buildDunePackage,

  fetchpatch,

  ocaml,

  bitstring,

  ppxlib,
@@ -15,7 +16,10 @@ else 
    pname = "ppx_bitstring";

    inherit (bitstring) version src;



    duneVersion = "3";

    patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch {

      url = "https://github.com/xguerin/bitstring/commit/b42d4924cbb5ec5fd5309e6807852b63f456f35d.patch";

      hash = "sha256-wtpSnGOzIUTmB3LhyHGopecy7F/5SYFOwaR6eReV+6g=";

    });



    buildInputs = [

      bitstring

pkgs/development/ocaml-modules/config/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  buildDunePackage,

  fetchurl,

  fetchpatch,

  ppxlib,

  spices,

}:
@@ -15,6 +16,12 @@ buildDunePackage rec { 
    hash = "sha256-bcRCfLX2ro8vnQTJiX2aYGJC+eD26vkPynMYg817YFM=";

  };



  # Compatibility with ppxlib 0.36

  patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch {

    url = "https://github.com/ocaml-sys/config.ml/commit/89222d8088cc3c530eb0094d7ff8ec8a67da07d1.patch";

    hash = "sha256-/jNsUXoUrfza5BCpEo7XtEjKwQX3ofEq99v0+UBh7ss=";

  });



  propagatedBuildInputs = [

    ppxlib

    spices