diff options
| author | Théophane Hufschmitt <theophane.hufschmitt@polytechnique.org> | 2016-02-01 08:59:13 +0100 |
|---|---|---|
| committer | Théophane Hufschmitt <theophane.hufschmitt@polytechnique.org> | 2016-02-01 09:12:40 +0100 |
| commit | 5b28d3f1eb37cb64441b183802f031b020553ca0 (patch) | |
| tree | a32dcb334387eb331a3b4e1497913757db3ad74d /pkgs/development/tools | |
| parent | 576746970e8fe9232bd34a446321ec7f42c3eb9d (diff) | |
| download | nixlib-5b28d3f1eb37cb64441b183802f031b020553ca0.tar nixlib-5b28d3f1eb37cb64441b183802f031b020553ca0.tar.gz nixlib-5b28d3f1eb37cb64441b183802f031b020553ca0.tar.bz2 nixlib-5b28d3f1eb37cb64441b183802f031b020553ca0.tar.lz nixlib-5b28d3f1eb37cb64441b183802f031b020553ca0.tar.xz nixlib-5b28d3f1eb37cb64441b183802f031b020553ca0.tar.zst nixlib-5b28d3f1eb37cb64441b183802f031b020553ca0.zip | |
ocamlPackages.findlib: 1.5.3 -> 1.6.1
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/ocaml/findlib/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/findlib/install_topfind.patch | 9 |
2 files changed, 12 insertions, 8 deletions
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index a9673be26ee3..746be6dd0812 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -4,12 +4,13 @@ let ocaml_version = (builtins.parseDrvName ocaml.name).version; in -stdenv.mkDerivation { - name = "ocaml-findlib-1.5.3"; +stdenv.mkDerivation rec { + name = "ocaml-findlib-${version}"; + version = "1.6.1"; src = fetchurl { - url = http://download.camlcity.org/download/findlib-1.5.3.tar.gz; - sha256 = "1kw2siv4pc8q060m9xpgxvjs07ic1kiphyxmkwcz6nyb91p8286r"; + url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; + sha256 = "02abg1lsnwvjg3igdyb8qjgr5kv1nbwl4gaf8mdinzfii5p82721"; }; buildInputs = [m4 ncurses ocaml]; @@ -57,3 +58,5 @@ stdenv.mkDerivation { ]; }; } + + diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch index f152feaaecfb..7c9f8e1a6cce 100644 --- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch +++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch @@ -1,11 +1,12 @@ ---- findlib-1.5.3/src/findlib/Makefile 2014-09-16 13:21:46.000000000 +0200 -+++ findlib-1.5.3/src/findlib/Makefile.new 2014-10-01 14:30:54.141082521 +0200 -@@ -89,7 +89,7 @@ +--- a/src/findlib/Makefile ++++ b/src/findlib/Makefile +@@ -114,7 +114,7 @@ clean: install: all mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)" 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 META` && \ + 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)"; }; \ + |