MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ocamlPackages.camomile: 0.8.5 -> 0.8.6

Browse source
This commit is contained in:
Vincent Laporte 2017-10-19 21:09:20 +00:00
parent 5da5af56e1
commit 68ed8f685b
No known key found for this signature in database
GPG key ID: EBD582ADDDB1F81F
3 changed files with 53 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pkgs/development/ocaml-modules/camomile/0.8.5.nix Normal file
View file

@ -0,0 +1,30 @@
{stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}:
stdenv.mkDerivation rec {
name = "camomile-${version}";
version = "0.8.5";
src = fetchurl {
url = https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2;
sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045";
};
patches = [ (fetchpatch {
url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/camomile/camomile.0.8.5/files/4.05-typing-fix.patch;
sha256 = "167279lia6qx62mdcyc5rjsi4gf4yi52wn9mhgd9y1v3754z7fwb";
})];
buildInputs = [ocaml findlib camlp4];
createFindlibDestdir = true;
meta = {
homepage = https://github.com/yoriyuki/Camomile/tree/master/Camomile;
description = "A comprehensive Unicode library for OCaml";
license = stdenv.lib.licenses.lgpl21;
platforms = ocaml.meta.platforms or [];
maintainers = [
stdenv.lib.maintainers.z77z
];
};
}

41
pkgs/development/ocaml-modules/camomile/default.nix
View file

@ -1,30 +1,27 @@
{stdenv, fetchurl, fetchpatch, ocaml, findlib, camlp4}: { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, cppo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "camomile-${version}"; version = "0.8.6";
version = "0.8.5"; name = "ocaml${ocaml.version}-camomile-${version}";
src = fetchurl { src = fetchFromGitHub {
url = https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2; owner = "yoriyuki";
sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045"; repo = "camomile";
}; rev = "rel-${version}";
sha256 = "1jq1xhaikczk6lbvas7c35aa04q0kjaqd8m54c4jivpj80yvg4x9";
};
patches = [ (fetchpatch { buildInputs = [ ocaml findlib jbuilder cppo ];
url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/camomile/camomile.0.8.5/files/4.05-typing-fix.patch;
sha256 = "167279lia6qx62mdcyc5rjsi4gf4yi52wn9mhgd9y1v3754z7fwb";
})];
buildInputs = [ocaml findlib camlp4]; configurePhase = "ocaml configure.ml --share $out/share/camomile";
createFindlibDestdir = true; inherit (jbuilder) installPhase;
meta = { meta = {
homepage = https://github.com/yoriyuki/Camomile/tree/master/Camomile; inherit (ocaml.meta) platforms;
description = "A comprehensive Unicode library for OCaml"; inherit (src.meta) homepage;
license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.vbgl ];
platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.lgpl21;
maintainers = [ description = "A Unicode library for OCaml";
stdenv.lib.maintainers.z77z };
];
};
} }

5
pkgs/top-level/ocaml-packages.nix
View file

@ -98,7 +98,10 @@ let
camlzip = callPackage ../development/ocaml-modules/camlzip { }; camlzip = callPackage ../development/ocaml-modules/camlzip { };
camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { };
camomile = callPackage ../development/ocaml-modules/camomile { }; camomile =
if lib.versionOlder "4.03" ocaml.version
then callPackage ../development/ocaml-modules/camomile { }
else callPackage ../development/ocaml-modules/camomile/0.8.5.nix { };
camlimages_4_0 = camlimages_4_0 =
if lib.versionOlder "4.02" ocaml.version if lib.versionOlder "4.02" ocaml.version