From mboxrd@z Thu Jan 1 00:00:00 1970 From: Federico Beffa Subject: bug#21829: guix import hackage failures Date: Wed, 25 Nov 2015 17:55:28 +0100 Message-ID: References: <87d1vghjhk.fsf@gnu.org> <87vb971t74.fsf@gnu.org> <87lha3ufxv.fsf@gnu.org> <87h9kp1ts2.fsf@gnu.org> <87k2pjq8qu.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a11441afc5a073e05256053c3 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37056) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1dMW-0007Xg-EM for bug-guix@gnu.org; Wed, 25 Nov 2015 11:56:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1dMQ-0000Bc-Hk for bug-guix@gnu.org; Wed, 25 Nov 2015 11:56:08 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:35032) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1dMQ-0000BX-DX for bug-guix@gnu.org; Wed, 25 Nov 2015 11:56:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1a1dMQ-0002Vy-5m for bug-guix@gnu.org; Wed, 25 Nov 2015 11:56:02 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: <87k2pjq8qu.fsf@gnu.org> List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 21829@debbugs.gnu.org --001a11441afc5a073e05256053c3 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Sun, Nov 15, 2015 at 9:59 PM, Ludovic Court=C3=A8s wrote: > Federico Beffa skribis: >> * guix/import/cabal.scm (lex-word): Add support for tests with no spaces= . >> (impl): Fix handling of operator "=3D=3D". > > LGTM, but I think it=E2=80=99d be great to add a test that illustrates th= e case > that this fixes (and to make sure it doesn=E2=80=99t come back later.) I've rewritten 'impl' and the new test that I've added covers this and more= . >> From f796d814821289a98e401a3e3df13334a2e8689b Mon Sep 17 00:00:00 2001 >> From: Federico Beffa >> Date: Wed, 11 Nov 2015 15:31:46 +0100 >> Subject: [PATCH 3/6] import: hackage: Make it resilient to missing final >> newline. >> >> * guix/import/cabal.scm (peek-next-line-indent): Check for missing final >> newline. > > [...] > >> + (if (eof-object? (peek-char port)) >> + ;; If the file is missing the #\newline on the last line, add it = and act >> + ;; as if it were there. This is needed for propoer operation of > ^^^^ > Typo. > >> + ;; indentation based block recognition. >> + (begin (unread-char #\newline port) (read-char port) 0) > > Isn=E2=80=99t this equivalent to: 0 ? No. This is because at the start of a new line we check if and how many indentation blocks have ended. If the last line doesn't terminate this check is no done. > > Could you add a test for this one? I've removed the final newline from the test 'test-read-cabal-1". > >> From 225164d2355afd6f9455251d87cbd34b08f68cdb Mon Sep 17 00:00:00 2001 >> From: Federico Beffa >> Date: Wed, 11 Nov 2015 16:20:45 +0100 >> Subject: [PATCH 4/6] import: hackage: Make parsing of tests and fields m= ore >> flexible. >> >> * guix/import/cabal.scm (is-test): Allow spaces between keyword and >> parentheses. >> (is-id): Add argument 'port'. Allow spaces between keyword and column= . >> (lex-word): Adjust call to 'is-id'. > > LGTM, and would be perfect with a test. ;-) These are now exercised in "test-read-cabal-1". > [...] > >> +(test-equal "canonical-newline-port" >> + "This is a journey" >> + (let ((port (open-string-input-port >> + "This is a journey\r\n"))) >> + (get-line (canonical-newline-port port)))) > > I would rather use =E2=80=98get-string-all=E2=80=99 and make sure the res= ult is exactly: > > "This is a journey\n" > > (Because =E2=80=98get-line=E2=80=99 could have been doing its own thing r= egardless of > the EOL style.) > > A test with several lines, including lines with just \n would be nice. OK. I've updated it and the test. > >> From c57be8cae9b3642beff1462acd32a0aee54ad7c6 Mon Sep 17 00:00:00 2001 >> From: Federico Beffa >> Date: Sat, 14 Nov 2015 15:15:00 +0100 >> Subject: [PATCH 6/6] import: hackage: Handle CRLF end of line style. >> >> * guix/import/hackage.scm (hackage-fetch, hackage->guix-package): Do it. > > Rather =E2=80=9CUse =E2=80=98canonical-newline-port=E2=80=99.=E2=80=9D in= stead of =E2=80=9CDo it.=E2=80=9D OK. I've made 1 more change. The importer now peeks at the 'ghc' package version and uses that as default implementation. Before, without using the '-e' option, it was assuming "ghc", but no specific version. Regards, Fede --001a11441afc5a073e05256053c3 Content-Type: text/x-diff; charset=US-ASCII; name="0001-import-hackage-Add-recognition-of-true-and-false-sym.patch" Content-Disposition: attachment; filename="0001-import-hackage-Add-recognition-of-true-and-false-sym.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iheye4ge0 RnJvbSBkMTNmMDYzODNkMDdlMGFkNDA5NmZmN2ViNzE1MjY0NDYzNzM4YjBjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGZWRlcmljbyBCZWZmYSA8YmVmZmFAZmJlbmdpbmVlcmluZy5j aD4KRGF0ZTogV2VkLCAxMSBOb3YgMjAxNSAxMDozOTozOCArMDEwMApTdWJqZWN0OiBbUEFUQ0gg MS84XSBpbXBvcnQ6IGhhY2thZ2U6IEFkZCByZWNvZ25pdGlvbiBvZiAndHJ1ZScgYW5kICdmYWxz ZScKIHN5bWJvbHMuCgoqIGd1aXgvaW1wb3J0L2NhYmFsLnNjbSAoaXMtdHJ1ZSwgaXMtZmFsc2Us IGxleC10cnVlLCBsZXgtZmFsc2UpOiBOZXcgcHJvY2VkdXJlcy4KICAobGV4LXdvcmQpOiBVc2Ug dGhlbS4KICAobWFrZS1jYWJhbC1wYXJzZXIpOiBBZGQgVFJVRSBhbmQgRkFMU0UgdG9rZW5zLgog IChldmFsKTogQWRkIGVudHJpZXMgZm9yICd0cnVlIGFuZCAnZmFsc2Ugc3ltYm9scy4KLS0tCiBn dWl4L2ltcG9ydC9jYWJhbC5zY20gfCAxNiArKysrKysrKysrKysrKystCiAxIGZpbGUgY2hhbmdl ZCwgMTUgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2d1aXgvaW1w b3J0L2NhYmFsLnNjbSBiL2d1aXgvaW1wb3J0L2NhYmFsLnNjbQppbmRleCA0NWQ2NDRhLi44ZDg0 ZTA5IDEwMDY0NAotLS0gYS9ndWl4L2ltcG9ydC9jYWJhbC5zY20KKysrIGIvZ3VpeC9pbXBvcnQv Y2FiYWwuc2NtCkBAIC0xMzgsNyArMTM4LDcgQEAgdG8gdGhlIHN0YWNrLiIKICAgIkdlbmVyYXRl IGEgcGFyc2VyIGZvciBDYWJhbCBmaWxlcy4iCiAgIChsYWxyLXBhcnNlcgogICAgOzsgLS0tIHRv a2VuIGRlZmluaXRpb25zCi0gICAoQ0NVUkxZIFZDQ1VSTFkgT1BBUkVOIENQQVJFTiBURVNUIElE IFZFUlNJT04gUkVMQVRJT04KKyAgIChDQ1VSTFkgVkNDVVJMWSBPUEFSRU4gQ1BBUkVOIFRFU1Qg SUQgVkVSU0lPTiBSRUxBVElPTiBUUlVFIEZBTFNFCiAgICAgICAgICAgIChyaWdodDogSUYgRkxB RyBFWEVDIFRFU1QtU1VJVEUgU09VUkNFLVJFUE8gQkVOQ0hNQVJLIExJQiBPQ1VSTFkpCiAgICAg ICAgICAgIChsZWZ0OiBPUikKICAgICAgICAgICAgKGxlZnQ6IFBST1BFUlRZIEFORCkKQEAgLTIw Niw2ICsyMDYsOCBAQCB0byB0aGUgc3RhY2suIgogICAgKGlmLXRoZW4gICAgIChJRiB0ZXN0cyBP Q1VSTFkgZXhwcnMgQ0NVUkxZKSA6IGAoaWYgLCQyICwkNCAoKSkKICAgICAgICAgICAgICAgICAo SUYgdGVzdHMgb3BlbiBleHBycyBjbG9zZSkgICAgOiBgKGlmICwkMiAsJDQgKCkpKQogICAgKHRl c3RzICAgICAgIChURVNUIE9QQVJFTiBJRCBDUEFSRU4pICAgICAgICA6IGAoLCQxICwkMykKKyAg ICAgICAgICAgICAgICAoVFJVRSkgICAgICAgICAgICAgICAgICAgICAgICAgOiAndHJ1ZQorICAg ICAgICAgICAgICAgIChGQUxTRSkgICAgICAgICAgICAgICAgICAgICAgICA6ICdmYWxzZQogICAg ICAgICAgICAgICAgIChURVNUIE9QQVJFTiBJRCBSRUxBVElPTiBWRVJTSU9OIENQQVJFTikKICAg ICAgICAgICAgICAgICA6IGAoLCQxICwoc3RyaW5nLWFwcGVuZCAkMyAiICIgJDQgIiAiICQ1KSkK ICAgICAgICAgICAgICAgICAoVEVTVCBPUEFSRU4gSUQgUkVMQVRJT04gVkVSU0lPTiBBTkQgUkVM QVRJT04gVkVSU0lPTiBDUEFSRU4pCkBAIC0zNTAsNiArMzUyLDEwIEBAIG1hdGNoaW5nIGEgc3Ry aW5nIGFnYWluc3QgdGhlIGNyZWF0ZWQgcmVnZXhwLiIKIAogKGRlZmluZSAoaXMtaWYgcykgKHN0 cmluZy1jaT0/IHMgImlmIikpCiAKKyhkZWZpbmUgKGlzLXRydWUgcykgKHN0cmluZy1jaT0/IHMg InRydWUiKSkKKworKGRlZmluZSAoaXMtZmFsc2UgcykgKHN0cmluZy1jaT0/IHMgImZhbHNlIikp CisKIChkZWZpbmUgKGlzLWFuZCBzKSAoc3RyaW5nPT8gcyAiJiYiKSkKIAogKGRlZmluZSAoaXMt b3IgcykgKHN0cmluZz0/IHMgInx8IikpCkBAIC00MjQsNiArNDMwLDEwIEBAIHN0cmluZyB3aXRo IHRoZSByZWFkIGNoYXJhY3RlcnMuIgogCiAoZGVmaW5lIChsZXgtaWYgbG9jKSAobWFrZS1sZXhp Y2FsLXRva2VuICdJRiBsb2MgI2YpKQogCisoZGVmaW5lIChsZXgtdHJ1ZSBsb2MpIChtYWtlLWxl eGljYWwtdG9rZW4gJ1RSVUUgbG9jICN0KSkKKworKGRlZmluZSAobGV4LWZhbHNlIGxvYykgKG1h a2UtbGV4aWNhbC10b2tlbiAnRkFMU0UgbG9jICNmKSkKKwogKGRlZmluZSAobGV4LWFuZCBsb2Mp IChtYWtlLWxleGljYWwtdG9rZW4gJ0FORCBsb2MgI2YpKQogCiAoZGVmaW5lIChsZXgtb3IgbG9j KSAobWFrZS1sZXhpY2FsLXRva2VuICdPUiBsb2MgI2YpKQpAQCAtNDg5LDYgKzQ5OSw4IEBAIExP QyBpcyB0aGUgY3VycmVudCBwb3J0IGxvY2F0aW9uLiIKICAgKGxldCogKCh3IChyZWFkLWRlbGlt aXRlZCAiICgpXHRcbiIgcG9ydCAncGVlaykpKQogICAgIChjb25kICgoaXMtaWYgdykgKGxleC1p ZiBsb2MpKQogICAgICAgICAgICgoaXMtdGVzdCB3IHBvcnQpIChsZXgtdGVzdCB3IGxvYykpCisg ICAgICAgICAgKChpcy10cnVlIHcpIChsZXgtdHJ1ZSBsb2MpKQorICAgICAgICAgICgoaXMtZmFs c2UgdykgKGxleC1mYWxzZSBsb2MpKQogICAgICAgICAgICgoaXMtYW5kIHcpIChsZXgtYW5kIGxv YykpCiAgICAgICAgICAgKChpcy1vciB3KSAobGV4LW9yIGxvYykpCiAgICAgICAgICAgKChpcy1p ZCB3KSAobGV4LWlkIHcgbG9jKSkKQEAgLTcxNCw2ICs3MjYsOCBAQCB0aGUgb3JkZXJpbmcgb3Bl cmF0aW9uIGFuZCB0aGUgdmVyc2lvbi4iCiAgICAgICAoKCdvcyBuYW1lKSAob3MgbmFtZSkpCiAg ICAgICAoKCdhcmNoIG5hbWUpIChhcmNoIG5hbWUpKQogICAgICAgKCgnaW1wbCBuYW1lKSAoaW1w bCBuYW1lKSkKKyAgICAgICgndHJ1ZSAjdCkKKyAgICAgICgnZmFsc2UgI2YpCiAgICAgICAoKCdu b3QgbmFtZSkgKG5vdCAoZXZhbCBuYW1lKSkpCiAgICAgICA7OyAnYW5kJyBhbmQgJ29yJyBhcmVu J3QgZnVuY3Rpb25zLCB0aHVzIHdlIGNhbid0IHVzZSBhcHBseQogICAgICAgKCgnYW5kIGFyZ3Mg Li4uKSAoZm9sZCAobGFtYmRhIChlIHMpIChhbmQgZSBzKSkgI3QgKGV2YWwgYXJncykpKQotLSAK Mi40LjMKCg== --001a11441afc5a073e05256053c3 Content-Type: text/x-diff; charset=US-ASCII; name="0002-import-hackage-Imporve-parsing-of-tests.patch" Content-Disposition: attachment; filename="0002-import-hackage-Imporve-parsing-of-tests.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iheye4h81 RnJvbSBkOTZhNjU1YTIzMmJhNzdkN2Q3MWE1MjI3YzZkM2M4YmM4Yjk4M2NjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGZWRlcmljbyBCZWZmYSA8YmVmZmFAZmJlbmdpbmVlcmluZy5j aD4KRGF0ZTogV2VkLCAxMSBOb3YgMjAxNSAxMToyMjo0MiArMDEwMApTdWJqZWN0OiBbUEFUQ0gg Mi84XSBpbXBvcnQ6IGhhY2thZ2U6IEltcG9ydmUgcGFyc2luZyBvZiB0ZXN0cy4KCiogZ3VpeC9p bXBvcnQvY2FiYWwuc2NtIChsZXgtd29yZCk6IEFkZCBzdXBwb3J0IGZvciB0ZXN0cyB3aXRoIG5v IHNwYWNlcy4KICAoaW1wbCk6IFJld3JpdGUuCi0tLQogZ3VpeC9pbXBvcnQvY2FiYWwuc2NtIHwg MTggKysrKysrKysrKysrKy0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygrKSwg NSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ndWl4L2ltcG9ydC9jYWJhbC5zY20gYi9ndWl4 L2ltcG9ydC9jYWJhbC5zY20KaW5kZXggOGQ4NGUwOS4uZWQ2Mzk0ZSAxMDA2NDQKLS0tIGEvZ3Vp eC9pbXBvcnQvY2FiYWwuc2NtCisrKyBiL2d1aXgvaW1wb3J0L2NhYmFsLnNjbQpAQCAtMzAsNiAr MzAsNyBAQAogICAjOnVzZS1tb2R1bGUgKHNyZmkgc3JmaS05IGdudSkKICAgIzp1c2UtbW9kdWxl IChzeXN0ZW0gYmFzZSBsYWxyKQogICAjOnVzZS1tb2R1bGUgKHJucnMgZW51bXMpCisgICM6dXNl LW1vZHVsZSAoZ3VpeCB1dGlscykKICAgIzpleHBvcnQgKHJlYWQtY2FiYWwKICAgICAgICAgICAg IGV2YWwtY2FiYWwKICAgICAgICAgICAgIApAQCAtNDk2LDcgKzQ5Nyw3IEBAIGxvY2F0aW9uLiIK IChkZWZpbmUgKGxleC13b3JkIHBvcnQgbG9jKQogICAiUHJvY2VzcyB0b2tlbnMgd2hpY2ggY2Fu IGJlIHJlY29nbml6ZWQgYnkgcmVhZGluZyB0aGUgbmV4dCB3b3JkIGZvcm0gUE9SVC4KIExPQyBp cyB0aGUgY3VycmVudCBwb3J0IGxvY2F0aW9uLiIKLSAgKGxldCogKCh3IChyZWFkLWRlbGltaXRl ZCAiICgpXHRcbiIgcG9ydCAncGVlaykpKQorICAobGV0KiAoKHcgKHJlYWQtZGVsaW1pdGVkICIg PD49KClcdFxuIiBwb3J0ICdwZWVrKSkpCiAgICAgKGNvbmQgKChpcy1pZiB3KSAobGV4LWlmIGxv YykpCiAgICAgICAgICAgKChpcy10ZXN0IHcgcG9ydCkgKGxleC10ZXN0IHcgbG9jKSkKICAgICAg ICAgICAoKGlzLXRydWUgdykgKGxleC10cnVlIGxvYykpCkBAIC02OTYsMTEgKzY5NywxOCBAQCB0 aGUgb3JkZXJpbmcgb3BlcmF0aW9uIGFuZCB0aGUgdmVyc2lvbi4iCiAgICAgICAgICAgICAgICAg ICAoKHNwZWMtbmFtZSBzcGVjLW9wIHNwZWMtdmVyKQogICAgICAgICAgICAgICAgICAgIChjb21w LXNwZWMtbmFtZStvcCt2ZXJzaW9uIGhhc2tlbGwpKSkKICAgICAgIChpZiAoYW5kIHNwZWMtdmVy IGNvbXAtdmVyKQotICAgICAgICAgIChldmFsLXN0cmluZwotICAgICAgICAgICAoc3RyaW5nLWFw cGVuZCAiKHN0cmluZyIgc3BlYy1vcCAiIFwiIiBjb21wLW5hbWUgIlwiIgotICAgICAgICAgICAg ICAgICAgICAgICAgICAiIFwiIiBzcGVjLW5hbWUgIi0iIHNwZWMtdmVyICJcIikiKSkKKyAgICAg ICAgICAoY29uZAorICAgICAgICAgICAoKG5vdCAoc3RyaW5nPSBzcGVjLW5hbWUgY29tcC1uYW1l KSkgI2YpCisgICAgICAgICAgICgoc3RyaW5nPSBzcGVjLW9wICI9PSIpIChzdHJpbmc9IHNwZWMt dmVyIGNvbXAtdmVyKSkKKyAgICAgICAgICAgKChzdHJpbmc9IHNwZWMtb3AgIj49IikgKHZlcnNp b24+PT8gY29tcC12ZXIgc3BlYy12ZXIpKQorICAgICAgICAgICAoKHN0cmluZz0gc3BlYy1vcCAi PiIpICh2ZXJzaW9uPj8gY29tcC12ZXIgc3BlYy12ZXIpKQorICAgICAgICAgICAoKHN0cmluZz0g c3BlYy1vcCAiPD0iKSAobm90ICh2ZXJzaW9uPj8gY29tcC12ZXIgc3BlYy12ZXIpKSkKKyAgICAg ICAgICAgKChzdHJpbmc9IHNwZWMtb3AgIjwiKSAobm90ICh2ZXJzaW9uPj0/IGNvbXAtdmVyIHNw ZWMtdmVyKSkpCisgICAgICAgICAgIChlbHNlCisgICAgICAgICAgICAocmFpc2UgKGNvbmRpdGlv bgorICAgICAgICAgICAgICAgICAgICAoJm1lc3NhZ2UgKG1lc3NhZ2UgIkZhaWxlZCB0byBldmFs dWF0ZSAnaW1wbCcgdGVzdC4iKSkpKSkpCiAgICAgICAgICAgKHN0cmluZy1tYXRjaCBzcGVjLW5h bWUgY29tcC1uYW1lKSkpKQotICAKKwogICAoZGVmaW5lIChjYWJhbC1mbGFncykKICAgICAobWFr ZS1jYWJhbC1zZWN0aW9uIGNhYmFsLXNleHAgJ2ZsYWcpKQogICAKLS0gCjIuNC4zCgo= --001a11441afc5a073e05256053c3 Content-Type: text/x-diff; charset=US-ASCII; name="0003-import-hackage-Make-it-resilient-to-missing-final-ne.patch" Content-Disposition: attachment; filename="0003-import-hackage-Make-it-resilient-to-missing-final-ne.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iheye4hf2 RnJvbSA2MTRmOWE5YjY4NWJjZWZhNGUzNTViOGMyNTkyMjViMGYwOThiYzcyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGZWRlcmljbyBCZWZmYSA8YmVmZmFAZmJlbmdpbmVlcmluZy5j aD4KRGF0ZTogV2VkLCAxMSBOb3YgMjAxNSAxNTozMTo0NiArMDEwMApTdWJqZWN0OiBbUEFUQ0gg My84XSBpbXBvcnQ6IGhhY2thZ2U6IE1ha2UgaXQgcmVzaWxpZW50IHRvIG1pc3NpbmcgZmluYWwK IG5ld2xpbmUuCgoqIGd1aXgvaW1wb3J0L2NhYmFsLnNjbSAocGVlay1uZXh0LWxpbmUtaW5kZW50 KTogQ2hlY2sgZm9yIG1pc3NpbmcgZmluYWwKICBuZXdsaW5lLgotLS0KIGd1aXgvaW1wb3J0L2Nh YmFsLnNjbSB8IDMxICsrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCAxOCBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ndWl4 L2ltcG9ydC9jYWJhbC5zY20gYi9ndWl4L2ltcG9ydC9jYWJhbC5zY20KaW5kZXggZWQ2Mzk0ZS4u MGMyNmU0MCAxMDA2NDQKLS0tIGEvZ3VpeC9pbXBvcnQvY2FiYWwuc2NtCisrKyBiL2d1aXgvaW1w b3J0L2NhYmFsLnNjbQpAQCAtMjI3LDE5ICsyMjcsMjQgQEAgdG8gdGhlIHN0YWNrLiIKICAgIlRo aXMgZnVuY3Rpb24gY2FuIGJlIGNhbGxlZCB3aGVuIHRoZSBuZXh0IGNoYXJhY3RlciBvbiBQT1JU IGlzICNcbmV3bGluZQogYW5kIHJldHVybnMgdGhlIGluZGVudGF0aW9uIG9mIHRoZSBsaW5lIHN0 YXJ0aW5nIGFmdGVyIHRoZSAjXG5ld2xpbmUKIGNoYXJhY3Rlci4gIERpc2NhcmQgKGFuZCBjb25z dW1lKSBlbXB0eSBhbmQgY29tbWVudCBsaW5lcy4iCi0gIChsZXQgKChpbml0aWFsLW5ld2xpbmUg KHN0cmluZyAocmVhZC1jaGFyIHBvcnQpKSkpCi0gICAgKGxldCBsb29wICgoY2hhciAocGVlay1j aGFyIHBvcnQpKQotICAgICAgICAgICAgICAgKHdvcmQgIiIpKQotICAgICAgKGNvbmQgKChlcXY/ IGNoYXIgI1xuZXdsaW5lKSAocmVhZC1jaGFyIHBvcnQpCi0gICAgICAgICAgICAgKGxvb3AgKHBl ZWstY2hhciBwb3J0KSAiIikpCi0gICAgICAgICAgICAoKG9yIChlcXY/IGNoYXIgI1xzcGFjZSkg KGVxdj8gY2hhciAjXHRhYikpCi0gICAgICAgICAgICAgKGxldCAoKGMgKHJlYWQtY2hhciBwb3J0 KSkpCi0gICAgICAgICAgICAgICAobG9vcCAocGVlay1jaGFyIHBvcnQpIChzdHJpbmctYXBwZW5k IHdvcmQgKHN0cmluZyBjKSkpKSkKLSAgICAgICAgICAgICgoY29tbWVudC1saW5lIHBvcnQgY2hh cikgKGxvb3AgKHBlZWstY2hhciBwb3J0KSAiIikpCi0gICAgICAgICAgICAoZWxzZQotICAgICAg ICAgICAgIChsZXQgKChsZW4gKHN0cmluZy1sZW5ndGggd29yZCkpKQotICAgICAgICAgICAgICAg KHVucmVhZC1zdHJpbmcgKHN0cmluZy1hcHBlbmQgaW5pdGlhbC1uZXdsaW5lIHdvcmQpIHBvcnQp Ci0gICAgICAgICAgICAgICBsZW4pKSkpKSkKKyAgKGlmIChlb2Ytb2JqZWN0PyAocGVlay1jaGFy IHBvcnQpKQorICAgICAgOzsgSWYgdGhlIGZpbGUgaXMgbWlzc2luZyB0aGUgI1xuZXdsaW5lIG9u IHRoZSBsYXN0IGxpbmUsIGFkZCBpdCBhbmQgYWN0CisgICAgICA7OyBhcyBpZiBpdCB3ZXJlIHRo ZXJlLiBUaGlzIGlzIG5lZWRlZCBmb3IgcHJvcGVyIG9wZXJhdGlvbiBvZgorICAgICAgOzsgaW5k ZW50YXRpb24gYmFzZWQgYmxvY2sgcmVjb2duaXRpb24uCisgICAgICAoYmVnaW4gKHVucmVhZC1j aGFyICNcbmV3bGluZSBwb3J0KSAocmVhZC1jaGFyIHBvcnQpIDApCisgICAgICAobGV0ICgoaW5p dGlhbC1uZXdsaW5lIChzdHJpbmcgKHJlYWQtY2hhciBwb3J0KSkpKQorICAgICAgICAobGV0IGxv b3AgKChjaGFyIChwZWVrLWNoYXIgcG9ydCkpCisgICAgICAgICAgICAgICAgICAgKHdvcmQgIiIp KQorICAgICAgICAgIChjb25kICgoZXF2PyBjaGFyICNcbmV3bGluZSkgKHJlYWQtY2hhciBwb3J0 KQorICAgICAgICAgICAgICAgICAobG9vcCAocGVlay1jaGFyIHBvcnQpICIiKSkKKyAgICAgICAg ICAgICAgICAoKG9yIChlcXY/IGNoYXIgI1xzcGFjZSkgKGVxdj8gY2hhciAjXHRhYikpCisgICAg ICAgICAgICAgICAgIChsZXQgKChjIChyZWFkLWNoYXIgcG9ydCkpKQorICAgICAgICAgICAgICAg ICAgIChsb29wIChwZWVrLWNoYXIgcG9ydCkgKHN0cmluZy1hcHBlbmQgd29yZCAoc3RyaW5nIGMp KSkpKQorICAgICAgICAgICAgICAgICgoY29tbWVudC1saW5lIHBvcnQgY2hhcikgKGxvb3AgKHBl ZWstY2hhciBwb3J0KSAiIikpCisgICAgICAgICAgICAgICAgKGVsc2UKKyAgICAgICAgICAgICAg ICAgKGxldCAoKGxlbiAoc3RyaW5nLWxlbmd0aCB3b3JkKSkpCisgICAgICAgICAgICAgICAgICAg KHVucmVhZC1zdHJpbmcgKHN0cmluZy1hcHBlbmQgaW5pdGlhbC1uZXdsaW5lIHdvcmQpIHBvcnQp CisgICAgICAgICAgICAgICAgICAgbGVuKSkpKSkpKQogCiAoZGVmaW5lKiAocmVhZC12YWx1ZSBw b3J0IHZhbHVlIG1pbi1pbmRlbnQgIzpvcHRpb25hbCAoc2VwYXJhdG9yICIgIikpCiAgICJUaGUg bmV4dCBjaGFyYWN0ZXIgb24gUE9SVCBtdXN0IGJlICNcbmV3bGluZS4gIEFwcGVuZCB0byBWQUxV RSB0aGUKLS0gCjIuNC4zCgo= --001a11441afc5a073e05256053c3 Content-Type: text/x-diff; charset=US-ASCII; name="0004-import-hackage-Make-parsing-of-tests-and-fields-more.patch" Content-Disposition: attachment; filename="0004-import-hackage-Make-parsing-of-tests-and-fields-more.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iheye4hl3 RnJvbSA4MWU1NWI0OTYxOTVjYzllOWFhNDFhMmNmNTcxMTczMjZjZjkzMjQ1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGZWRlcmljbyBCZWZmYSA8YmVmZmFAZmJlbmdpbmVlcmluZy5j aD4KRGF0ZTogV2VkLCAxMSBOb3YgMjAxNSAxNjoyMDo0NSArMDEwMApTdWJqZWN0OiBbUEFUQ0gg NC84XSBpbXBvcnQ6IGhhY2thZ2U6IE1ha2UgcGFyc2luZyBvZiB0ZXN0cyBhbmQgZmllbGRzIG1v cmUKIGZsZXhpYmxlLgoKKiBndWl4L2ltcG9ydC9jYWJhbC5zY20gKGlzLXRlc3QpOiBBbGxvdyBz cGFjZXMgYmV0d2VlbiBrZXl3b3JkIGFuZAogIHBhcmVudGhlc2VzLgogIChpcy1pZCk6IEFkZCBh cmd1bWVudCAncG9ydCcuICBBbGxvdyBzcGFjZXMgYmV0d2VlbiBrZXl3b3JkIGFuZCBjb2x1bW4u CiAgKGxleC13b3JkKTogQWRqdXN0IGNhbGwgdG8gJ2lzLWlkJy4KLS0tCiBndWl4L2ltcG9ydC9j YWJhbC5zY20gfCAxOSArKysrKysrKysrKysrLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTMgaW5z ZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ndWl4L2ltcG9ydC9jYWJh bC5zY20gYi9ndWl4L2ltcG9ydC9jYWJhbC5zY20KaW5kZXggMGMyNmU0MC4uNzc1NWUzYyAxMDA2 NDQKLS0tIGEvZ3VpeC9pbXBvcnQvY2FiYWwuc2NtCisrKyBiL2d1aXgvaW1wb3J0L2NhYmFsLnNj bQpAQCAtMzMzLDcgKzMzMyw3IEBAIG1hdGNoaW5nIGEgc3RyaW5nIGFnYWluc3QgdGhlIGNyZWF0 ZWQgcmVnZXhwLiIKICAgICAgICAgICAgICAgICAobWFrZS1yZWdleHAgcGF0KSkpKQogICAgIChj dXQgcmVnZXhwLWV4ZWMgcnggPD4pKSkKIAotKGRlZmluZSBpcy1wcm9wZXJ0eSAobWFrZS1yeC1t YXRjaGVyICIoW2EtejAtOS1dKyk6WyBcdF0qKFxcdz8uKikkIgorKGRlZmluZSBpcy1wcm9wZXJ0 eSAobWFrZS1yeC1tYXRjaGVyICIoW2EtejAtOS1dKylbIFx0XSo6WyBcdF0qKFxcdz8uKikkIgog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlZ2V4cC9pY2FzZSkpCiAKIChk ZWZpbmUgaXMtZmxhZyAobWFrZS1yeC1tYXRjaGVyICJeZmxhZyArKFthLXowLTlfLV0rKSIKQEAg LTM2NiwxNyArMzY2LDI0IEBAIG1hdGNoaW5nIGEgc3RyaW5nIGFnYWluc3QgdGhlIGNyZWF0ZWQg cmVnZXhwLiIKIAogKGRlZmluZSAoaXMtb3IgcykgKHN0cmluZz0/IHMgInx8IikpCiAKLShkZWZp bmUgKGlzLWlkIHMpCisoZGVmaW5lIChpcy1pZCBzIHBvcnQpCiAgIChsZXQgKChjYWJhbC1yZXNl cnZlZC13b3JkcwogICAgICAgICAgJygiaWYiICJlbHNlIiAibGlicmFyeSIgImZsYWciICJleGVj dXRhYmxlIiAidGVzdC1zdWl0ZSIKLSAgICAgICAgICAgInNvdXJjZS1yZXBvc2l0b3J5IiAiYmVu Y2htYXJrIikpKQorICAgICAgICAgICAic291cmNlLXJlcG9zaXRvcnkiICJiZW5jaG1hcmsiKSkK KyAgICAgICAgKHNwYWNlcyAocmVhZC13aGlsZSAoY3V0IGNoYXItc2V0LWNvbnRhaW5zPyBjaGFy LXNldDpibGFuayA8PikgcG9ydCkpCisgICAgICAgIChjIChwZWVrLWNoYXIgcG9ydCkpKQorICAg ICh1bnJlYWQtc3RyaW5nIHNwYWNlcyBwb3J0KQogICAgIChhbmQgKGV2ZXJ5IChjdXQgc3RyaW5n LWNpPD4gcyA8PikgY2FiYWwtcmVzZXJ2ZWQtd29yZHMpCi0gICAgICAgICAobm90IChjaGFyPT8g KGxhc3QgKHN0cmluZy0+bGlzdCBzKSkgI1w6KSkpKSkKKyAgICAgICAgIChhbmQgKG5vdCAoY2hh cj0/IChsYXN0IChzdHJpbmctPmxpc3QgcykpICNcOikpCisgICAgICAgICAgICAgIChub3QgKGNo YXI9PyAjXDogYykpKSkpKQogCiAoZGVmaW5lIChpcy10ZXN0IHMgcG9ydCkKICAgKGxldCAoKHRl c3RzLXJ4IChtYWtlLXJlZ2V4cCAib3N8YXJjaHxmbGFnfGltcGwiKSkKKyAgICAgICAgKHNwYWNl cyAocmVhZC13aGlsZSAoY3V0IGNoYXItc2V0LWNvbnRhaW5zPyBjaGFyLXNldDpibGFuayA8Pikg cG9ydCkpCiAgICAgICAgIChjIChwZWVrLWNoYXIgcG9ydCkpKQotICAgIChhbmQgKHJlZ2V4cC1l eGVjIHRlc3RzLXJ4IHMpIChjaGFyPT8gI1woIGMpKSkpCisgICAgKGlmIChhbmQgKHJlZ2V4cC1l eGVjIHRlc3RzLXJ4IHMpIChjaGFyPT8gI1woIGMpKQorICAgICAgICAjdAorICAgICAgICAoYmVn aW4gKHVucmVhZC1zdHJpbmcgc3BhY2VzIHBvcnQpICNmKSkpKQogCiA7OyBMZXhlcnMgZm9yIGlu ZGl2aWR1YWwgdG9rZW5zLgogCkBAIC01MDksNyArNTE2LDcgQEAgTE9DIGlzIHRoZSBjdXJyZW50 IHBvcnQgbG9jYXRpb24uIgogICAgICAgICAgICgoaXMtZmFsc2UgdykgKGxleC1mYWxzZSBsb2Mp KQogICAgICAgICAgICgoaXMtYW5kIHcpIChsZXgtYW5kIGxvYykpCiAgICAgICAgICAgKChpcy1v ciB3KSAobGV4LW9yIGxvYykpCi0gICAgICAgICAgKChpcy1pZCB3KSAobGV4LWlkIHcgbG9jKSkK KyAgICAgICAgICAoKGlzLWlkIHcgcG9ydCkgKGxleC1pZCB3IGxvYykpCiAgICAgICAgICAgKGVs c2UgKHVucmVhZC1zdHJpbmcgdyBwb3J0KSAjZikpKSkKIAogKGRlZmluZSAobGV4LWxpbmUgcG9y dCBsb2MpCi0tIAoyLjQuMwoK --001a11441afc5a073e05256053c3 Content-Type: text/x-diff; charset=US-ASCII; name="0005-utils-Add-canonical-newline-port.patch" Content-Disposition: attachment; filename="0005-utils-Add-canonical-newline-port.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iheye4hs4 RnJvbSBiZGQ0YWExOGUzZjNhNjg2Y2VhZTkwNDBjOGI3NDA0OTg0ODg2YWNlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGZWRlcmljbyBCZWZmYSA8YmVmZmFAZmJlbmdpbmVlcmluZy5j aD4KRGF0ZTogU2F0LCAxNCBOb3YgMjAxNSAxNTowMDozNiArMDEwMApTdWJqZWN0OiBbUEFUQ0gg NS84XSB1dGlsczogQWRkICdjYW5vbmljYWwtbmV3bGluZS1wb3J0Jy4KCiogZ3VpeC91dGlscy5z Y20gKGNhbm9uaWNhbC1uZXdsaW5lLXBvcnQpOiBOZXcgcHJvY2VkdXJlLgoqIHRlc3RzL3V0aWxz LnNjbSAoImNhbm9uaWNhbC1uZXdsaW5lLXBvcnQiKTogTmV3IHRlc3QuCi0tLQogZ3VpeC91dGls cy5zY20gIHwgMzQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLQogdGVzdHMvdXRp bHMuc2NtIHwgIDYgKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDM4IGluc2VydGlvbnMoKyksIDIg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ3VpeC91dGlscy5zY20gYi9ndWl4L3V0aWxzLnNj bQppbmRleCAxNTQyZTg2Li43YjU4OWU2IDEwMDY0NAotLS0gYS9ndWl4L3V0aWxzLnNjbQorKysg Yi9ndWl4L3V0aWxzLnNjbQpAQCAtMjksNyArMjksOCBAQAogICAjOnVzZS1tb2R1bGUgKHNyZmkg c3JmaS0zOSkKICAgIzp1c2UtbW9kdWxlIChzcmZpIHNyZmktNjApCiAgICM6dXNlLW1vZHVsZSAo cm5ycyBieXRldmVjdG9ycykKLSAgIzp1c2UtbW9kdWxlICgocm5ycyBpbyBwb3J0cykgIzpzZWxl Y3QgKHB1dC1ieXRldmVjdG9yKSkKKyAgIzp1c2UtbW9kdWxlIChybnJzIGlvIHBvcnRzKQorICAj OnVzZS1tb2R1bGUgKChybnJzIGJ5dGV2ZWN0b3JzKSAjOnNlbGVjdCAoYnl0ZXZlY3Rvci11OC1z ZXQhKSkKICAgIzp1c2UtbW9kdWxlICgoZ3VpeCBidWlsZCB1dGlscykKICAgICAgICAgICAgICAg ICAjOnNlbGVjdCAoZHVtcC1wb3J0IHBhY2thZ2UtbmFtZS0+bmFtZSt2ZXJzaW9uKSkKICAgIzp1 c2UtbW9kdWxlICgoZ3VpeCBidWlsZCBzeXNjYWxscykgIzpzZWxlY3QgKGVycm5vIG1rZHRlbXAh KSkKQEAgLTkwLDcgKzkxLDggQEAKICAgICAgICAgICAgIGRlY29tcHJlc3NlZC1wb3J0CiAgICAg ICAgICAgICBjYWxsLXdpdGgtZGVjb21wcmVzc2VkLXBvcnQKICAgICAgICAgICAgIGNvbXByZXNz ZWQtb3V0cHV0LXBvcnQKLSAgICAgICAgICAgIGNhbGwtd2l0aC1jb21wcmVzc2VkLW91dHB1dC1w b3J0KSkKKyAgICAgICAgICAgIGNhbGwtd2l0aC1jb21wcmVzc2VkLW91dHB1dC1wb3J0CisgICAg ICAgICAgICBjYW5vbmljYWwtbmV3bGluZS1wb3J0KSkKIAogDAogOzs7CkBAIC03NDYsNiArNzQ4 LDM0IEBAIGVsZW1lbnRzIGFmdGVyIEUuIgogICAgICAgICAgICAgKGlmIHN1Y2Nlc3M/CiAgICAg ICAgICAgICAgICAgKGxvb3AgKGFic29sdXRlIHRhcmdldCkgKCsgZGVwdGggMSkpCiAgICAgICAg ICAgICAgICAgZmlsZSkpKSkpKQorCisoZGVmaW5lIChjYW5vbmljYWwtbmV3bGluZS1wb3J0IHBv cnQpCisgICJSZXR1cm4gYW4gaW5wdXQgcG9ydCB0aGF0IHdyYXBzIFBPUlQgc3VjaCB0aGF0IGFs bCBuZXdsaW5lcyBjb25zaXN0CisgIG9mIGEgc2luZ2xlIGNhcnJpYWdlIHJldHVybi4iCisgIChk ZWZpbmUgKGdldC1wb3NpdGlvbikKKyAgICAoaWYgKHBvcnQtaGFzLXBvcnQtcG9zaXRpb24/IHBv cnQpIChwb3J0LXBvc2l0aW9uIHBvcnQpICNmKSkKKyAgKGRlZmluZSAoc2V0LXBvc2l0aW9uISBw b3NpdGlvbikKKyAgICAoaWYgKHBvcnQtaGFzLXNldC1wb3J0LXBvc2l0aW9uIT8gcG9ydCkKKyAg ICAgICAgKHNldC1wb3J0LXBvc2l0aW9uISBwb3NpdGlvbiBwb3J0KQorICAgICAgICAjZikpCisg IChkZWZpbmUgKGNsb3NlKSAoY2xvc2UtcG9ydCBwb3J0KSkKKyAgKGRlZmluZSAocmVhZCEgYnYg c3RhcnQgbikKKyAgICAobGV0IGxvb3AgKChjb3VudCAwKQorICAgICAgICAgICAgICAgKGJ5dGUg KGdldC11OCBwb3J0KSkpCisgICAgICAoY29uZCAoKGVvZi1vYmplY3Q/IGJ5dGUpIGNvdW50KQor ICAgICAgICAgICAgKCg9IGNvdW50ICgtIG4gMSkpCisgICAgICAgICAgICAgKGJ5dGV2ZWN0b3It dTgtc2V0ISBidiAoKyBzdGFydCBjb3VudCkgYnl0ZSkKKyAgICAgICAgICAgICBuKQorICAgICAg ICAgICAgOzsgWFhYOiBjb25zdW1lIGFsbCBMRnMgZXZlbiBpZiBub3QgZm9sbG93ZWQgYnkgQ1Iu CisgICAgICAgICAgICAoKGVxdj8gYnl0ZSAoY2hhci0+aW50ZWdlciAjXHJldHVybikpIChsb29w IGNvdW50IChnZXQtdTggcG9ydCkpKQorICAgICAgICAgICAgKGVsc2UKKyAgICAgICAgICAgICAo Ynl0ZXZlY3Rvci11OC1zZXQhIGJ2ICgrIHN0YXJ0IGNvdW50KSBieXRlKQorICAgICAgICAgICAg IChsb29wICgrIGNvdW50IDEpIChnZXQtdTggcG9ydCkpKSkpKQorICAobWFrZS1jdXN0b20tYmlu YXJ5LWlucHV0LXBvcnQgImNhbm9uaWNhbC1uZXdsaW5lLXBvcnQiCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICByZWFkIQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Z2V0LXBvc2l0aW9uCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZXQtcG9zaXRp b24hCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjbG9zZSkpCiAMCiA7OzsKIDs7 OyBTb3VyY2UgbG9jYXRpb24uCmRpZmYgLS1naXQgYS90ZXN0cy91dGlscy5zY20gYi90ZXN0cy91 dGlscy5zY20KaW5kZXggYjY1ZDZkMi4uMDRhODU5ZiAxMDA2NDQKLS0tIGEvdGVzdHMvdXRpbHMu c2NtCisrKyBiL3Rlc3RzL3V0aWxzLnNjbQpAQCAtMzE4LDYgKzMxOCwxMiBAQAogICAgKHN0cmlu Zy1hcHBlbmQgKCVzdG9yZS1wcmVmaXgpCiAgICAgICAgICAgICAgICAgICAiL3F2czJyajJpYTV2 Y2kzd3NkYjdxdnlkcm1hY2lnNHBnLWJhc2gtNC4yLXAyNCIpKSkKIAorKHRlc3QtZXF1YWwgImNh bm9uaWNhbC1uZXdsaW5lLXBvcnQiCisgICJUaGlzIGlzIGEgam91cm5leVxuSW50byB0aGUgc291 bmRcbkEgam91cm5leSAuLi5cbiIKKyAgKGxldCAoKHBvcnQgKG9wZW4tc3RyaW5nLWlucHV0LXBv cnQKKyAgICAgICAgICAgICAgICJUaGlzIGlzIGEgam91cm5leVxyXG5JbnRvIHRoZSBzb3VuZFxy XG5BIGpvdXJuZXkgLi4uXG4iKSkpCisgICAgKGdldC1zdHJpbmctYWxsIChjYW5vbmljYWwtbmV3 bGluZS1wb3J0IHBvcnQpKSkpCisKICh0ZXN0LWVuZCkKIAogKGZhbHNlLWlmLWV4Y2VwdGlvbiAo ZGVsZXRlLWZpbGUgdGVtcC1maWxlKSkKLS0gCjIuNC4zCgo= --001a11441afc5a073e05256053c3 Content-Type: text/x-diff; charset=US-ASCII; name="0006-import-hackage-Handle-CRLF-end-of-line-style.patch" Content-Disposition: attachment; filename="0006-import-hackage-Handle-CRLF-end-of-line-style.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iheye4i35 RnJvbSAzMmI4NDhlMDUwNmQ2ZGVhYzBiZDExMzAyMzRlMDJmYjY0NTYxM2VlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGZWRlcmljbyBCZWZmYSA8YmVmZmFAZmJlbmdpbmVlcmluZy5j aD4KRGF0ZTogU2F0LCAxNCBOb3YgMjAxNSAxNToxNTowMCArMDEwMApTdWJqZWN0OiBbUEFUQ0gg Ni84XSBpbXBvcnQ6IGhhY2thZ2U6IEhhbmRsZSBDUkxGIGVuZCBvZiBsaW5lIHN0eWxlLgoKKiBn dWl4L2ltcG9ydC9oYWNrYWdlLnNjbSAoaGFja2FnZS1mZXRjaCwgaGFja2FnZS0+Z3VpeC1wYWNr YWdlKTogVXNlCiAgJ2Nhbm9uaWNhbC1uZXdsaW5lLXBvcnQnLgotLS0KIGd1aXgvaW1wb3J0L2hh Y2thZ2Uuc2NtIHwgOCArKysrKy0tLQogMSBmaWxlIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwg MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ndWl4L2ltcG9ydC9oYWNrYWdlLnNjbSBiL2d1 aXgvaW1wb3J0L2hhY2thZ2Uuc2NtCmluZGV4IDNiYWE1MTQuLjg3MjVmZmEgMTAwNjQ0Ci0tLSBh L2d1aXgvaW1wb3J0L2hhY2thZ2Uuc2NtCisrKyBiL2d1aXgvaW1wb3J0L2hhY2thZ2Uuc2NtCkBA IC0yMiw3ICsyMiw4IEBACiAgICM6dXNlLW1vZHVsZSAoc3JmaSBzcmZpLTExKQogICAjOnVzZS1t b2R1bGUgKHNyZmkgc3JmaS0xKQogICAjOnVzZS1tb2R1bGUgKChndWl4IGRvd25sb2FkKSAjOnNl bGVjdCAoZG93bmxvYWQtdG8tc3RvcmUpKQotICAjOnVzZS1tb2R1bGUgKChndWl4IHV0aWxzKSAj OnNlbGVjdCAocGFja2FnZS1uYW1lLT5uYW1lK3ZlcnNpb24pKQorICAjOnVzZS1tb2R1bGUgKChn dWl4IHV0aWxzKSAjOnNlbGVjdCAocGFja2FnZS1uYW1lLT5uYW1lK3ZlcnNpb24KKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNhbm9uaWNhbC1uZXdsaW5lLXBvcnQpKQog ICAjOnVzZS1tb2R1bGUgKGd1aXggaW1wb3J0IHV0aWxzKQogICAjOnVzZS1tb2R1bGUgKGd1aXgg aW1wb3J0IGNhYmFsKQogICAjOnVzZS1tb2R1bGUgKGd1aXggc3RvcmUpCkBAIC04NCw3ICs4NSw4 IEBAIHZlcnNpb24uIgogICAgIChjYWxsLXdpdGgtdGVtcG9yYXJ5LW91dHB1dC1maWxlCiAgICAg IChsYW1iZGEgKHRlbXAgcG9ydCkKICAgICAgICAoYW5kICh1cmwtZmV0Y2ggdXJsIHRlbXApCi0g ICAgICAgICAgICAoY2FsbC13aXRoLWlucHV0LWZpbGUgdGVtcCByZWFkLWNhYmFsKSkpKSkpCisg ICAgICAgICAgICAoY2FsbC13aXRoLWlucHV0LWZpbGUgdGVtcAorICAgICAgICAgICAgICAoY29t cG9zZSByZWFkLWNhYmFsIGNhbm9uaWNhbC1uZXdsaW5lLXBvcnQpKSkpKSkpCiAKIChkZWZpbmUg c3RyaW5nLT5saWNlbnNlCiAgIDs7IExpc3Qgb2YgdmFsaWQgdmFsdWVzIGZyb20KQEAgLTIxNiw3 ICsyMTgsNyBAQCB0byB0aGUgQ2FiYWwgZmlsZSBmb3JtYXQgZGVmaW5pdGlvbi4gIFRoZSBkZWZh dWx0IHZhbHVlIGFzc29jaWF0ZWQgd2l0aCB0aGUKIGtleXMgXCJvc1wiLCBcImFyY2hcIiBhbmQg XCJpbXBsXCIgaXMgXCJsaW51eFwiLCBcIng4Nl82NFwiIGFuZCBcImdoY1wiCiByZXNwZWN0aXZl bHkuIgogICAobGV0ICgoY2FiYWwtbWV0YSAoaWYgcG9ydAotICAgICAgICAgICAgICAgICAgICAg ICAgKHJlYWQtY2FiYWwgcG9ydCkKKyAgICAgICAgICAgICAgICAgICAgICAgIChyZWFkLWNhYmFs IChjYW5vbmljYWwtbmV3bGluZS1wb3J0IHBvcnQpKQogICAgICAgICAgICAgICAgICAgICAgICAg KGhhY2thZ2UtZmV0Y2ggcGFja2FnZS1uYW1lKSkpKQogICAgIChhbmQ9PiBjYWJhbC1tZXRhIChj b21wb3NlIChjdXQgaGFja2FnZS1tb2R1bGUtPnNleHAgPD4KICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICM6aW5jbHVkZS10ZXN0LWRlcGVuZGVuY2llcz8gCi0tIAoyLjQuMwoK --001a11441afc5a073e05256053c3 Content-Type: text/x-diff; charset=US-ASCII; name="0008-import-hackage-Assume-current-ghc-package-version.patch" Content-Disposition: attachment; filename="0008-import-hackage-Assume-current-ghc-package-version.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iheye4ii7 RnJvbSA1MDc0MDRjNTA4Nzc0ZTVlZGIxY2RhMTAyN2ZlZTEyZGFlMjYzNTkyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGZWRlcmljbyBCZWZmYSA8YmVmZmFAZmJlbmdpbmVlcmluZy5j aD4KRGF0ZTogV2VkLCAyNSBOb3YgMjAxNSAxNDo0NzoxNiArMDEwMApTdWJqZWN0OiBbUEFUQ0gg OC84XSBpbXBvcnQ6IGhhY2thZ2U6IEFzc3VtZSBjdXJyZW50ICdnaGMnIHBhY2thZ2UgdmVyc2lv bi4KCiogZ3VpeC9zY3JpcHRzL2ltcG9ydC9oYWNrYWdlLnNjbSAoJWRlZmF1bHQtb3B0aW9ucyk6 IERvIGl0LgogIChnaGMtZGVmYXVsdC12ZXJzaW9uKTogTmV3IHZhcmlhYmxlLgotLS0KIGd1aXgv c2NyaXB0cy9pbXBvcnQvaGFja2FnZS5zY20gfCA4ICsrKysrKy0tCiAxIGZpbGUgY2hhbmdlZCwg NiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2d1aXgvc2NyaXB0 cy9pbXBvcnQvaGFja2FnZS5zY20gYi9ndWl4L3NjcmlwdHMvaW1wb3J0L2hhY2thZ2Uuc2NtCmlu ZGV4IDk3ZDA0MmIuLjRlODQyNzggMTAwNjQ0Ci0tLSBhL2d1aXgvc2NyaXB0cy9pbXBvcnQvaGFj a2FnZS5zY20KKysrIGIvZ3VpeC9zY3JpcHRzL2ltcG9ydC9oYWNrYWdlLnNjbQpAQCAtMTksNiAr MTksNyBAQAogKGRlZmluZS1tb2R1bGUgKGd1aXggc2NyaXB0cyBpbXBvcnQgaGFja2FnZSkKICAg Izp1c2UtbW9kdWxlIChndWl4IHVpKQogICAjOnVzZS1tb2R1bGUgKGd1aXggdXRpbHMpCisgICM6 dXNlLW1vZHVsZSAoZ3VpeCBwYWNrYWdlcykKICAgIzp1c2UtbW9kdWxlIChndWl4IHNjcmlwdHMp CiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBpbXBvcnQgaGFja2FnZSkKICAgIzp1c2UtbW9kdWxlIChn dWl4IHNjcmlwdHMgaW1wb3J0KQpAQCAtMzQsMTAgKzM1LDEzIEBACiA7OzsgQ29tbWFuZC1saW5l IG9wdGlvbnMuCiA7OzsKIAorKGRlZmluZSBnaGMtZGVmYXVsdC12ZXJzaW9uCisgIChzdHJpbmct YXBwZW5kICJnaGMtIiAocGFja2FnZS12ZXJzaW9uIChAIChnbnUgcGFja2FnZXMgaGFza2VsbCkg Z2hjKSkpKQorCiAoZGVmaW5lICVkZWZhdWx0LW9wdGlvbnMKLSAgJygoaW5jbHVkZS10ZXN0LWRl cGVuZGVuY2llcz8gLiAjdCkKKyAgYCgoaW5jbHVkZS10ZXN0LWRlcGVuZGVuY2llcz8gLiAjdCkK ICAgICAocmVhZC1mcm9tLXN0ZGluPyAuICNmKQotICAgICgnY2FiYWwtZW52aXJvbm1lbnQgLiAn KCkpKSkKKyAgICAoY2FiYWwtZW52aXJvbm1lbnQgLiAsYCgoImltcGwiIC4gLGdoYy1kZWZhdWx0 LXZlcnNpb24pKSkpKQogCiAoZGVmaW5lIChzaG93LWhlbHApCiAgIChkaXNwbGF5IChfICJVc2Fn ZTogZ3VpeCBpbXBvcnQgaGFja2FnZSBQQUNLQUdFLU5BTUUKLS0gCjIuNC4zCgo= --001a11441afc5a073e05256053c3 Content-Type: text/x-diff; charset=US-ASCII; name="0007-import-hackage-Add-new-tests.patch" Content-Disposition: attachment; filename="0007-import-hackage-Add-new-tests.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iheytcbt7 RnJvbSBiZjBiYzY2YWNlM2IyNjE3MTc4YzI4ZDk2MzVkYmI0YmMzYTg5Y2U5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGZWRlcmljbyBCZWZmYSA8YmVmZmFAZmJlbmdpbmVlcmluZy5j aD4KRGF0ZTogV2VkLCAyNSBOb3YgMjAxNSAxMzo1ODowNiArMDEwMApTdWJqZWN0OiBbUEFUQ0gg Ny84XSBpbXBvcnQ6IGhhY2thZ2U6IEFkZCBuZXcgdGVzdHMuCgoqIHRlc3RzL2hhY2thZ2Uuc2Nt IChldmFsLXRlc3Qtd2l0aC1jYWJhbCk6IEFkZCBvcHRpb25hbCBhcmd1bWVudC4KICAodGVzdC1j YWJhbC0zKTogTmV3IHZhcmlhYmxlIGFuZCB0ZXN0LgogICh0ZXN0LXJlYWQtY2FiYWwtMSk6IEV4 ZXJjaXNlIG1vcmUgcGFyc2luZyB2YXJpYW50cy4KLS0tCiB0ZXN0cy9oYWNrYWdlLnNjbSB8IDM3 ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAz MCBpbnNlcnRpb25zKCspLCA3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Rlc3RzL2hhY2th Z2Uuc2NtIGIvdGVzdHMvaGFja2FnZS5zY20KaW5kZXggMjI5YmVlMy4uYjYwOGNjZCAxMDA2NDQK LS0tIGEvdGVzdHMvaGFja2FnZS5zY20KKysrIGIvdGVzdHMvaGFja2FnZS5zY20KQEAgLTUwLDgg KzUwLDI4IEBAIGJ1aWxkLWRlcGVuZHM6CiB9CiAiKQogCis7OyBDaGVjayBjb21waWxlciBpbXBs ZW1lbnRhdGlvbiB0ZXN0IHdpdGggYW5kIHdpdGhvdXQgc3BhY2VzLgorKGRlZmluZSB0ZXN0LWNh YmFsLTMKKyAgIm5hbWU6IGZvbwordmVyc2lvbjogMS4wLjAKK2hvbWVwYWdlOiBodHRwOi8vdGVz dC5vcmcKK3N5bm9wc2lzOiBzeW5vcHNpcworZGVzY3JpcHRpb246IGRlc2NyaXB0aW9uCitsaWNl bnNlOiBCU0QzCitsaWJyYXJ5CisgIGlmIGltcGwoZ2hjID49IDcuMiAmJiA8IDcuNikKKyAgICBC dWlsZC1kZXBlbmRzOiBnaGMtYQorICBpZiBpbXBsKGdoYz49Ny4yJiY8Ny42KQorICAgIEJ1aWxk LWRlcGVuZHM6IGdoYy1iCisgIGlmIGltcGwoZ2hjID09IDcuOCkKKyAgICBCdWlsZC1kZXBlbmRz OiAKKyAgICAgIEhUVFAgICAgICAgPj0gNDAwMC4yLjUgJiYgPCA0MDAwLjMsCisgICAgICBtdGwg ICAgICAgID49IDIuMCAgICAgICYmIDwgMworIikKKwogOzsgQSBmcmFnbWVudCBvZiBhIHJlYWwg Q2FiYWwgZmlsZSB3aXRoIG1pbm9yIG1vZGlmaWNhdGlvbiB0byBjaGVjayBwcmVjZWRlbmNlCi07 OyBvZiAnYW5kJyBvdmVyICdvcicuCis7OyBvZiAnYW5kJyBvdmVyICdvcicsIG1pc3NpbmcgZmlu YWwgbmV3bGluZSwgc3BhY2VzIGJldHdlZW4ga2V5d29yZHMgYW5kCis7OyBwYXJlbnRoZXNlcyBh bmQgYmV0d2VlbiBrZXkgYW5kIGNvbHVtbi4KIChkZWZpbmUgdGVzdC1yZWFkLWNhYmFsLTEKICAg Im5hbWU6IHRlc3QtbWUKIGxpYnJhcnkKQEAgLTY2LDI0ICs4NiwyMyBAQCBsaWJyYXJ5CiAgICAg ICAgIEJ1aWxkLWRlcGVuZHM6IGJhc2UgPj0gMyAmJiA8IDQKICAgICAgIGVsc2UKICAgICAgICAg QnVpbGQtZGVwZW5kczogYmFzZSA8IDMKLSAgaWYgZmxhZyhiYXNlNHBvaW50OCkgfHwgZmxhZyhi YXNlNCkgJiYgZmxhZyhiYXNlMykKKyAgaWYgZmxhZyhiYXNlNHBvaW50OCkgfHwgZmxhZyAoYmFz ZTQpICYmIGZsYWcoYmFzZTMpCiAgICAgQnVpbGQtZGVwZW5kczogcmFuZG9tCi0gIEJ1aWxkLWRl cGVuZHM6IGNvbnRhaW5lcnMKKyAgQnVpbGQtZGVwZW5kcyA6IGNvbnRhaW5lcnMKIAogICAtLSBN b2R1bGVzIHRoYXQgYXJlIGFsd2F5cyBidWlsdC4KICAgRXhwb3NlZC1Nb2R1bGVzOgotICAgIFRl c3QuUXVpY2tDaGVjay5FeGNlcHRpb24KLSIpCisgICAgVGVzdC5RdWlja0NoZWNrLkV4Y2VwdGlv biIpCiAKICh0ZXN0LWJlZ2luICJoYWNrYWdlIikKIAotKGRlZmluZSAoZXZhbC10ZXN0LXdpdGgt Y2FiYWwgdGVzdC1jYWJhbCkKKyhkZWZpbmUqIChldmFsLXRlc3Qtd2l0aC1jYWJhbCB0ZXN0LWNh YmFsICM6a2V5IChjYWJhbC1lbnZpcm9ubWVudCAnKCkpKQogICAobW9jawogICAgKChndWl4IGlt cG9ydCBoYWNrYWdlKSBoYWNrYWdlLWZldGNoCiAgICAgKGxhbWJkYSAobmFtZS12ZXJzaW9uKQog ICAgICAgKGNhbGwtd2l0aC1pbnB1dC1zdHJpbmcgdGVzdC1jYWJhbAogICAgICAgICByZWFkLWNh YmFsKSkpCi0gICAobWF0Y2ggKGhhY2thZ2UtPmd1aXgtcGFja2FnZSAiZm9vIikKKyAgIChtYXRj aCAoaGFja2FnZS0+Z3VpeC1wYWNrYWdlICJmb28iICM6Y2FiYWwtZW52aXJvbm1lbnQgY2FiYWwt ZW52aXJvbm1lbnQpCiAgICAgICgoJ3BhY2thZ2UKICAgICAgICAgKCduYW1lICJnaGMtZm9vIikK ICAgICAgICAgKCd2ZXJzaW9uICIxLjAuMCIpCkBAIC0xMTYsNiArMTM1LDEwIEBAIGxpYnJhcnkK ICh0ZXN0LWFzc2VydCAiaGFja2FnZS0+Z3VpeC1wYWNrYWdlIHRlc3QgMiIKICAgKGV2YWwtdGVz dC13aXRoLWNhYmFsIHRlc3QtY2FiYWwtMikpCiAKKyh0ZXN0LWFzc2VydCAiaGFja2FnZS0+Z3Vp eC1wYWNrYWdlIHRlc3QgMyIKKyAgKGV2YWwtdGVzdC13aXRoLWNhYmFsIHRlc3QtY2FiYWwtMwor ICAgICAgICAgICAgICAgICAgICAgICAgIzpjYWJhbC1lbnZpcm9ubWVudCAnKCgiaW1wbCIgLiAi Z2hjLTcuOCIpKSkpCisKICh0ZXN0LWFzc2VydCAicmVhZC1jYWJhbCB0ZXN0IDEiCiAgIChtYXRj aCAoY2FsbC13aXRoLWlucHV0LXN0cmluZyB0ZXN0LXJlYWQtY2FiYWwtMSByZWFkLWNhYmFsKQog ICAgICgoKCJuYW1lIiAoInRlc3QtbWUiKSkKLS0gCjIuNC4zCgo= --001a11441afc5a073e05256053c3--