diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2015-03-21 09:56:28 +0100 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2015-03-21 10:04:15 +0100 |
commit | 0f2509a52d652c9e1fe98c0673ca03572d5513ee (patch) | |
tree | ea6fc36de01bcae47b45013542e78d82667c1c74 /pkgs/development/ocaml-modules | |
parent | 4c8681fea1df607ded96b75a920f2c35b36f7a3b (diff) | |
download | nixlib-0f2509a52d652c9e1fe98c0673ca03572d5513ee.tar nixlib-0f2509a52d652c9e1fe98c0673ca03572d5513ee.tar.gz nixlib-0f2509a52d652c9e1fe98c0673ca03572d5513ee.tar.bz2 nixlib-0f2509a52d652c9e1fe98c0673ca03572d5513ee.tar.lz nixlib-0f2509a52d652c9e1fe98c0673ca03572d5513ee.tar.xz nixlib-0f2509a52d652c9e1fe98c0673ca03572d5513ee.tar.zst nixlib-0f2509a52d652c9e1fe98c0673ca03572d5513ee.zip |
ocaml-batteries: update from 2.2.0 to 2.3.1
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/batteries/default.nix | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index ac7b8adfd8ca..e83ea743263b 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,17 +1,22 @@ -{stdenv, fetchurl, ocaml, findlib, camomile, ounit}: +{ stdenv, fetchzip, ocaml, findlib, qtest }: + +let version = "2.3.1"; in stdenv.mkDerivation { - name = "ocaml-batteries-2.2.0"; + name = "ocaml-batteries-${version}"; - src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/1363/batteries-2.2.tar.gz; - sha256 = "0z4wg357fzz7cnarjsrrdnpmxw8mxcj10fp67dm3bnn0l3zkjwbs"; + src = fetchzip { + url = "https://github.com/ocaml-batteries-team/batteries-included/archive/v${version}.tar.gz"; + sha256 = "1hjbzczchqnnxbn4ck84j5pi6prgfjfjg14kg26fzqz3gql427rl"; }; - buildInputs = [ocaml findlib camomile ounit]; + buildInputs = [ ocaml findlib qtest ]; configurePhase = "true"; # Skip configure + doCheck = true; + checkTarget = "test test"; + createFindlibDestdir = true; meta = { @@ -22,7 +27,7 @@ stdenv.mkDerivation { and comprehensive development platform for the OCaml programming language. ''; - license = stdenv.lib.licenses.lgpl21; + license = stdenv.lib.licenses.lgpl21Plus; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z |