public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update OCaml Batteries to version 2.2.0

Browse Source
This commit is contained in:
Marco Maggesi 2014-01-29 17:52:53 +01:00
parent 841a02cabb
commit ec1b40be87
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/ocaml-modules/batteries/default.nix
View File

@ -1,32 +1,18 @@
{stdenv, fetchurl, ocaml, findlib, camomile, ounit}: {stdenv, fetchurl, ocaml, findlib, camomile, ounit}:
let
ocaml_version = (builtins.parseDrvName ocaml.name).version;
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ocaml-batteries-1.4.1"; name = "ocaml-batteries-2.2.0";
src = fetchurl { src = fetchurl {
url = http://forge.ocamlcore.org/frs/download.php/684/batteries-1.4.1.tar.gz; url = http://forge.ocamlcore.org/frs/download.php/1363/batteries-2.2.tar.gz;
sha256 = "bdca7deba290d83c66c0a5001da52b2d7f2af58b7b7e7d9303d4363aaafe9c30"; sha256 = "0z4wg357fzz7cnarjsrrdnpmxw8mxcj10fp67dm3bnn0l3zkjwbs";
}; };
buildInputs = [ocaml findlib camomile ounit]; buildInputs = [ocaml findlib camomile ounit];
patchPhase = ''
substituteInPlace Makefile --replace '/bin/echo -n' echo
'';
configurePhase = "true"; # Skip configure configurePhase = "true"; # Skip configure
preInstall = '' createFindlibDestdir = true;
mkdir -p "$out/lib/ocaml/${ocaml_version}/site-lib"
'';
doCheck = true;
checkTarget = "test";
meta = { meta = {
homepage = http://batteries.forge.ocamlcore.org/; homepage = http://batteries.forge.ocamlcore.org/;
@ -36,7 +22,7 @@ stdenv.mkDerivation {
and comprehensive development platform for the OCaml programming and comprehensive development platform for the OCaml programming
language. language.
''; '';
license = "LGPL"; license = stdenv.lib.licenses.lgpl21;
platforms = ocaml.meta.platforms; platforms = ocaml.meta.platforms;
maintainers = [ maintainers = [
stdenv.lib.maintainers.z77z stdenv.lib.maintainers.z77z

4
pkgs/top-level/all-packages.nix
View File

@ -2899,9 +2899,7 @@ let
mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; mlgmp = callPackage ../development/ocaml-modules/mlgmp { };
ocaml_batteries = callPackage ../development/ocaml-modules/batteries { ocaml_batteries = callPackage ../development/ocaml-modules/batteries { };
camomile = camomile_0_8_2;
};
ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { }; ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { };