diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2022-10-13 07:57:18 +0200 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2022-10-20 17:35:46 +0200 |
| commit | f14d4f4df26e3fed9ec9b012116fc81e95165410 (patch) | |
| tree | 2d1dc588870f2910865efe03d7ed797b6127886c /pkgs/development/tools/ocaml | |
| parent | fd15a97ef6254675c143b184f77f4ad934e7e3be (diff) | |
| download | nixpkgs-f14d4f4df26e3fed9ec9b012116fc81e95165410.tar nixpkgs-f14d4f4df26e3fed9ec9b012116fc81e95165410.tar.gz nixpkgs-f14d4f4df26e3fed9ec9b012116fc81e95165410.tar.bz2 nixpkgs-f14d4f4df26e3fed9ec9b012116fc81e95165410.tar.lz nixpkgs-f14d4f4df26e3fed9ec9b012116fc81e95165410.tar.xz nixpkgs-f14d4f4df26e3fed9ec9b012116fc81e95165410.tar.zst nixpkgs-f14d4f4df26e3fed9ec9b012116fc81e95165410.zip | |
ocamlPackages.findlib: 1.9.3 → 1.9.6
Diffstat (limited to 'pkgs/development/tools/ocaml')
| -rw-r--r-- | pkgs/development/tools/ocaml/findlib/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/tools/ocaml/findlib/install_topfind.patch | 13 |
2 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 5a9b08e20d0..51df81cea5e 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }: +{ lib, stdenv, fetchurl, ncurses, ocaml, writeText }: stdenv.mkDerivation rec { - pname = "ocaml-findlib"; - version = "1.9.3"; + pname = "ocaml${ocaml.version}-findlib"; + version = "1.9.6"; src = fetchurl { url = "http://download.camlcity.org/download/findlib-${version}.tar.gz"; - sha256 = "sha256:0hfcwamcvinmww59b5i4yxbf0kxyzkp5qv3d1c7ybn9q52vgq463"; + sha256 = "sha256-LfmWJ5rha2Bttf9Yefk9v63giY258aPoL3+EX6opMKI="; }; - nativeBuildInputs = [m4 ocaml]; - buildInputs = [ ncurses ]; + nativeBuildInputs = [ ocaml ]; + buildInputs = lib.optional (lib.versionOlder ocaml.version "4.07") ncurses; patches = [ ./ldconf.patch ./install_topfind.patch ]; diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch index e961b305906..c8bb6f8f7a3 100644 --- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch +++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch @@ -1,12 +1,13 @@ --- a/src/findlib/Makefile +++ b/src/findlib/Makefile -@@ -123,7 +123,7 @@ clean: +@@ -123,8 +123,8 @@ 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)" + $(INSTALLDIR) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)" + $(INSTALLDIR) "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)" +- test $(INSTALL_TOPFIND) -eq 0 || $(INSTALLDIR) "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)" +- test $(INSTALL_TOPFIND) -eq 0 || $(INSTALLFILE) topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)/" ++ test $(INSTALL_TOPFIND) -eq 0 || $(INSTALLDIR) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)" ++ test $(INSTALL_TOPFIND) -eq 0 || $(INSTALLFILE) topfind "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/" files=`$(SH) $(TOP)/tools/collect_files $(TOP)/Makefile.config \ findlib.cmi findlib.mli findlib.cma findlib.cmxa findlib$(LIB_SUFFIX) findlib.cmxs \ findlib_config.cmi findlib_config.ml topfind.cmi topfind.mli \ - |