From mboxrd@z Thu Jan 1 00:00:00 1970 From: Federico Beffa Subject: Re: [PATCH 1/2] gnu: Add numpy Date: Thu, 30 Oct 2014 18:03:51 +0100 Message-ID: References: <87sii6h6fl.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=90e6ba6e8d64619c170506a6dd43 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50178) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkEGu-00054d-45 for guix-devel@gnu.org; Fri, 31 Oct 2014 11:39:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xjt8a-0002ms-U0 for guix-devel@gnu.org; Thu, 30 Oct 2014 13:03:57 -0400 In-Reply-To: <87sii6h6fl.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 --90e6ba6e8d64619c170506a6dd43 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Wed, Oct 29, 2014 at 11:11 PM, Ludovic Court=C3=A8s wrote= : >> +(define python2-numpy-reference python-numpy-reference) >> + >> +(define python2-numpy-userguide python-numpy-userguide) > > These variables are unused and not needed, so they can be removed. Ah, you are right. I thought that 'package-with-python2' would change all input prefixes from 'python' to 'python2'. Please note that this patch will NOT build until the 'python-wrapper' will be applied (but I tested it again with my previous 'python-wrapper' patch). It is my understanding that Andreas will look into the 'python-wrapper' patch at a suitable time. Regards, Fede --90e6ba6e8d64619c170506a6dd43 Content-Type: text/x-patch; charset=US-ASCII; name="0001-gnu-Add-numpy.patch" Content-Disposition: attachment; filename="0001-gnu-Add-numpy.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_i1wd0jmf0 RnJvbSBjYWIxNmEzNjBiZjQ3OGFlZjZmZWRhOGIxOTc3ZDQzMThmODdlZWVjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGZWRlcmljbyBCZWZmYSA8YmVmZmFAZmJlbmdpbmVlcmluZy5j aD4KRGF0ZTogVGh1LCAzMCBPY3QgMjAxNCAxNzoxMDozNSArMDEwMApTdWJqZWN0OiBbUEFUQ0hd IGdudTogQWRkIG51bXB5LgoKKiBnbnUvcGFja2FnZXMvcHl0aG9uLnNjbSAocHl0aG9uLW51bXB5 LCBweXRob24yLW51bXB5KTogTmV3IHZhcmlhYmxlcy4KLS0tCiBnbnUvcGFja2FnZXMvcHl0aG9u LnNjbSB8IDg4ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysKIDEgZmlsZSBjaGFuZ2VkLCA4OCBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvZ251L3Bh Y2thZ2VzL3B5dGhvbi5zY20gYi9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbQppbmRleCBjMzRiZGMz Li4wZTJmNTY3IDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbQorKysgYi9nbnUv cGFja2FnZXMvcHl0aG9uLnNjbQpAQCAtMTgzMiwzICsxODMyLDkxIEBAIHNvdXJjZXMuIikKIAog KGRlZmluZS1wdWJsaWMgcHl0aG9uMi1zcGhpbngKICAgKHBhY2thZ2Utd2l0aC1weXRob24yIHB5 dGhvbi1zcGhpbngpKQorCisoZGVmaW5lIHB5dGhvbi1udW1weS1yZWZlcmVuY2UKKyAgKG9yaWdp bgorICAgIChtZXRob2QgdXJsLWZldGNoKQorICAgICh1cmkgKHN0cmluZy1hcHBlbmQgIm1pcnJv cjovL3NvdXJjZWZvcmdlL251bXB5L3JlZmVyZW5jZS5wZGYiKSkKKyAgICAoc2hhMjU2IAorICAg ICAoYmFzZTMyCisgICAgICAiMGl6c216YXpoZDA0MnJhNnA3YXMyamh3eDg3MTNzYzVncG45czVu aWZ3bTY4Yml3bjBscCIpKSkpCisKKyhkZWZpbmUgcHl0aG9uLW51bXB5LXVzZXJndWlkZQorICAo b3JpZ2luCisgICAgKG1ldGhvZCB1cmwtZmV0Y2gpCisgICAgKHVyaSAoc3RyaW5nLWFwcGVuZCAi bWlycm9yOi8vc291cmNlZm9yZ2UvbnVtcHkvdXNlcmd1aWRlLnBkZiIpKQorICAgIChzaGEyNTYg CisgICAgIChiYXNlMzIKKyAgICAgICIxejJ4amx4bGR2MDFhZDI3NzVrOWJpcmcxaGtxYXk1d2Jp NXZtZ3ozcmxyNmRjenZrNzdrIikpKSkKKworKGRlZmluZS1wdWJsaWMgcHl0aG9uLW51bXB5Cisg IChwYWNrYWdlCisgICAgKG5hbWUgInB5dGhvbi1udW1weSIpCisgICAgKHZlcnNpb24gIjEuOS4w IikKKyAgICAoc291cmNlCisgICAgIChvcmlnaW4KKyAgICAgICAobWV0aG9kIHVybC1mZXRjaCkK KyAgICAgICAodXJpIChzdHJpbmctYXBwZW5kICJtaXJyb3I6Ly9zb3VyY2Vmb3JnZS9udW1weSIK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICIvbnVtcHktIiB2ZXJzaW9uICIudGFyLmd6Iikp CisgICAgICAgKHNoYTI1NgorICAgICAgICAoYmFzZTMyCisgICAgICAgICAiMXhienNiODR3ZzMy eng1aWxndmtkcDBsd2Zxcnljd2hoNWEycTlueDVpd3lqcGdjeHJwcCIpKSkpCisgICAgKGJ1aWxk LXN5c3RlbSBweXRob24tYnVpbGQtc3lzdGVtKQorICAgIChpbnB1dHMKKyAgICAgYCgoInB5dGhv bi1udW1weS11c2VyZ3VpZGUiICxweXRob24tbnVtcHktdXNlcmd1aWRlKQorICAgICAgICgicHl0 aG9uLW51bXB5LXJlZmVyZW5jZSIgLHB5dGhvbi1udW1weS1yZWZlcmVuY2UpCisgICAgICAgKCJh dGxhcyIgLGF0bGFzKSkpCisgICAgKG5hdGl2ZS1pbnB1dHMKKyAgICAgYCgoInB5dGhvbi1ub3Nl IiAscHl0aG9uLW5vc2UpICA7IHVzZWQgYnkgdGVzdHMKKyAgICAgICAoImdmb3J0cmFuIiAsZ2Zv cnRyYW4tNC44KSkpCisgICAgKG91dHB1dHMgJygib3V0IiAiZG9jIikpICAgICAgICAgOyBkb2Mg aXMgY2EuIDlNQgorICAgIChhcmd1bWVudHMKKyAgICAgYCgjOnBoYXNlcworICAgICAgIChhbGlz dC1jb25zLWJlZm9yZQorICAgICAgICAnYnVpbGQgJ3NldC1lbnZpcm9ubWVudC12YXJpYWJsZXMK KyAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyAjOmFsbG93LW90aGVyLWtleXMpCisgICAg ICAgICAgKGxldCogKChhdGxhcy10aHJlYWRlZAorICAgICAgICAgICAgICAgICAgKHN0cmluZy1h cHBlbmQgKGFzc29jLXJlZiBpbnB1dHMgImF0bGFzIikgCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAiL2xpYi9saWJ0YXRsYXMuc28iKSkKKyAgICAgICAgICAgICAgICAgOzsgT24g c2luZ2xlIGNvcmUgQ1BVcyBvbmx5IHRoZSBzZXJpYWwgbGlicmFyeSBpcyBjcmVhdGVkLgorICAg ICAgICAgICAgICAgICAoYXRsYXMtbGliCisgICAgICAgICAgICAgICAgICAoaWYgKGZpbGUtZXhp c3RzPyBhdGxhcy10aHJlYWRlZCkKKyAgICAgICAgICAgICAgICAgICAgICBhdGxhcy10aHJlYWRl ZAorICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIChhc3NvYy1yZWYgaW5wdXRz ICJhdGxhcyIpIAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIvbGliL2xp YnNhdGxhcy5zbyIpKSkpCisgICAgICAgICAgICAoc2V0ZW52ICJBVExBUyIgYXRsYXMtbGliKSkp CisgICAgICAgIDs7IFRPRE86IGdlbmVyYXRlIGRvY3VtZW50YXRpb24gbG9jYWxseSwgaW5jbHVk aW5nIGluZm8gZmlsZXMuICBUaGUKKyAgICAgICAgOzsgZG9jdW1lbnRhdGlvbiBjYW4gYmUgYnVp bHQgZnJvbSB0aGUgc291cmNlLiAgSG93ZXZlciwgaXQgbmVlZHMKKyAgICAgICAgOzsgbWF0cGxv dGxpYiB3aGljaCB3ZSBjdXJyZW50bHkgZG8gbm90IGhhdmUuCisgICAgICAgIChhbGlzdC1jb25z LWFmdGVyCisgICAgICAgICAnaW5zdGFsbCAnaW5zdGFsbC1kb2MKKyAgICAgICAgIChsYW1iZGEq ICgjOmtleSBvdXRwdXRzIGlucHV0cyAjOmFsbG93LW90aGVyLWtleXMpCisgICAgICAgICAgIChs ZXQgKChkb2MgKHN0cmluZy1hcHBlbmQgKGFzc29jLXJlZiBvdXRwdXRzICJkb2MiKSAKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiL3NoYXJlL2RvYy8iICxuYW1lICItIiAs dmVyc2lvbikpKQorICAgICAgICAgICAgIChta2Rpci1wIGRvYykKKyAgICAgICAgICAgICAoY29w eS1maWxlIChhc3NvYy1yZWYgaW5wdXRzICJweXRob24tbnVtcHktcmVmZXJlbmNlIikKKyAgICAg ICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIGRvYyAiL3JlZmVyZW5jZS5wZGYiKSkK KyAgICAgICAgICAgICAoY29weS1maWxlIChhc3NvYy1yZWYgaW5wdXRzICJweXRob24tbnVtcHkt dXNlcmd1aWRlIikKKyAgICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIGRvYyAi L3VzZXJndWlkZS5wZGYiKSkpKQorICAgICAgICAgOzsgVGVzdHMgY2FuIG9ubHkgYmUgcnVuIGFm dGVyIHRoZSBsaWJyYXJ5IGhhcyBiZWVuIGluc3RhbGxlZCBhbmQgbm90CisgICAgICAgICA7OyB3 aXRoaW4gdGhlIHNvdXJjZSBkaXJlY3RvcnkuCisgICAgICAgICAoYWxpc3QtY29ucy1hZnRlcgor ICAgICAgICAgICdpbnN0YWxsICdjaGVjaworICAgICAgICAgIChsYW1iZGEgXyAKKyAgICAgICAg ICAgICh3aXRoLWRpcmVjdG9yeS1leGN1cnNpb24gIi90bXAiCisgICAgICAgICAgICAgICh6ZXJv PyAoc3lzdGVtKiAicHl0aG9uIiAiLWMiICJpbXBvcnQgbnVtcHk7IG51bXB5LnRlc3QoKSIpKSkp CisgICAgICAgICAgKGFsaXN0LWRlbGV0ZSAKKyAgICAgICAgICAgJ2NoZWNrIAorICAgICAgICAg ICAlc3RhbmRhcmQtcGhhc2VzKSkpKSkpCisgICAgKGhvbWUtcGFnZSAiaHR0cDovL3d3dy5udW1w eS5vcmcvIikKKyAgICAoc3lub3BzaXMgIkZ1bmRhbWVudGFsIHBhY2thZ2UgZm9yIHNjaWVudGlm aWMgY29tcHV0aW5nIHdpdGggUHl0aG9uIikKKyAgICAoZGVzY3JpcHRpb24gIk51bVB5IGlzIHRo ZSBmdW5kYW1lbnRhbCBwYWNrYWdlIGZvciBzY2llbnRpZmljIGNvbXB1dGluZword2l0aCBQeXRo b24uIEl0IGNvbnRhaW5zIGFtb25nIG90aGVyIHRoaW5nczogYSBwb3dlcmZ1bCBOLWRpbWVuc2lv bmFsIGFycmF5CitvYmplY3QsIHNvcGhpc3RpY2F0ZWQgKGJyb2FkY2FzdGluZykgZnVuY3Rpb25z LCB0b29scyBmb3IgaW50ZWdyYXRpbmcgQy9DKysKK2FuZCBGb3J0cmFuIGNvZGUsIHVzZWZ1bCBs aW5lYXIgYWxnZWJyYSwgRm91cmllciB0cmFuc2Zvcm0sIGFuZCByYW5kb20gbnVtYmVyCitjYXBh YmlsaXRpZXMuIikKKyAgICAobGljZW5zZSBic2QtMykpKQorCisoZGVmaW5lLXB1YmxpYyBweXRo b24yLW51bXB5CisgIChwYWNrYWdlLXdpdGgtcHl0aG9uMiBweXRob24tbnVtcHkpKQorCi0tIAox LjguNAoK --90e6ba6e8d64619c170506a6dd43--