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

Merge pull request #223540 from vbgl/ocaml-cstruct-6.2.0 

ocamlPackages.cstruct: 6.1.1 → 6.2.0
parents 84dbdd4a cb68c76b

pkgs/development/ocaml-modules/asn1-combinators/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


buildDunePackage rec {

  minimalOCamlVersion = "4.08";

  duneVersion = "3";



  pname = "asn1-combinators";

  version = "0.2.6";

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

+4 −7
Original line number Diff line number Diff line 
{ lib

, buildDunePackage

, fetchurl

, ocaml



, alcotest

, eqaf

, fmt
@@ -14,17 +12,16 @@ buildDunePackage rec { 


  src = fetchurl {

    url = "https://github.com/oklm-wsh/Callipyge/releases/download/v${version}/${pname}-${version}.tbz";

    sha256 = "sha256-T/94a88xvK51TggjXecdKc9kyTE9aIyueIt5T24sZB0=";

    hash = "sha256-T/94a88xvK51TggjXecdKc9kyTE9aIyueIt5T24sZB0=";

  };



  useDune2 = true;

  duneVersion = "3";



  minimumOCamlVersion = "4.03";

  minimalOCamlVersion = "4.08";



  propagatedBuildInputs = [ fmt eqaf ];



  # alcotest isn't available for OCaml < 4.08 due to fmt

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

  doCheck = true;

  checkInputs = [ alcotest ];



  meta = {

pkgs/development/ocaml-modules/cstruct/async.nix

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ buildDunePackage rec { 
  pname = "cstruct-async";

  inherit (cstruct) src version meta;



  duneVersion = "3";



  propagatedBuildInputs = [

    async_unix

    async

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

+3 −2
Original line number Diff line number Diff line
@@ -2,13 +2,14 @@ 


buildDunePackage rec {

  pname = "cstruct";

  version = "6.1.1";

  version = "6.2.0";



  minimalOCamlVersion = "4.08";

  duneVersion = "3";



  src = fetchurl {

    url = "https://github.com/mirage/ocaml-cstruct/releases/download/v${version}/cstruct-${version}.tbz";

    sha256 = "sha256-G3T5hw9qfuYAiSRZBxbdUzpyijyhC7GNqf6ovkZ/UY0=";

    hash = "sha256-mngHM5JYDoNJFI+jq0sbLpidydMNB0AbBMlrfGDwPmI=";

  };



  buildInputs = [ fmt ];

pkgs/development/ocaml-modules/cstruct/lwt.nix

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ else 
    inherit (cstruct) version src meta;



    minimalOCamlVersion = "4.08";

    duneVersion = "3";



    propagatedBuildInputs = [ cstruct lwt ];

  }