ocamlPackages.findlib: 1.8.0 -> 1.8.1

Also remove unused legacy version 1.7.3

authored by Vincent Laporte and committed by Vincent Laporte 0a477846 bf822dbd

+4 -20
+3 -19
pkgs/development/tools/ocaml/findlib/default.nix
··· 1 1 { stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: 2 2 3 - let param = 4 - if stdenv.lib.versionAtLeast ocaml.version "4" 5 - then { 6 - version = "1.8.0"; 7 - sha256 = "1b97zqjdriqd2ikgh4rmqajgxwdwn013riji5j53y3xvcmnpsyrb"; 8 - } else { 9 - version = "1.7.3"; 10 - sha256 = "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni"; 11 - patches = [ (fetchpatch { 12 - url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch"; 13 - sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3"; 14 - }) ]; 15 - }; 16 - in 17 - 18 3 stdenv.mkDerivation rec { 19 4 name = "ocaml-findlib-${version}"; 20 - inherit (param) version; 5 + version = "1.8.1"; 21 6 22 7 src = fetchurl { 23 8 url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; 24 - inherit (param) sha256; 9 + sha256 = "00s3sfb02pnjmkax25pcnljcnhcggiliccfz69a72ic7gsjwz1cf"; 25 10 }; 26 11 27 12 buildInputs = [m4 ncurses ocaml]; 28 13 29 - patches = [ ./ldconf.patch ./install_topfind.patch ] 30 - ++ (param.patches or []); 14 + patches = [ ./ldconf.patch ./install_topfind.patch ]; 31 15 32 16 dontAddPrefix=true; 33 17
+1 -1
pkgs/development/tools/ocaml/findlib/install_topfind.patch
··· 6 6 mkdir -p "$(prefix)$(OCAMLFIND_BIN)" 7 7 - test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)" 8 8 + test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)" 9 - files=`$(SH) $(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` && \ 9 + files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) 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$(LIB_SUFFIX) findlib_top.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload$(LIB_SUFFIX) findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \ 10 10 cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" 11 11 f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ 12 12