From mboxrd@z Thu Jan 1 00:00:00 1970 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: [PATCH] gnu packages maxima: Update to 5.34.1 and fix dependencies Date: Thu, 25 Sep 2014 21:12:21 +0200 Message-ID: <87eguzecq2.fsf@gnu.org> References: <8761gd5uno.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44661) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXESt-0007F7-HO for guix-devel@gnu.org; Thu, 25 Sep 2014 15:12:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XXESo-000207-Rp for guix-devel@gnu.org; Thu, 25 Sep 2014 15:12:31 -0400 Received: from hera.aquilenet.fr ([2a01:474::1]:36430) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXESo-0001yE-DJ for guix-devel@gnu.org; Thu, 25 Sep 2014 15:12:26 -0400 In-Reply-To: (Federico Beffa's message of "Thu, 25 Sep 2014 19:01:26 +0200") 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: Federico Beffa Cc: guix-devel@gnu.org Federico Beffa skribis: > I've found that the doc and emacs ".el" files were not installed in > the right place. Also > I've worked out how to set the full gnuplot path in the default > startup configuration file. > Now plotting works without the user having to install gnuplot in his prof= ile. Nice. > From ab8a0e9f8f50370b4e9e7ca63d8bef1408a05da6 Mon Sep 17 00:00:00 2001 > From: Federico Beffa > Date: Thu, 25 Sep 2014 17:04:13 +0200 > Subject: [PATCH] maxima: Fix default gnuplot path, doc and emacs location > > * gnu/packages/maths.scm(maxima): Configure the default gnuplot path. Mak= e doc and > emacs files reachable from their expected standard location. Should be something like: * gnu/packages/maths.scm (maxima): Remove Tcl from 'inputs'. Add 'post-install' phase. The idea is that it=E2=80=99s just a =E2=80=9Cconceptual undo list=E2=80=9D= , as the GCS calls it. > + ;; Make sure the doc and emacs files are found in the > + ;; standard location. Also configure maxima to find gn= uplot > + ;; without having it on the PATH. > + (alist-cons-after > + 'install 'post-install > + (lambda* (#:key outputs inputs #:allow-other-keys) > + (let ((gnuplot (assoc-ref inputs "gnuplot")) > + (out (assoc-ref outputs "out"))) Since $out/share/maxima/$version is used a lot, please change the =E2=80=98= let=E2=80=99 to: (let* ((gnuplot (assoc-ref inputs "gnuplot")) (out (assoc-ref outputs "out")) (datadir (string-append out "/share/maxima/" ,version))) and then use =E2=80=98datadir=E2=80=99. > + (with-directory-excursion out > + (mkdir-p "share/emacs") > + (mkdir-p "share/doc") > + (symlink=20 > + (string-append out "/share/maxima/" ,version "/= emacs/") > + (string-append out "/share/emacs/site-lisp")) > + (symlink=20 The second =E2=80=98symlink=E2=80=99 call should be aligned with the first = one. > + (string-append out "/share/maxima/" ,version "= /doc/") > + (string-append out "/share/doc/maxima")) > + (with-atomic-file-replacement > + (string-append out "/share/maxima/" > + ,version "/share/maxima-init= .lisp") > + (lambda (in out) > + (begin =E2=80=98begin=E2=80=99 is unnecessary here. > - (license license:gpl2)))=20 > + (license license:gpl2))) Whitespace change? Could you send an updated patch? Thanks in advance, Ludo=E2=80=99.