diff options
| author | Marco Maggesi <maggesi@math.unifi.it> | 2014-01-29 17:52:53 +0100 |
|---|---|---|
| committer | Marco Maggesi <maggesi@math.unifi.it> | 2014-01-31 12:01:32 +0100 |
| commit | ec1b40be872c4a7ea06cfb354b6462bf75d72c96 (patch) | |
| tree | c11c4c19e23a6dc2af471c9c8c0da0eb13b27dfe /pkgs/development/ocaml-modules/batteries/default.nix | |
| parent | 841a02cabb06c1869ac772b2a2629574466d3cbe (diff) | |
| download | nixlib-ec1b40be872c4a7ea06cfb354b6462bf75d72c96.tar nixlib-ec1b40be872c4a7ea06cfb354b6462bf75d72c96.tar.gz nixlib-ec1b40be872c4a7ea06cfb354b6462bf75d72c96.tar.bz2 nixlib-ec1b40be872c4a7ea06cfb354b6462bf75d72c96.tar.lz nixlib-ec1b40be872c4a7ea06cfb354b6462bf75d72c96.tar.xz nixlib-ec1b40be872c4a7ea06cfb354b6462bf75d72c96.tar.zst nixlib-ec1b40be872c4a7ea06cfb354b6462bf75d72c96.zip | |
Update OCaml Batteries to version 2.2.0
Diffstat (limited to 'pkgs/development/ocaml-modules/batteries/default.nix')
| -rw-r--r-- | pkgs/development/ocaml-modules/batteries/default.nix | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 3ecf2ae46994..ac7b8adfd8ca 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,32 +1,18 @@ {stdenv, fetchurl, ocaml, findlib, camomile, ounit}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - stdenv.mkDerivation { - name = "ocaml-batteries-1.4.1"; + name = "ocaml-batteries-2.2.0"; src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/684/batteries-1.4.1.tar.gz; - sha256 = "bdca7deba290d83c66c0a5001da52b2d7f2af58b7b7e7d9303d4363aaafe9c30"; + url = http://forge.ocamlcore.org/frs/download.php/1363/batteries-2.2.tar.gz; + sha256 = "0z4wg357fzz7cnarjsrrdnpmxw8mxcj10fp67dm3bnn0l3zkjwbs"; }; buildInputs = [ocaml findlib camomile ounit]; - patchPhase = '' - substituteInPlace Makefile --replace '/bin/echo -n' echo - ''; - configurePhase = "true"; # Skip configure - preInstall = '' - mkdir -p "$out/lib/ocaml/${ocaml_version}/site-lib" - ''; - - doCheck = true; - - checkTarget = "test"; + createFindlibDestdir = true; meta = { homepage = http://batteries.forge.ocamlcore.org/; @@ -36,7 +22,7 @@ stdenv.mkDerivation { and comprehensive development platform for the OCaml programming language. ''; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z |