diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2016-12-04 11:49:22 +0000 |
|---|---|---|
| committer | vbgl <vbgl@users.noreply.github.com> | 2016-12-12 03:18:48 +0000 |
| commit | 77050a83816e11f2af2cd2115c5cd1937caa8068 (patch) | |
| tree | 76fa7d6840e951453c1fd333c1ab34a3e8fd902d /pkgs/development/tools/ocaml/findlib | |
| parent | 76a791b61c6da0d57a8f32057b7a220f03aa30b9 (diff) | |
| download | nixpkgs-77050a83816e11f2af2cd2115c5cd1937caa8068.tar nixpkgs-77050a83816e11f2af2cd2115c5cd1937caa8068.tar.gz nixpkgs-77050a83816e11f2af2cd2115c5cd1937caa8068.tar.bz2 nixpkgs-77050a83816e11f2af2cd2115c5cd1937caa8068.tar.lz nixpkgs-77050a83816e11f2af2cd2115c5cd1937caa8068.tar.xz nixpkgs-77050a83816e11f2af2cd2115c5cd1937caa8068.tar.zst nixpkgs-77050a83816e11f2af2cd2115c5cd1937caa8068.zip | |
findlib: 1.6.1 -> 1.7.1
Diffstat (limited to 'pkgs/development/tools/ocaml/findlib')
| -rw-r--r-- | pkgs/development/tools/ocaml/findlib/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/findlib/install_topfind.patch | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 1391bc6eb8a..71da6dd6d32 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ocaml-findlib-${version}"; - version = "1.6.1"; + version = "1.7.1"; src = fetchurl { url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; - sha256 = "02abg1lsnwvjg3igdyb8qjgr5kv1nbwl4gaf8mdinzfii5p82721"; + sha256 = "1vsys5gpahi36nxv5yx29zhwn8b2d7sqqswza05vxy5bx5wrljsx"; }; buildInputs = [m4 ncurses ocaml]; diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch index 7c9f8e1a6cc..096330a31ae 100644 --- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch +++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch @@ -6,7 +6,7 @@ mkdir -p "$(prefix)$(OCAMLFIND_BIN)" - test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" + test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)" - files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ - cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" - f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ + files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib.a findlib.cmxs topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib_top.cmxa findlib_top.a findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ + cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" + f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ |