diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-16 15:16:50 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-16 15:16:50 +0200 |
| commit | 09dc132e04c8a69581becb56a1c5e1bfee3aef7e (patch) | |
| tree | 186745725ff42ea953572f38eaca71161fee9406 /pkgs/development/tools/ocaml/findlib | |
| parent | 3c6efec2c09e9389eb973ec5e45cb8e04b35f8aa (diff) | |
| parent | e39bf7a7043a466761754c423b3d5783a320a6ce (diff) | |
| download | nixpkgs-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar nixpkgs-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.gz nixpkgs-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.bz2 nixpkgs-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.lz nixpkgs-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.xz nixpkgs-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.tar.zst nixpkgs-09dc132e04c8a69581becb56a1c5e1bfee3aef7e.zip | |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/development/libraries/poppler/default.nix
Diffstat (limited to 'pkgs/development/tools/ocaml/findlib')
| -rw-r--r-- | pkgs/development/tools/ocaml/findlib/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/findlib/install_topfind.patch | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index cfbabad72cc..a9673be26ee 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation { - name = "ocaml-findlib-1.4.1"; + name = "ocaml-findlib-1.5.3"; src = fetchurl { - url = http://download.camlcity.org/download/findlib-1.4.1.tar.gz; - sha256 = "0cdbr716r5686zvf86b9zm5ikdz0dw727m67b1f4rjjisp5v2zyf"; + url = http://download.camlcity.org/download/findlib-1.5.3.tar.gz; + sha256 = "1kw2siv4pc8q060m9xpgxvjs07ic1kiphyxmkwcz6nyb91p8286r"; }; 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 4729885bcef..f152feaaecf 100644 --- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch +++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch @@ -1,12 +1,11 @@ ---- findlib-1.3.3/src/findlib/Makefile -+++ findlib-1.3.3/src/findlib/Makefile -@@ -82,7 +82,7 @@ clean: +--- 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 @@ 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 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 META` && \ cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ - |