colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.findlib: 1.9.3 → 1.9.6

Browse Source
This commit is contained in:
Vincent Laporte 2022-10-13 07:57:18 +02:00 committed by Vincent Laporte
parent fd15a97ef6
commit f14d4f4df2
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/ocaml/findlib/default.nix
View File

@ -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 ];

13
pkgs/development/tools/ocaml/findlib/install_topfind.patch
View File

@ -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 \