From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Nieuwenhuizen Subject: Re: [PATCH] gnu: Add laby. Date: Fri, 12 Feb 2016 21:43:47 +0100 Message-ID: <878u2pbqwr.fsf@gnu.org> References: <87egcleiig.fsf@gnu.org> <87fux1y0vg.fsf@dustycloud.org> <20160211221839.73cf23b5@debian-netbook> <87k2madh1x.fsf@gnu.org> <20160212181333.GB8954@debian> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57854) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUKZL-00067T-C7 for guix-devel@gnu.org; Fri, 12 Feb 2016 15:44:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aUKZJ-0002Vz-NT for guix-devel@gnu.org; Fri, 12 Feb 2016 15:43:59 -0500 In-Reply-To: <20160212181333.GB8954@debian> (Andreas Enge's message of "Fri, 12 Feb 2016 19:13:33 +0100") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Andreas Enge Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain Andreas Enge writes: > At the top of the patch file, could you add a quick explanation where it comes > from and what it is needed for? Is it Guix specific, or an upstream > bug? Ah yes it is inpired by the Nix package, it is store-specific. Ocaml wants its "core" libraries all in the same prefix, store won't allow that. When I hit this, I wondered if we have a way to import/convert packages and or what Guix's policy is on that. Greetings, Jan --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-ocaml-findlib.patch Content-Transfer-Encoding: quoted-printable >From 3a1afac94d0c25556af7a17c6dbb2dde44948831 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 11 Feb 2016 18:53:07 +0100 Subject: [PATCH] gnu: Add ocaml-findlib. * gnu/packages/ocaml.scm (ocaml-findlib): New variable. * gnu/packages/patches/ocaml-findlib-make-install.patch: New file. * gnu-system.am (dist_patch_DATA): Register it. --- gnu-system.am | 1 + gnu/packages/ocaml.scm | 51 ++++++++++++++++++= ++++ .../patches/ocaml-findlib-make-install.patch | 20 +++++++++ 3 files changed, 72 insertions(+) create mode 100644 gnu/packages/patches/ocaml-findlib-make-install.patch diff --git a/gnu-system.am b/gnu-system.am index 3b5f241..0cd2ca3 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -624,6 +624,7 @@ dist_patch_DATA =3D \ gnu/packages/patches/nvi-assume-preserve-path.patch \ gnu/packages/patches/nvi-dbpagesize-binpower.patch \ gnu/packages/patches/nvi-db4.patch \ + gnu/packages/patches/ocaml-findlib-make-install.patch \ gnu/packages/patches/openexr-missing-samples.patch \ gnu/packages/patches/openimageio-boost-1.60.patch \ gnu/packages/patches/openjpeg-CVE-2015-6581.patch \ diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 434b9d8..759fdad 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4,6 +4,7 @@ ;;; Copyright =C2=A9 2015 Andreas Enge ;;; Copyright =C2=A9 2015 David Hashe ;;; Copyright =C2=A9 2016 Eric Bavier +;;; Copyright =C2=A9 2016 Jan Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,6 +43,7 @@ #:use-module (gnu packages lynx) #:use-module (gnu packages perl) #:use-module (gnu packages python) + #:use-module (gnu packages m4) #:use-module (gnu packages ncurses) #:use-module (gnu packages version-control) #:use-module (gnu packages curl)) @@ -619,3 +621,52 @@ a collection of files and directories to be stored on = different hosts brought up to date by propagating the changes in each replica to the other.") (license gpl3+))) + +(define-public ocaml-findlib + (package + (name "ocaml-findlib") + (version "1.6.1") + (source (origin + (method url-fetch) + (uri (string-append "http://download.camlcity.org/download/" + "findlib" "-" version ".tar.gz")) + (sha256 + (base32 + "02abg1lsnwvjg3igdyb8qjgr5kv1nbwl4gaf8mdinzfii5p82721")) + (patches + (list (search-patch "ocaml-findlib-make-install.patch"))))) + (build-system gnu-build-system) + (inputs + `(("camlp4" ,camlp4) + ("m4" ,m4) + ("ocaml" ,ocaml))) + (arguments + `(#:tests? #f ; no test suite + #:parallel-build? #f + #:make-flags (list "all" "opt") + #:phases (modify-phases %standard-phases + (replace + 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (system* + "./configure" + "-bindir" (string-append out "/bin") + "-config" (string-append out "/etc/ocamfind.conf") + "-mandir" (string-append out "/share/man") + "-sitelib" (string-append out "/lib/ocaml/site-lib= ") + "-with-toolbox"))))))) + (home-page "http://projects.camlcity.org/projects/findlib.html") + (synopsis "Management tool for OCaml libraries") + (description + "The \"findlib\" library provides a scheme to manage reusable software +components (packages), and includes tools that support this scheme. Packa= ges +are collections of OCaml modules for which metainformation can be stored. = The +packages are kept in the filesystem hierarchy, but with strict directory +structure. The library contains functions to look the directory up that +stores a package, to query metainformation about a package, and to retrieve +dependency information about multiple packages. There is also a tool that +allows the user to enter queries on the command-line. In order to simplify +compilation and linkage, there are new frontends of the various OCaml +compilers that can directly deal with packages.") + (license x11))) diff --git a/gnu/packages/patches/ocaml-findlib-make-install.patch b/gnu/pa= ckages/patches/ocaml-findlib-make-install.patch new file mode 100644 index 0000000..238f9ca --- /dev/null +++ b/gnu/packages/patches/ocaml-findlib-make-install.patch @@ -0,0 +1,20 @@ +Ocaml wants to install its "core" libraries in OCAML_CORE_STDLIB. That +does not work in a store-based distribution. + +A solution was already provided by Nix + + https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/tools/oc= aml/findlib/install_topfind.patch + +regenerated for Guix. + +--- 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_STDLI= B)" ++ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)" + files=3D`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi f= indlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_packa= ge_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_= top.cma findlib.cmxa findlib.a findlib.cmxs findlib_dynload.cma findlib_dyn= load.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.= cmi META` && \ + cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)" + f=3D"ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && = f=3D"ocamlfind_opt$(EXEC_SUFFIX)"; }; \ --=20 2.1.4 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable -- Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.nl --=-=-=--