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

ocamlPackages.{bheap,bigarray-compat,cairo2}: small cleaning (#463658)

parents 68a10589 492fb942

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

+8 −10
Original line number Diff line number Diff line
@@ -5,26 +5,24 @@ 
  stdlib-shims,

}:



buildDunePackage rec {

buildDunePackage (finalAttrs: {

  pname = "bheap";

  version = "2.0.0";



  src = fetchurl {

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

    sha256 = "0dpnpla20lgiicrxl2432m2fcr6y68msw3pnjxqb11xw6yrdfhsz";

    url = "https://github.com/backtracking/bheap/releases/download/${finalAttrs.version}/bheap-${finalAttrs.version}.tbz";

    hash = "sha256-X0PXsje8h7Bwl/YOrisy3mTmRBWDCNozi/FRIBS99jY=";

  };



  useDune2 = true;



  doCheck = true;

  checkInputs = [

    stdlib-shims

  ];



  meta = with lib; {

    description = "OCaml binary heap implementation by Jean-Christophe Filliatre";

    license = licenses.lgpl21Only;

    maintainers = [ maintainers.sternenseemann ];

  meta = {

    description = "OCaml binary heap implementation by Jean-Christophe Filliâtre";

    license = lib.licenses.lgpl21Only;

    maintainers = [ lib.maintainers.sternenseemann ];

    homepage = "https://github.com/backtracking/bheap";

  };

}
 
})

pkgs/development/ocaml-modules/bigarray-compat/default.nix

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

  lib,

  buildDunePackage,

  fetchFromGitHub,

  fetchurl,

}:



buildDunePackage rec {

buildDunePackage (finalAttrs: {

  pname = "bigarray-compat";

  version = "1.1.0";



  useDune2 = true;



  minimalOCamlVersion = "4.02";



  src = fetchFromGitHub {

    owner = "mirage";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-2JVopggK2JuXWEPu8qn12F1jQIJ9OV89XY1rHtUqLkI=";

  src = fetchurl {

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

    hash = "sha256-Q0RppI1chOgNYhsT2V6wZ/gTjBZQof1a5gCaGbk3GNU=";

  };



  meta = {

    description = "Compatibility library to use Stdlib.Bigarray when possible";

    inherit (src.meta) homepage;

    homepage = "https://github.com/mirage/bigarray-compat";

    license = lib.licenses.isc;

    maintainers = [ lib.maintainers.vbgl ];

  };

}
 
})

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

+7 −10
Original line number Diff line number Diff line
@@ -9,18 +9,15 @@ 
  cairo,

}:



buildDunePackage rec {

buildDunePackage (finalAttrs: {

  pname = "cairo2";

  version = "0.6.5";



  src = fetchurl {

    url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz";

    sha256 = "sha256-JdxByUNtmrz1bKrZoQWUT/c0YEG4zGoqZUq4hItlc3I=";

    url = "https://github.com/Chris00/ocaml-cairo/releases/download/${finalAttrs.version}/cairo2-${finalAttrs.version}.tbz";

    hash = "sha256-JdxByUNtmrz1bKrZoQWUT/c0YEG4zGoqZUq4hItlc3I=";

  };



  minimalOCamlVersion = "4.02";

  useDune2 = true;



  nativeBuildInputs = [ pkg-config ];

  buildInputs = [

    cairo
@@ -34,7 +31,7 @@ buildDunePackage rec { 
      || lib.versionAtLeast ocaml.version "4.10"

    );



  meta = with lib; {

  meta = {

    homepage = "https://github.com/Chris00/ocaml-cairo";

    description = "Binding to Cairo, a 2D Vector Graphics Library";

    longDescription = ''
@@ -43,10 +40,10 @@ buildDunePackage rec { 
      the X Window System, Quartz, Win32, image buffers, PostScript, PDF,

      and SVG file output.

    '';

    license = licenses.lgpl3;

    maintainers = with maintainers; [

    license = lib.licenses.lgpl3;

    maintainers = with lib.maintainers; [

      jirkamarsik

      vbgl

    ];

  };

}
 
})