Unverified Commit a3d07da4 authored by José Romildo Malaquias's avatar José Romildo Malaquias Committed by GitHub
Browse files

Merge pull request #195515 from romildo/upd.ppxlib 

ocamlPackages.ppxlib: 0.24.0 -> 0.28.0
parents 0cd29dfb d6c30bbf

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

+17 −3
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub, buildDunePackage, cmdliner, ppxlib }:

{ lib, fetchFromGitHub, fetchpatch, buildDunePackage, cmdliner, ppxlib }:



buildDunePackage rec {

  pname = "bisect_ppx";
@@ -11,8 +11,22 @@ buildDunePackage rec { 
    sha256 = "sha256-pOeeSxzUF1jXQjA71atSZALdgQ2NB9qpKo5iaDnPwhQ=";

  };



  minimumOCamlVersion = "4.08";

  useDune2 = true;

  patches = lib.optionals (lib.versionAtLeast ppxlib.version "0.26.0") [

    # Ppxlib >= 0.26.0 compatibility

    # remove when a new version is released

    (fetchpatch {

      name = "${pname}-${version}-ppxlib-0.26-compatibility.patch";

      url = "https://patch-diff.githubusercontent.com/raw/aantron/bisect_ppx/pull/400.patch";

      sha256 = "sha256-WAn6+d6pMUr79LVugOENuh9s0gbVEcTg0rxXMz1P3ak=";

    })

    (fetchpatch {

      name = "${pname}-${version}-ppxlib-0.28-compatibility.patch";

      url = "https://github.com/anmonteiro/bisect_ppx/commit/cc442a08e3a2e0e18deb48f3a696076ac0986728.patch";

      sha256 = "sha256-pPHhmtd81eWhQd4X0gfZNPYT75+EkurwivP7acfJbNc=";

    })

  ];



  minimalOCamlVersion = "4.08";



  buildInputs = [

    cmdliner

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

+3 −3
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@ 


buildDunePackage rec {

  pname = "gen_js_api";

  version = "1.0.9";

  version = "1.1.1";



  src = fetchFromGitHub {

    owner = "LexiFi";

    repo = pname;

    rev = "v${version}";

    sha256 = "1qx6if1avr484bl9x1h0cksdc6gqw5i4pwzdr27h46hppnnvi8y8";

    sha256 = "sha256-0FKKYPbSBza/Q6oZniq/UHi5zBjD/i7j5ds3ZDWkBTs=";

  };



  minimalOCamlVersion = "4.08";

  minimalOCamlVersion = "4.11";



  propagatedBuildInputs = [ ojs ppxlib ];

  checkInputs = [ js_of_ocaml-compiler nodejs ];

pkgs/development/ocaml-modules/gen_js_api/ojs.nix

+3 −0
Original line number Diff line number Diff line 
{ buildDunePackage

, gen_js_api

, js_of_ocaml-compiler

}:



buildDunePackage rec {
@@ -7,6 +8,8 @@ buildDunePackage rec { 


  inherit (gen_js_api) version src;



  propagatedBuildInputs = [ js_of_ocaml-compiler ];



  doCheck = false; # checks depend on gen_js_api, which is a cycle



  minimalOCamlVersion = "4.08";

pkgs/development/ocaml-modules/janestreet/0.14.nix

+1 −1
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ with self; 
    minimumOCamlVersion = "4.04.2";

    hash = "0dbri9d00ydi0dw1cavswnqdmhjaaz80vap29ns2lr6mhhlvyjmj";

    meta.description = "[@@deriving] plugin to generate S-expression conversion functions";

    propagatedBuildInputs = [ ppxlib sexplib0 base ];

    propagatedBuildInputs = [ (ppxlib.override { version = "0.24.0"; }) sexplib0 base ];

  };



  ppx_sexp_message = janePackage {

pkgs/development/ocaml-modules/janestreet/0.15.nix

+3 −2
Original line number Diff line number Diff line
@@ -740,8 +740,9 @@ with self; 


  ppx_sexp_conv = janePackage {

    pname = "ppx_sexp_conv";

    minimumOCamlVersion = "4.04.2";

    hash = "1fyf7hgxprn7pj58rmmrfpv938a0avpzvvk6wzihpmfm6whgbdm8";

    version = "0.15.1";

    minimalOCamlVersion = "4.08.0";

    hash = "sha256-NYknZHyDklr71hihM2pPFQ7uAKkuKO2DJkjtsF+xc5g=";

    meta.description = "[@@deriving] plugin to generate S-expression conversion functions";

    propagatedBuildInputs = [ ppxlib sexplib0 base ];

  };