From mboxrd@z Thu Jan 1 00:00:00 1970 From: Federico Beffa Subject: Re: [PATCH] gnu packages maxima: Update to 5.34.1 and fix dependencies Date: Fri, 26 Sep 2014 18:59:34 +0200 Message-ID: References: <8761gd5uno.fsf@gnu.org> <87eguzecq2.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a11c318586ce8a10503fad7ee Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXYrw-0003Cc-HA for guix-devel@gnu.org; Fri, 26 Sep 2014 12:59:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XXYru-00022v-HK for guix-devel@gnu.org; Fri, 26 Sep 2014 12:59:44 -0400 In-Reply-To: <87eguzecq2.fsf@gnu.org> 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: =?UTF-8?Q?Ludovic_Court=C3=A8s?= Cc: guix-devel@gnu.org --001a11c318586ce8a10503fad7ee Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Thu, Sep 25, 2014 at 9:12 PM, Ludovic Court=C3=A8s wrote: > 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 pro= file. > > 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 locatio= n >> >> * gnu/packages/maths.scm(maxima): Configure the default gnuplot path. Ma= ke 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 g= nuplot >> + ;; 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= =98let=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. > OK, makes sense. >> + (with-directory-excursion out >> + (mkdir-p "share/emacs") >> + (mkdir-p "share/doc") >> + (symlink >> + (string-append out "/share/maxima/" ,version "= /emacs/") >> + (string-append out "/share/emacs/site-lisp")) >> + (symlink > > The second =E2=80=98symlink=E2=80=99 call should be aligned with the firs= t 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-ini= t.lisp") >> + (lambda (in out) >> + (begin > > =E2=80=98begin=E2=80=99 is unnecessary here. > >> - (license license:gpl2))) >> + (license license:gpl2))) > > Whitespace change? yes. > > Could you send an updated patch? > > Thanks in advance, > Ludo=E2=80=99. Please find attached the updated patch. Regards, Fede --001a11c318586ce8a10503fad7ee Content-Type: text/x-patch; charset=US-ASCII; name="0001-maxima-Remove-Tcl-from-inputs-.-Add-post-install-pha.patch" Content-Disposition: attachment; filename="0001-maxima-Remove-Tcl-from-inputs-.-Add-post-install-pha.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_i0jrx3sr0 RnJvbSA5YmVhOTQwMjY3NTMxNGE5ZWQ1ZTc0YmMyMzkxOWRiNDIzNzk1NjYzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGZWRlcmljbyBCZWZmYSA8YmVmZmFAZmJlbmdpbmVlcmluZy5j aD4KRGF0ZTogVGh1LCAyNSBTZXAgMjAxNCAxNzowNDoxMyArMDIwMApTdWJqZWN0OiBbUEFUQ0hd IG1heGltYTogUmVtb3ZlIFRjbCBmcm9tICdpbnB1dHMnLiAgQWRkICdwb3N0LWluc3RhbGwnIHBo YXNlCgoqIGdudS9wYWNrYWdlcy9tYXRocy5zY20obWF4aW1hKTogUmVtb3ZlIFRjbCBmcm9tICdp bnB1dHMnLiAgQWRkCiAgJ3Bvc3QtaW5zdGFsbCcgcGhhc2UuCi0tLQogZ251L3BhY2thZ2VzL21h dGhzLnNjbSB8ICAgMzUgKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0KIDEgZmls ZSBjaGFuZ2VkLCAyOCBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L2dudS9wYWNrYWdlcy9tYXRocy5zY20gYi9nbnUvcGFja2FnZXMvbWF0aHMuc2NtCmluZGV4IGMx MWQxZWYuLmE0NmM5ZWYgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9tYXRocy5zY20KKysrIGIv Z251L3BhY2thZ2VzL21hdGhzLnNjbQpAQCAtODUwLDggKzg1MCw3IEBAIHRvIEJNUCwgSlBFRyBv ciBQTkcgaW1hZ2UgZm9ybWF0cy4iKQogICAgIChpbnB1dHMKICAgICAgYCgoImdjbCIgLGdjbCkK ICAgICAgICAoImdudXBsb3QiICxnbnVwbG90KSAgICAgICAgICAgICAgICAgICAgICAgO2ZvciBw bG90cwotICAgICAgICgidGNsIiAsdGNsKSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA7 VGNsL1RrIGlzIHVzZWQgYnkgJ3htYXhpbWEnCi0gICAgICAgKCJ0ayIgLHRrKSkpCisgICAgICAg KCJ0ayIgLHRrKSkpICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDtUY2wvVGsgaXMgdXNl ZCBieSAneG1heGltYScKICAgICAobmF0aXZlLWlucHV0cwogICAgICBgKCgidGV4aW5mbyIgLHRl eGluZm8pCiAgICAgICAgKCJwZXJsIiAscGVybCkpKQpAQCAtODY2LDE4ICs4NjUsNDAgQEAgdG8g Qk1QLCBKUEVHIG9yIFBORyBpbWFnZSBmb3JtYXRzLiIpCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIi9iaW4vd2lzaCIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobGV0ICgodiAs KHBhY2thZ2UtdmVyc2lvbiB0aykpKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0 cmluZy10YWtlIHYgKHN0cmluZy1pbmRleC1yaWdodCB2ICNcLikpKSkpCi0KICAgICAgICA7OyBC eSBkZWZhdWx0IE1heGltYSBhdHRlbXB0cyB0byB3cml0ZSB0ZW1wb3JhcnkgZmlsZXMgdG8KICAg ICAgICA7OyAnL3RtcC9uaXgtYnVpbGQtbWF4aW1hLTUuMzQuMScsIHdoaWNoIGRvZXNuJ3QgZXhp c3QuICBXb3JrIGFyb3VuZAogICAgICAgIDs7IHRoYXQuCiAgICAgICAgIzptYWtlLWZsYWdzIChs aXN0ICJUTVBESVI9L3RtcCIpCi0KICAgICAgICAjOnBoYXNlcyAoYWxpc3QtY29ucy1iZWZvcmUK ICAgICAgICAgICAgICAgICAgJ2NoZWNrICdwcmUtY2hlY2sKICAgICAgICAgICAgICAgICAgKGxh bWJkYSBfCiAgICAgICAgICAgICAgICAgICAgKGNobW9kICJzcmMvbWF4aW1hIiAjbzU1NSkpCi0g ICAgICAgICAgICAgICAgICVzdGFuZGFyZC1waGFzZXMpKSkKLQorICAgICAgICAgICAgICAgICA7 OyBNYWtlIHN1cmUgdGhlIGRvYyBhbmQgZW1hY3MgZmlsZXMgYXJlIGZvdW5kIGluIHRoZQorICAg ICAgICAgICAgICAgICA7OyBzdGFuZGFyZCBsb2NhdGlvbi4gIEFsc28gY29uZmlndXJlIG1heGlt YSB0byBmaW5kIGdudXBsb3QKKyAgICAgICAgICAgICAgICAgOzsgd2l0aG91dCBoYXZpbmcgaXQg b24gdGhlIFBBVEguCisgICAgICAgICAgICAgICAgIChhbGlzdC1jb25zLWFmdGVyCisgICAgICAg ICAgICAgICAgICAnaW5zdGFsbCAncG9zdC1pbnN0YWxsCisgICAgICAgICAgICAgICAgICAobGFt YmRhKiAoIzprZXkgb3V0cHV0cyBpbnB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQorICAgICAgICAg ICAgICAgICAgICAobGV0KiAoKGdudXBsb3QgKGFzc29jLXJlZiBpbnB1dHMgImdudXBsb3QiKSkK KyAgICAgICAgICAgICAgICAgICAgICAgICAgKG91dCAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIp KQorICAgICAgICAgICAgICAgICAgICAgICAgICAoZGF0YWRpciAoc3RyaW5nLWFwcGVuZCBvdXQg Ii9zaGFyZS9tYXhpbWEvIiAsdmVyc2lvbikpKQorICAgICAgICAgICAgICAgICAgICAgICh3aXRo LWRpcmVjdG9yeS1leGN1cnNpb24gb3V0CisgICAgICAgICAgICAgICAgICAgICAgICAobWtkaXIt cCAic2hhcmUvZW1hY3MiKQorICAgICAgICAgICAgICAgICAgICAgICAgKG1rZGlyLXAgInNoYXJl L2RvYyIpCisgICAgICAgICAgICAgICAgICAgICAgICAoc3ltbGluayAKKyAgICAgICAgICAgICAg ICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBkYXRhZGlyICIvZW1hY3MvIikKKyAgICAgICAgICAg ICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBvdXQgIi9zaGFyZS9lbWFjcy9zaXRlLWxpc3Ai KSkKKyAgICAgICAgICAgICAgICAgICAgICAgIChzeW1saW5rIAorICAgICAgICAgICAgICAgICAg ICAgICAgIChzdHJpbmctYXBwZW5kIGRhdGFkaXIgIi9kb2MvIikKKyAgICAgICAgICAgICAgICAg ICAgICAgICAoc3RyaW5nLWFwcGVuZCBvdXQgIi9zaGFyZS9kb2MvbWF4aW1hIikpCisgICAgICAg ICAgICAgICAgICAgICAgICAod2l0aC1hdG9taWMtZmlsZS1yZXBsYWNlbWVudAorICAgICAgICAg ICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIGRhdGFkaXIgIi9zaGFyZS9tYXhpbWEtaW5p dC5saXNwIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAobGFtYmRhIChpbiBvdXQpCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAoZm9ybWF0IG91dCAifmEgfnN+YX4lIgorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiKHNldGYgJGdudXBsb3RfY29tbWFuZCAiCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIGdudXBsb3QgIi9i aW4vZ251cGxvdCIpICIpIikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIChkdW1wLXBvcnQg aW4gb3V0KSkpKSkpCisgICAgICAgICAgICAgICAgICAlc3RhbmRhcmQtcGhhc2VzKSkpKQogICAg IChob21lLXBhZ2UgImh0dHA6Ly9tYXhpbWEuc291cmNlZm9yZ2UubmV0IikKICAgICAoc3lub3Bz aXMgIk51bWVyaWMgYW5kIHN5bWJvbGljIGV4cHJlc3Npb24gbWFuaXB1bGF0aW9uIikKICAgICAo ZGVzY3JpcHRpb24gIk1heGltYSBpcyBhIHN5c3RlbSBmb3IgdGhlIG1hbmlwdWxhdGlvbiBvZiBz eW1ib2xpYyBhbmQKQEAgLTg4OSw0ICs5MTAsNCBAQCBwb2ludCBudW1iZXJzIikKICAgICA7OyB2 ZXJzaW9uICh3aGljaCBpbXBsaWNpdGx5IG1lYW5zIGdwbDErKS4KICAgICA7OyBBdCBsZWFzdCBv bmUgZmlsZSAoc3JjL21heGltYS5hc2QpIHNheXMgInZlcnNpb24gMi4iCiAgICAgOzsgR1BMdjIg b25seSBpcyB0aGVyZWZvcmUgdGhlIHNtYWxsZXN0IHN1YnNldC4KLSAgICAobGljZW5zZSBsaWNl bnNlOmdwbDIpKSkgCisgICAgKGxpY2Vuc2UgbGljZW5zZTpncGwyKSkpCi0tIAoxLjcuMTAuNAoK --001a11c318586ce8a10503fad7ee--