BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #26195 from romildo/upd.ocp-indent

Browse source 
cmdliner: 0.9.8 -> 1.0.0, ocp-indent: 1.5.2 -> 1.6.0
This commit is contained in:
Jörg Thalheim 2017-05-28 23:31:40 +01:00 committed by GitHub
commit 868529b2ce
2 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/development/ocaml-modules/cmdliner/default.nix
View file

@ -1,31 +1,34 @@
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: { stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, result }:
let let
pname = "cmdliner"; pname = "cmdliner";
in in
assert stdenv.lib.versionAtLeast ocaml.version "3.12"; assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ocaml-${pname}-${version}"; name = "ocaml-${pname}-${version}";
version = "0.9.8"; version = "1.0.0";
src = fetchurl { src = fetchurl {
url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
sha256 = "0hdxlkgiwjml9dpaa80282a8350if7mc1m6yz2mrd7gci3fszykx"; sha256 = "1ryn7qis0izg0wcal8zdlikzzl689l75y6f4zc6blrm93y5agy9x";
}; };
unpackCmd = "tar xjf $src"; unpackCmd = "tar xjf $src";
buildInputs = [ ocaml findlib ocamlbuild opam ];
nativeBuildInputs = [ ocamlbuild opam topkg ];
buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ result ];
createFindlibDestdir = true; createFindlibDestdir = true;
configurePhase = "ocaml pkg/git.ml"; buildPhase = ''
buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib pkg/pkg.ml build
installPhase = '' '';
opam-installer --script --prefix=$out ${pname}.install > install.sh
sh install.sh installPhase = ''
opam-installer --script --prefix=$out | sh
ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
''; '';
@ -33,7 +36,7 @@ stdenv.mkDerivation rec {
homepage = http://erratique.ch/software/cmdliner; homepage = http://erratique.ch/software/cmdliner;
description = "An OCaml module for the declarative definition of command line interfaces"; description = "An OCaml module for the declarative definition of command line interfaces";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.vbgl ];
platforms = ocaml.meta.platforms or []; platforms = ocaml.meta.platforms or [];
maintainers = [ maintainers.vbgl ];
}; };
} }

13
pkgs/development/tools/ocaml/ocp-indent/default.nix
View file

@ -3,18 +3,21 @@
let inherit (stdenv.lib) getVersion versionAtLeast; in let inherit (stdenv.lib) getVersion versionAtLeast; in
assert versionAtLeast (getVersion ocaml) "3.12.1"; assert versionAtLeast (getVersion ocaml) "3.12.1";
assert versionAtLeast (getVersion cmdliner) "1.0.0";
assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta"; assert versionAtLeast (getVersion ocpBuild) "1.99.6-beta";
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "ocp-indent-1.5.2"; name = "ocp-indent-${version}";
version = "1.6.0";
src = fetchzip { src = fetchzip {
url = "https://github.com/OCamlPro/ocp-indent/archive/1.5.2.tar.gz"; url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz";
sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz"; sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f";
}; };
buildInputs = [ ocaml findlib ocpBuild opam cmdliner ]; nativeBuildInputs = [ ocpBuild opam ];
buildInputs = [ ocaml findlib cmdliner ];
createFindlibDestdir = true; createFindlibDestdir = true;