mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
ocamlPackages.camomile: 1.0.2 → 2.0.0
This commit is contained in:
parent
ece37b8aa4
commit
b56f06f3e8
|
@ -1,34 +1,57 @@
|
|||
{ lib, fetchFromGitHub, buildDunePackage, ocaml, cppo }:
|
||||
{ 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"
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
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 = "camomile";
|
||||
rev = version;
|
||||
sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cppo ];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
ocaml configure.ml --share $out/share/camomile
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
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";
|
||||
version = "1.0.2";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yoriyuki";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "00i910qjv6bpk0nkafp5fg97isqas0bwjf7m6rz11rsxilpalzad";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cppo ];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
ocaml configure.ml --share $out/share/camomile
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
echo "version = \"${version}\"" >> $out/lib/ocaml/${ocaml.version}/site-lib/camomile/META
|
||||
'';
|
||||
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";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
|
@ -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/";
|
||||
|
|
|
@ -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 ];
|
||||
|
|
|
@ -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}";
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{ lib
|
||||
, fetchFromGitea
|
||||
, fetchpatch
|
||||
, ocamlPackages
|
||||
, soupault
|
||||
, testers
|
||||
|
@ -24,14 +23,6 @@ ocamlPackages.buildDunePackage {
|
|||
sha256 = "nwXyOwDUbkMnyHPrvCvmToyONdbg5kJm2mt5rWrB6HA=";
|
||||
};
|
||||
|
||||
patches = lib.lists.optional
|
||||
(lib.strings.versionAtLeast "2.0.0" ocamlPackages.camomile.version)
|
||||
(fetchpatch {
|
||||
name = "camomile-1_x";
|
||||
url = "https://files.baturin.org/software/soupault/soupault-4.7.0-camomile-1.x.patch";
|
||||
sha256 = "V7+OUjXqWtXwjUa35MlY9iyAlqOkst9Th7DgfDXkXZg=";
|
||||
});
|
||||
|
||||
buildInputs = with ocamlPackages; [
|
||||
base64
|
||||
camomile
|
||||
|
|
Loading…
Reference in a new issue