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

Merge pull request #324913 from SigmaSquadron/ocaml-xenstore 

ocamlPackages.xenstore: drop cstruct dependency
parents c82692df b952554a

maintainers/maintainer-list.nix

+8 −0
Original line number Diff line number Diff line
@@ -18488,6 +18488,14 @@ 
    githubId = 53050011;

    name = "Yohann Boniface";

  };

  sigmasquadron = {

    name = "Fernando Rodrigues";

    email = "alpha@sigmasquadron.net";

    matrix = "@sigmasquadron:matrix.org";

    github = "SigmaSquadron";

    githubId = 174749595;

    keys = [ { fingerprint = "E3CD E225 47C6 2DB6 6CCD  BC06 CC3A E2EA 0000 0000"; } ];

  };

  sikmir = {

    email = "sikmir@disroot.org";

    matrix = "@sikmir:matrix.org";

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

+16 −11
Original line number Diff line number Diff line 
{ lib, buildDunePackage, fetchurl

, cstruct, ppx_cstruct, lwt, ounit2

{

  lib,

  buildDunePackage,

  fetchFromGitHub,

  lwt,

  ounit2,

}:



buildDunePackage rec {

  pname = "xenstore";

  version = "2.3.0";



  minimalOCamlVersion = "4.08";

  duneVersion = "3";



  src = fetchurl {

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

    hash = "sha256-1jxrvLLTwpd2fYPAoPbdRs7P1OaR8c9cW2VURF7Bs/Q=";

  src = fetchFromGitHub {

    owner = "mirage";

    repo = "ocaml-xenstore";

    rev = "v${version}";

    hash = "sha256-LaynsbCE/+2QfbQCOLZi8nw1rqmZtgrwAov9cSxYZw8=";

  };



  buildInputs = [ ppx_cstruct ];

  propagatedBuildInputs = [ cstruct lwt ];

  propagatedBuildInputs = [ lwt ];



  doCheck = true;

  checkInputs = [ ounit2 ];
@@ -23,7 +25,10 @@ buildDunePackage rec { 
  meta = with lib; {

    description = "Xenstore protocol in pure OCaml";

    license = licenses.lgpl21Only;

    maintainers = [ maintainers.sternenseemann ];

    maintainers = with maintainers; [

      sternenseemann

      sigmasquadron

    ];

    homepage = "https://github.com/mirage/ocaml-xenstore";

  };

}