Unverified Commit bc2ae87f authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

Merge pull request #274372 from vbgl/ocaml-angstrom-0.16.0 

ocamlPackages.angstrom: 0.15.0 → 0.16.0
parents 9a9178ba 9ed75988

pkgs/development/ocaml-modules/angstrom-async/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ buildDunePackage rec { 


  inherit (angstrom) version src;



  duneVersion = "3";

  minimalOCamlVersion = "4.04.1";



  propagatedBuildInputs = [ angstrom async ];

pkgs/development/ocaml-modules/angstrom-lwt-unix/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ buildDunePackage rec { 


  inherit (angstrom) version src;



  duneVersion = "3";



  propagatedBuildInputs = [ angstrom lwt ];



  doCheck = true;

pkgs/development/ocaml-modules/angstrom-unix/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ buildDunePackage rec { 


  inherit (angstrom) version src;



  duneVersion = "3";



  propagatedBuildInputs = [ angstrom ];



  doCheck = true;

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

+4 −5
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, result, bigstringaf, ppx_let, gitUpdater }:

{ lib, fetchFromGitHub, buildDunePackage, ocaml, ocaml-syntax-shims, alcotest, bigstringaf, ppx_let, gitUpdater }:



buildDunePackage rec {

  pname = "angstrom";

  version = "0.15.0";

  duneVersion = "3";

  version = "0.16.0";



  minimalOCamlVersion = "4.04";
@@ -11,12 +10,12 @@ buildDunePackage rec { 
    owner  = "inhabitedtype";

    repo   = pname;

    rev    = version;

    sha256 = "1hmrkdcdlkwy7rxhngf3cv3sa61cznnd9p5lmqhx20664gx2ibrh";

    hash = "sha256-vilGto5ciyKzVJd72z4B+AvM1nf3x3O7DHXrK5SIajQ=";

  };



  checkInputs = [ alcotest ppx_let ];

  buildInputs = [ ocaml-syntax-shims ];

  propagatedBuildInputs = [ bigstringaf result ];

  propagatedBuildInputs = [ bigstringaf ];

  doCheck = lib.versionAtLeast ocaml.version "4.08";



  passthru.updateScript = gitUpdater { };

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

+2 −3
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub, fetchpatch, buildDunePackage

, angstrom, faraday, alcotest

, angstrom, faraday, result, alcotest

}:



buildDunePackage rec {

  pname = "httpaf";

  version = "0.7.1";



  duneVersion = "3";

  minimalOCamlVersion = "4.08";



  src = fetchFromGitHub {
@@ -17,7 +16,7 @@ buildDunePackage rec { 
  };



  checkInputs = [ alcotest ];

  propagatedBuildInputs = [ angstrom faraday ];

  propagatedBuildInputs = [ angstrom faraday result ];

  doCheck = true;



  meta = {