diff options
| author | Peter Simons <simons@cryp.to> | 2012-11-21 16:20:36 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-11-21 16:20:36 +0100 |
| commit | f67d5a9a39c658ba38ce4efd3968fb76ed97ac70 (patch) | |
| tree | fb0a753dab894f13519ea969ad7edcfc19e3b56f /pkgs/development/ocaml-modules/ounit/default.nix | |
| parent | 473ba2212d3b8cc16b5ffb2f5a6367425614357c (diff) | |
| parent | 9ada368ef842d5bc52d0db0b92ee0217cc213a83 (diff) | |
| download | nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.gz nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.bz2 nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.lz nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.xz nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.tar.zst nixlib-f67d5a9a39c658ba38ce4efd3968fb76ed97ac70.zip | |
Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:
pkgs/tools/misc/file/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/python-packages.nix
Diffstat (limited to 'pkgs/development/ocaml-modules/ounit/default.nix')
| -rw-r--r-- | pkgs/development/ocaml-modules/ounit/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index 8f21ba649bf7..533f1ec8d1cd 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation { - name = "ounit-1.1.0"; + name = "ounit-1.1.2"; src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/495/ounit-1.1.0.tar.gz; - sha256 = "12vybg9xlw5c8ip23p8cljfzhkdsm25482sf1yh46fcqq8p2jmqx"; + url = http://forge.ocamlcore.org/frs/download.php/886/ounit-1.1.2.tar.gz; + sha256 = "e6bc1b0cdbb5b5552d85bee653e23aafe20bb97fd7cd229c867d01ff999888e3"; }; buildInputs = [ocaml findlib]; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.xs4all.nl/~mmzeeman/ocaml/; description = "Unit test framework for OCaml"; - license = "MIT/X11"; + license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms; maintainers = [ stdenv.lib.maintainers.z77z |