From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Bavier Subject: [PATCHES] for Haskell packages Date: Sat, 6 Jun 2015 07:36:47 -0500 Message-ID: <20150606073647.6cc504fb@openmailbox.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/wJxRvtf8kd0dkJc.fsXPEGU" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40282) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1Iw9-0000QM-MH for guix-devel@gnu.org; Sat, 06 Jun 2015 14:35:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z1Iw6-0002Cw-Gi for guix-devel@gnu.org; Sat, 06 Jun 2015 14:35:17 -0400 Received: from smtp14.openmailbox.org ([62.4.1.48]:52509) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z1Iw6-00028P-3q for guix-devel@gnu.org; Sat, 06 Jun 2015 14:35:14 -0400 Received: from localhost (localhost [127.0.0.1]) by mail2.openmailbox.org (Postfix) with ESMTP id 5BB372006A7 for ; Sat, 6 Jun 2015 20:35:10 +0200 (CEST) Received: from mail2.openmailbox.org ([62.4.1.33]) by localhost (mail.openmailbox.org [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id i5GtvXP7aCj8 for ; Sat, 6 Jun 2015 20:35:08 +0200 (CEST) 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: guix-devel@gnu.org --MP_/wJxRvtf8kd0dkJc.fsXPEGU Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hello Guix, Attached are three patches to help our haskell-build-system and profile creation work a bit better in the presence of Haskell libraries. `~Eric --MP_/wJxRvtf8kd0dkJc.fsXPEGU Content-Type: application/octet-stream; name=0001-profiles-Search-for-ghc-conf-files-only-if-package-d.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-profiles-Search-for-ghc-conf-files-only-if-package-d.patch RnJvbSA3NWE0MzA1MzkxY2QyNDZhNmU4ZGI1YjExMjIzZjljZTI0M2VkZDM1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFcmljIEJhdmllciA8YmF2aWVyQG1lbWJlci5mc2Yub3JnPgpE YXRlOiBTYXQsIDYgSnVuIDIwMTUgMDY6Mzg6NTggLTA1MDAKU3ViamVjdDogW1BBVENIIDEvM10g cHJvZmlsZXM6IFNlYXJjaCBmb3IgZ2hjIGNvbmYgZmlsZXMgb25seSBpZiBwYWNrYWdlIGRiCiBl eGlzdHMuCgpUaGlzIGF2b2lkcyBoYXZpbmcgJ2ZpbmQtZmlsZXMnIHJlcG9ydCB3YXJuaW5ncyBh Ym91dCBzZWFyY2hpbmcgaW4Kbm9uLWV4aXN0ZW50IGRpcmVjdG9yaWVzLgoKKiBndWl4L3Byb2Zp bGVzLnNjbSAoZ2hjLXBhY2thZ2UtY2FjaGUtZmlsZSlbY29uZi1maWxlc106IE9ubHkgc2VhcmNo CiAgZm9yICouY29uZiBmaWxlcyBpZiB0aGUgc2VhcmNoIGRpcmVjdG9yeSBleGlzdHMuCi0tLQog Z3VpeC9wcm9maWxlcy5zY20gfCA1ICsrKystCiAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25z KCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZ3VpeC9wcm9maWxlcy5zY20gYi9ndWl4 L3Byb2ZpbGVzLnNjbQppbmRleCAyODE1MGFmLi4zM2EwNTExIDEwMDY0NAotLS0gYS9ndWl4L3By b2ZpbGVzLnNjbQorKysgYi9ndWl4L3Byb2ZpbGVzLnNjbQpAQCAtNTAwLDcgKzUwMCwxMCBAQCBl bnRyaWVzIG9mIE1BTklGRVNULCBvciAjZiBpZiBNQU5JRkVTVCBkb2VzIG5vdCBoYXZlIGFueSBH SEMgcGFja2FnZXMuIgogICAgICAgICAgIChzdHJpbmctYXBwZW5kICMkb3V0cHV0ICIvIiBkYi1z dWJkaXIpKQogCiAgICAgICAgIChkZWZpbmUgKGNvbmYtZmlsZXMgdG9wKQotICAgICAgICAgIChm aW5kLWZpbGVzIChzdHJpbmctYXBwZW5kIHRvcCAiLyIgZGItc3ViZGlyKSAiXFwuY29uZiQiKSkK KyAgICAgICAgICAobGV0ICgoZGIgKHN0cmluZy1hcHBlbmQgdG9wICIvIiBkYi1zdWJkaXIpKSkK KyAgICAgICAgICAgIChpZiAoZmlsZS1leGlzdHM/IGRiKQorICAgICAgICAgICAgICAgIChmaW5k LWZpbGVzIGRiICJcXC5jb25mJCIpCisgICAgICAgICAgICAgICAgJygpKSkpCiAKICAgICAgICAg KGRlZmluZSAoY29weS1jb25mLWZpbGUgY29uZikKICAgICAgICAgICAobGV0ICgoYmFzZSAoYmFz ZW5hbWUgY29uZikpKQotLSAKMi4yLjEKCg== --MP_/wJxRvtf8kd0dkJc.fsXPEGU Content-Type: application/octet-stream; name=0002-profiles-Process-ghc-conf-files-only-once.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0002-profiles-Process-ghc-conf-files-only-once.patch RnJvbSAwOGQ2Nzg1N2Q5NzI2YTJmZGRiYzgzNGMzNGNhYWFlM2U1YTVkNGYyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFcmljIEJhdmllciA8YmF2aWVyQG1lbWJlci5mc2Yub3JnPgpE YXRlOiBTYXQsIDYgSnVuIDIwMTUgMDY6NDM6MTkgLTA1MDAKU3ViamVjdDogW1BBVENIIDIvM10g cHJvZmlsZXM6IFByb2Nlc3MgZ2hjIGNvbmYgZmlsZXMgb25seSBvbmNlLgoKQSBwYWNrYWdlIG1h eSBiZSBsaXN0ZWQgaW4gdGhlIG1hbmlmZXN0IGlucHV0cyBtdWx0aXBsZSB0aW1lcy4gIEF2b2lk CmNvcHlpbmcgZ2hjICouY29uZiBmaWxlcyB0d2ljZSBieSBkZWxldGluZyBkdXBsaWNhdGVzLgoK KiBndWl4L3Byb2ZpbGVzLnNjbSAoZ2hjLXBhY2thZ2UtY2FjaGUtZmlsZSlbY29uZi1maWxlc106 IERlbGV0ZQogIGR1cGxpY2F0ZSBtYW5pZmVzdCBpbnB1dHMgYmVmb3JlIGNvcHlpbmcgY29uZiBm aWxlcy4KLS0tCiBndWl4L3Byb2ZpbGVzLnNjbSB8IDMgKystCiAxIGZpbGUgY2hhbmdlZCwgMiBp bnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZ3VpeC9wcm9maWxlcy5z Y20gYi9ndWl4L3Byb2ZpbGVzLnNjbQppbmRleCAzM2EwNTExLi41YzE5Yzk1IDEwMDY0NAotLS0g YS9ndWl4L3Byb2ZpbGVzLnNjbQorKysgYi9ndWl4L3Byb2ZpbGVzLnNjbQpAQCAtNTEyLDcgKzUx Miw4IEBAIGVudHJpZXMgb2YgTUFOSUZFU1QsIG9yICNmIGlmIE1BTklGRVNUIGRvZXMgbm90IGhh dmUgYW55IEdIQyBwYWNrYWdlcy4iCiAgICAgICAgIChzeXN0ZW0qIChzdHJpbmctYXBwZW5kICMr Z2hjICIvYmluL2doYy1wa2ciKSAiaW5pdCIgZGItZGlyKQogICAgICAgICAoZm9yLWVhY2ggY29w eS1jb25mLWZpbGUKICAgICAgICAgICAgICAgICAgIChhcHBlbmQtbWFwIGNvbmYtZmlsZXMKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICcjJChtYW5pZmVzdC1pbnB1dHMgbWFuaWZlc3Qp KSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChkZWxldGUtZHVwbGljYXRlcworICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICcjJChtYW5pZmVzdC1pbnB1dHMgbWFuaWZlc3Qp KSkpCiAgICAgICAgIChsZXQgKChzdWNjZXNzCiAgICAgICAgICAgICAgICAoemVybz8KICAgICAg ICAgICAgICAgICAoc3lzdGVtKiAoc3RyaW5nLWFwcGVuZCAjK2doYyAiL2Jpbi9naGMtcGtnIikg InJlY2FjaGUiCi0tIAoyLjIuMQoK --MP_/wJxRvtf8kd0dkJc.fsXPEGU Content-Type: application/octet-stream; name=0003-build-system-haskell-install-config-for-any-package-.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0003-build-system-haskell-install-config-for-any-package-.patch RnJvbSA0ODBkMThjNjgzZDNkNzRmYWI0NjU3OGM5M2ZiNGNiZjgxZDFhOGJlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBFcmljIEJhdmllciA8YmF2aWVyQG1lbWJlci5mc2Yub3JnPgpE YXRlOiBTYXQsIDYgSnVuIDIwMTUgMDc6Mjg6NTcgLTA1MDAKU3ViamVjdDogW1BBVENIIDMvM10g YnVpbGQtc3lzdGVtL2hhc2tlbGw6IGluc3RhbGwgY29uZmlnIGZvciBhbnkgcGFja2FnZSB0aGF0 CiBjcmVhdGVzIGl0LgoKQSBDYWJhbCBwYWNrYWdlIGlzIGFsbG93ZWQgdG8gZGVjbGFyZSBhbiAi ZW1wdHkiIGxpYnJhcnksIGluIGFuCm90aGVyd2lzZSBleGVjdXRhYmxlLW9ubHkgcGFja2FnZSwg Zm9yIHRoZSBwdXJwb3NlIG9mIGFsbG93aW5nIENhYmFsCnRvIHVzZSBpdCBhcyBhIGRlcGVuZGVu Y3kgZm9yIG90aGVyIHBhY2thZ2VzLiAgU2VlIGUuZy4gaHNwZWMtZGlzY292ZXIuCgoqIGd1aXgv YnVpbGQvaGFza2VsbC1idWlsZC1zeXN0ZW0uc2NtIChyZWdpc3Rlcik6IFVuY29uZGl0aW9uYWxs eSBjYWxsCiAgc2V0dXAgc2NyaXB0IHdpdGggInJlZ2lzdGVyIiwgYW5kIGluc3RhbGwgYW55IGNv bmZpZyBmaWxlIGdlbmVyYXRlZC4KLS0tCiBndWl4L2J1aWxkL2hhc2tlbGwtYnVpbGQtc3lzdGVt LnNjbSB8IDggKysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDQgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ3VpeC9idWlsZC9oYXNrZWxsLWJ1aWxkLXN5c3RlbS5z Y20gYi9ndWl4L2J1aWxkL2hhc2tlbGwtYnVpbGQtc3lzdGVtLnNjbQppbmRleCBkMzgyZWU0Li5j MGNiNzg5IDEwMDY0NAotLS0gYS9ndWl4L2J1aWxkL2hhc2tlbGwtYnVpbGQtc3lzdGVtLnNjbQor KysgYi9ndWl4L2J1aWxkL2hhc2tlbGwtYnVpbGQtc3lzdGVtLnNjbQpAQCAtMTY2LDEzICsxNjYs MTMgQEAgZ2VuZXJhdGUgdGhlIGNhY2hlIGFzIGl0IHdvdWxkIGNsYXNoIGluIHVzZXIgcHJvZmls ZXMuIgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHBhY2thZ2UtbmFtZS12 ZXJzaW9uIGhhc2tlbGwpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiL3Bh Y2thZ2UuY29uZi5kIikpCiAgICAgICAgICAoaWQtcnggKG1ha2UtcmVnZXhwICJeaWQ6ICooLiop JCIpKQotICAgICAgICAgKGxpYi1yeCAobWFrZS1yZWdleHAgImxpYi4qXFwuKGF8c28pIikpCi0g ICAgICAgICAoY29uZmlnLWZpbGUgKHN0cmluZy1hcHBlbmQgY29uZmlnLWRpciAiLyIgbmFtZSAi LmNvbmYiKSkKKyAgICAgICAgIChjb25maWctZmlsZSAoc3RyaW5nLWFwcGVuZCBvdXQgIi8iIG5h bWUgIi5jb25mIikpCiAgICAgICAgICAocGFyYW1zCiAgICAgICAgICAgKGxpc3QgKHN0cmluZy1h cHBlbmQgIi0tZ2VuLXBrZy1jb25maWc9IiBjb25maWctZmlsZSkpKSkKLSAgICAodW5sZXNzIChu dWxsPyAoZmluZC1maWxlcyBsaWIgbGliLXJ4KSkKKyAgICAocnVuLXNldHVwaHMgInJlZ2lzdGVy IiBwYXJhbXMpCisgICAgOzsgVGhlIGNvbmYgZmlsZSBpcyBjcmVhdGVkIG9ubHkgd2hlbiB0aGVy ZSBpcyBhIGxpYnJhcnkgdG8gcmVnaXN0ZXIuCisgICAgKHdoZW4gKGZpbGUtZXhpc3RzPyBjb25m aWctZmlsZSkKICAgICAgIChta2Rpci1wIGNvbmZpZy1kaXIpCi0gICAgICAocnVuLXNldHVwaHMg InJlZ2lzdGVyIiBwYXJhbXMpCiAgICAgICAobGV0ICgoY29uZmlnLWZpbGUtbmFtZStpZAogICAg ICAgICAgICAgIChjYWxsLXdpdGgtYXNjaWktaW5wdXQtZmlsZSBjb25maWctZmlsZSAoY3V0IGdy ZXAgaWQtcnggPD4pKSkpCiAgICAgICAgIChyZW5hbWUtZmlsZSBjb25maWctZmlsZQotLSAKMi4y LjEKCg== --MP_/wJxRvtf8kd0dkJc.fsXPEGU--