Commit b56f06f3 authored by Vincent Laporte's avatar Vincent Laporte Committed by Vincent Laporte
Browse files

ocamlPackages.camomile: 1.0.2 → 2.0.0

parent ece37b8a

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

+45 −22
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub, buildDunePackage, ocaml, cppo }:



buildDunePackage rec {

  pname = "camomile";

  version = "1.0.2";



  useDune2 = true;

{ stdenv, lib, darwin, fetchFromGitHub, buildDunePackage, ocaml, cppo

, camlp-streams, dune-site

, version ? if lib.versionAtLeast ocaml.version "4.08" then "2.0.0" else "1.0.2"

}:



let params =

  {

    "1.0.2" = lib.throwIf (lib.versionAtLeast ocaml.version "5.0")

      "camomile 1 is not available for OCaml ${ocaml.version}" {

      src = fetchFromGitHub {

        owner = "yoriyuki";

    repo = pname;

        repo = "camomile";

        rev = version;

        sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad";

      };
@@ -25,10 +26,32 @@ buildDunePackage rec { 
        echo "version = \"${version}\"" >> $out/lib/ocaml/${ocaml.version}/site-lib/camomile/META

      '';



    };



    "2.0.0" = {

      src = fetchFromGitHub {

        owner = "ocaml-community";

        repo = "camomile";

        rev = "v${version}";

        hash = "sha256-HklX+VPD0Ta3Knv++dBT2rhsDSlDRH90k4Cj1YtWIa8=";

      };



      nativeBuildInputs = lib.optional stdenv.isDarwin darwin.sigtool;



      propagatedBuildInputs = [ camlp-streams dune-site ];

    };

  }

; in





buildDunePackage (params."${version}" // {

  pname = "camomile";

  inherit version;



  meta = {

    inherit (src.meta) homepage;

    homepage = "https://github.com/ocaml-community/Camomile";

    maintainers = [ lib.maintainers.vbgl ];

    license = lib.licenses.lgpl21;

    description = "A Unicode library for OCaml";

  };

}
 
})

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

+4 −2
Original line number Diff line number Diff line
@@ -3,13 +3,15 @@ 
buildDunePackage rec {

  pname = "charInfo_width";

  version = "1.1.0";

  duneVersion = "3";

  src = fetchzip {

    url = "https://bitbucket.org/zandoye/charinfo_width/get/${version}.tar.bz2";

    sha256 = "19mnq9a1yr16srqs8n6hddahr4f9d2gbpmld62pvlw1ps7nfrp9w";

  };



  propagatedBuildInputs = [ camomile result ];

  propagatedBuildInputs = [

    (camomile.override { version = "1.0.2"; })

    result

  ];



  meta = {

    homepage = "https://bitbucket.org/zandoye/charinfo_width/";

pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix

+4 −1
Original line number Diff line number Diff line
@@ -4,7 +4,10 @@ buildDunePackage { 
  pname = "gettext-camomile";

  inherit (ocaml_gettext) src version;



  propagatedBuildInputs = [ camomile ocaml_gettext ];

  propagatedBuildInputs = [

    (camomile.override { version = "1.0.2"; })

    ocaml_gettext

  ];



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

  checkInputs = [ ounit fileutils ];

pkgs/development/tools/headache/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ buildDunePackage rec { 
    sha256 = "sha256-BA7u09MKYMyspFX8AcAkDVA6UUG5DKAdbIDdt+b3Fc4=";

  };



  duneVersion = "3";



  propagatedBuildInputs = [ camomile ];

  propagatedBuildInputs = [

    (camomile.override { version = "1.0.2"; })

  ];



  meta = with lib; {

    homepage = "https://github.com/frama-c/${pname}";

pkgs/tools/audio/liquidsoap/full.nix

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ stdenv.mkDerivation { 
    ocamlPackages.mm

    ocamlPackages.ocaml_pcre

    ocamlPackages.menhir ocamlPackages.menhirLib

    ocamlPackages.camomile

    (ocamlPackages.camomile.override { version = "1.0.2"; })

    ocamlPackages.ocurl

    ocamlPackages.uri

    ocamlPackages.sedlex