diff options
Diffstat (limited to 'pkgs/development/ocaml-modules')
4 files changed, 11 insertions, 25 deletions
diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index a520f8196d8a..d59dbae45fe9 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -4,11 +4,10 @@ stdenv.mkDerivation { name = "ocaml-extlib-1.5.2"; src = fetchurl { - url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.2.tar.gz"; - sha256 = "ca6d69adeba4242ce41c02a23746ba1e464c0bbec66e2d16b02c3c6e85dc10aa"; + url = http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz; + sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021"; }; - patches = [ ./hashtable-ocaml4-compat.patch ]; buildInputs = [ocaml findlib]; createFindlibDestdir = true; @@ -19,9 +18,9 @@ stdenv.mkDerivation { ''; meta = { - homepage = "http://code.google.com/p/ocaml-extlib/"; + homepage = http://code.google.com/p/ocaml-extlib/; description = "Enhancements to the OCaml Standard Library modules"; - license = "LGPL"; + license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms; }; } diff --git a/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch b/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch deleted file mode 100644 index c587f2b6cd3b..000000000000 --- a/pkgs/development/ocaml-modules/extlib/hashtable-ocaml4-compat.patch +++ /dev/null @@ -1,12 +0,0 @@ -Revision 396 from the official extlib repository. - ---- extlib/extHashtbl.ml (revision 395) -+++ extlib/extHashtbl.ml (working copy) -@@ -32,6 +32,7 @@ - } - - include Hashtbl -+ let create n = Hashtbl.create (* no seed *) n - - external h_conv : ('a, 'b) t -> ('a, 'b) h_t = "%identity" - external h_make : ('a, 'b) h_t -> ('a, 'b) t = "%identity" \ No newline at end of file diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index e4dc43743f32..4d9e934b6283 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -2,15 +2,14 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "3.1"; in stdenv.mkDerivation { - name = "ocamlnet-${version}"; + name = "ocamlnet-3.6"; src = fetchurl { - url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz"; - sha256 = "0kdc2540ad84j6haj9jxlwryz9cb8q8kjdr48f2wgvcaii38v9f5"; + url = http://download.camlcity.org/download/ocamlnet-3.6.tar.gz; + sha256 = "306c20aee6512be3564c0f39872b70f929c06e1e893cfcf528ac47ae35cf7a69"; }; buildInputs = [ncurses ocaml findlib ocaml_pcre camlzip openssl ocaml_ssl]; 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 |