diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2019-07-31 07:18:25 +0000 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2019-08-07 12:26:34 +0000 |
| commit | 0a477846af2837752687ced588b71108ff010bb2 (patch) | |
| tree | edd6a7d62bc977c28e5c2522037fb206566b6e3d /pkgs/development/tools/ocaml/findlib | |
| parent | bf822dbd1a48b6dd34ae6478b2eaaf7cda1c63fa (diff) | |
| download | nixpkgs-0a477846af2837752687ced588b71108ff010bb2.tar nixpkgs-0a477846af2837752687ced588b71108ff010bb2.tar.gz nixpkgs-0a477846af2837752687ced588b71108ff010bb2.tar.bz2 nixpkgs-0a477846af2837752687ced588b71108ff010bb2.tar.lz nixpkgs-0a477846af2837752687ced588b71108ff010bb2.tar.xz nixpkgs-0a477846af2837752687ced588b71108ff010bb2.tar.zst nixpkgs-0a477846af2837752687ced588b71108ff010bb2.zip | |
ocamlPackages.findlib: 1.8.0 -> 1.8.1
Also remove unused legacy version 1.7.3
Diffstat (limited to 'pkgs/development/tools/ocaml/findlib')
| -rw-r--r-- | pkgs/development/tools/ocaml/findlib/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/findlib/install_topfind.patch | 2 |
2 files changed, 4 insertions, 20 deletions
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 18b84e2c961..91870a570b0 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -1,33 +1,17 @@ { stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: -let param = - if stdenv.lib.versionAtLeast ocaml.version "4" - then { - version = "1.8.0"; - sha256 = "1b97zqjdriqd2ikgh4rmqajgxwdwn013riji5j53y3xvcmnpsyrb"; - } else { - version = "1.7.3"; - sha256 = "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni"; - patches = [ (fetchpatch { - url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch"; - sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3"; - }) ]; - }; -in - stdenv.mkDerivation rec { name = "ocaml-findlib-${version}"; - inherit (param) version; + version = "1.8.1"; src = fetchurl { url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; - inherit (param) sha256; + sha256 = "00s3sfb02pnjmkax25pcnljcnhcggiliccfz69a72ic7gsjwz1cf"; }; buildInputs = [m4 ncurses ocaml]; - patches = [ ./ldconf.patch ./install_topfind.patch ] - ++ (param.patches or []); + patches = [ ./ldconf.patch ./install_topfind.patch ]; dontAddPrefix=true; diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch index 7cd32991d0e..dbdb0edd6cb 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=`$(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` && \ + 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` && \ cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \ |