Merge pull request #17836 from vbgl/topkg_0.7.8

ocaml-uucd: 2.0.0 → 4.0.0
This commit is contained in:
Rok Garbas 2016-08-19 13:48:33 +02:00 committed by GitHub
commit ec918dac16
3 changed files with 40 additions and 5 deletions

View file

@ -0,0 +1,33 @@
{ stdenv, fetchurl, ocaml, findlib, result, opam }:
let ocaml-version = stdenv.lib.getVersion ocaml; in
stdenv.mkDerivation rec {
name = "ocaml${ocaml-version}-topkg-${version}";
version = "0.7.8";
src = fetchurl {
url = "http://erratique.ch/software/topkg/releases/topkg-${version}.tbz";
sha256 = "029lbmabczpmcgkj53mc20vmpcn3f7rf7xms4xf0nywswfzsash6";
};
nativeBuildInputs = [ opam ];
buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ result ];
unpackCmd = "tar xjf ${src}";
buildPhase = "ocaml -I ${findlib}/lib/ocaml/${ocaml-version}/site-lib/ pkg/pkg.ml build";
createFindlibDestdir = true;
installPhase = ''
opam-installer --script --prefix=$out topkg.install | sh
mv $out/lib/topkg $out/lib/ocaml/${ocaml-version}/site-lib/
'';
meta = {
homepage = http://erratique.ch/software/topkg;
license = stdenv.lib.licenses.isc;
maintainers = [ stdenv.lib.maintainers.vbgl ];
description = "A packager for distributing OCaml software";
inherit (ocaml.meta) platforms;
};
}

View file

@ -1,7 +1,7 @@
{stdenv, fetchurl, ocaml, findlib, opam, xmlm}:
{ stdenv, fetchurl, ocaml, findlib, opam, xmlm, topkg }:
let
pname = "uucd";
version = "2.0.0";
version = "4.0.0";
webpage = "http://erratique.ch/software/${pname}";
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
@ -11,16 +11,16 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${webpage}/releases/${pname}-${version}.tbz";
sha256 = "12lbrrdjwdxfa99pbg344dfkj51lr5d2ispcj7d7lwsqyxy6h57i";
sha256 = "11cjfwa4wjhsyvzq4wl9z44xi28n49drz8nbfpx754vyfzwj3yc6";
};
buildInputs = [ ocaml findlib opam xmlm ];
buildInputs = [ ocaml findlib opam topkg ];
createFindlibDestdir = true;
unpackCmd = "tar xjf $src";
buildPhase = "ocaml ./pkg/build.ml native=true native-dynlink=true";
inherit (topkg) buildPhase;
installPhase = ''
opam-installer --script --prefix=$out ${pname}.install > install.sh

View file

@ -5395,6 +5395,8 @@ in
stringext = callPackage ../development/ocaml-modules/stringext { };
topkg = callPackage ../development/ocaml-modules/topkg { };
tsdl = callPackage ../development/ocaml-modules/tsdl { };
twt = callPackage ../development/ocaml-modules/twt { };