From mboxrd@z Thu Jan 1 00:00:00 1970 From: Federico Beffa Subject: [PATCH 4/6] gnu: Add emacs-constants. Date: Wed, 30 Dec 2015 18:33:24 +0100 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a1141665a685037052820ef80 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aEKco-0004vW-7s for guix-devel@gnu.org; Wed, 30 Dec 2015 12:33:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aEKcm-0007ey-MZ for guix-devel@gnu.org; Wed, 30 Dec 2015 12:33:26 -0500 Received: from mail-vk0-x230.google.com ([2607:f8b0:400c:c05::230]:36408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aEKcm-0007eo-Hr for guix-devel@gnu.org; Wed, 30 Dec 2015 12:33:24 -0500 Received: by mail-vk0-x230.google.com with SMTP id f2so168190728vkb.3 for ; Wed, 30 Dec 2015 09:33:24 -0800 (PST) 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 --001a1141665a685037052820ef80 Content-Type: text/plain; charset=UTF-8 If found a few times the need to download a single, uncompressed file which needs to be patched. The available fetch methods do not appear to be appropriate. So, I've added the function 'uncompressed-file-fetch'. This and the function 'broken-tarball-fetch' which currently resides in 'engineering.scm' should probably belong to '(guix build utils)'. Regards, Fede --001a1141665a685037052820ef80 Content-Type: text/x-diff; charset=US-ASCII; name="0004-gnu-Add-emacs-constants.patch" Content-Disposition: attachment; filename="0004-gnu-Add-emacs-constants.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iit3ea180 RnJvbSA2MDM1ZDRkZmQ3NTQyYTYxNWZiZDcwYmQ4MDUyN2MxNTQyNDE4NWEzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBGZWRlcmljbyBCZWZmYSA8YmVmZmFAZmJlbmdpbmVlcmluZy5j aD4KRGF0ZTogU2F0LCAyNiBEZWMgMjAxNSAxMTowMjowMSArMDEwMApTdWJqZWN0OiBbUEFUQ0gg NC82XSBnbnU6IEFkZCBlbWFjcy1jb25zdGFudHMuCgoqIGdudS9wYWNrYWdlcy9lbWFjcy5zY20g KGVtYWNzLWNvbnN0YW50cyk6IE5ldyB2YXJpYWJsZS4KKiBnbnUvcGFja2FnZXMvcGF0Y2hlcy9l bWFjcy1jb25zdGFudHMtbGlzcC1saWtlLnBhdGNoOiBOZXcgcGF0Y2guCiogZ251LXN5c3RlbS5h bSAoZGlzdF9wYXRjaF9EQVRBKTogQWRkIGl0LgotLS0KIGdudS1zeXN0ZW0uYW0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgIDEgKwogZ251L3BhY2thZ2VzL2VtYWNzLnNj bSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCA0MSArKysrKysrKysrKwogLi4uL3BhdGNo ZXMvZW1hY3MtY29uc3RhbnRzLWxpc3AtbGlrZS5wYXRjaCAgICAgICAgfCA4MSArKysrKysrKysr KysrKysrKysrKysrCiAzIGZpbGVzIGNoYW5nZWQsIDEyMyBpbnNlcnRpb25zKCspCiBjcmVhdGUg bW9kZSAxMDA2NDQgZ251L3BhY2thZ2VzL3BhdGNoZXMvZW1hY3MtY29uc3RhbnRzLWxpc3AtbGlr ZS5wYXRjaAoKZGlmZiAtLWdpdCBhL2dudS1zeXN0ZW0uYW0gYi9nbnUtc3lzdGVtLmFtCmluZGV4 IDgzYTdlOTIuLjAyZjc3YWUgMTAwNjQ0Ci0tLSBhL2dudS1zeXN0ZW0uYW0KKysrIGIvZ251LXN5 c3RlbS5hbQpAQCAtNDUwLDYgKzQ1MCw3IEBAIGRpc3RfcGF0Y2hfREFUQSA9CQkJCQkJXAogICBn bnUvcGFja2FnZXMvcGF0Y2hlcy9lbGZ1dGlscy10ZXN0cy1wdHJhY2UucGF0Y2gJCVwKICAgZ251 L3BhY2thZ2VzL3BhdGNoZXMvZW1hY3MtZXhlYy1wYXRoLnBhdGNoCQkJXAogICBnbnUvcGFja2Fn ZXMvcGF0Y2hlcy9lbWFjcy1zY2hlbWUtY29tcGxldGUtc2NoZW1lLXI1cnMtaW5mby5wYXRjaAlc CisgIGdudS9wYWNrYWdlcy9wYXRjaGVzL2VtYWNzLWNvbnN0YW50cy1saXNwLWxpa2UucGF0Y2gJ CVwKICAgZ251L3BhY2thZ2VzL3BhdGNoZXMvZXVkZXYtcnVsZXMtZGlyZWN0b3J5LnBhdGNoCQlc CiAgIGdudS9wYWNrYWdlcy9wYXRjaGVzL2V2aWx3bS1sb3N0LWZvY3VzLWJ1Zy5wYXRjaAkJXAog ICBnbnUvcGFja2FnZXMvcGF0Y2hlcy9leHBhdC1DVkUtMjAxNS0xMjgzLnBhdGNoCQlcCmRpZmYg LS1naXQgYS9nbnUvcGFja2FnZXMvZW1hY3Muc2NtIGIvZ251L3BhY2thZ2VzL2VtYWNzLnNjbQpp bmRleCAzYTdjNGFkLi5jYzZmZDg1IDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvZW1hY3Muc2Nt CisrKyBiL2dudS9wYWNrYWdlcy9lbWFjcy5zY20KQEAgLTI2LDYgKzI2LDkgQEAKICAgIzp1c2Ut bW9kdWxlIChndWl4IHBhY2thZ2VzKQogICAjOnVzZS1tb2R1bGUgKGd1aXggZG93bmxvYWQpCiAg ICM6dXNlLW1vZHVsZSAoZ3VpeCBnaXQtZG93bmxvYWQpCisgICM6dXNlLW1vZHVsZSAoZ3VpeCBn ZXhwKQorICAjOnVzZS1tb2R1bGUgKGd1aXggbW9uYWRzKQorICAjOnVzZS1tb2R1bGUgKGd1aXgg c3RvcmUpCiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBidWlsZC1zeXN0ZW0gZ251KQogICAjOnVzZS1t b2R1bGUgKGd1aXggYnVpbGQtc3lzdGVtIGVtYWNzKQogICAjOnVzZS1tb2R1bGUgKGd1aXggYnVp bGQtc3lzdGVtIGdsaWItb3ItZ3RrKQpAQCAtMTI0NSwzICsxMjQ4LDQxIEBAIHRvIGEga2V5IGlu IHlvdXIgcHJlZmVycmVkIG1vZGUuIikKICAgICAgIlRoaXMgcGFja2FnZSBwcm92aWRlcyBhIHNl dCBvZiBFbWFjcyBmdW5jdGlvbnMgdG8gc2VhcmNoIGRlZmluaXRpb25zIG9mCiBpZGVudGlmaWVy cyBpbiB0aGUgTUlULVNjaGVtZSBkb2N1bWVudGF0aW9uLiIpCiAgICAgKGxpY2Vuc2UgbGljZW5z ZTpncGwyKykpKQorCis7OzsgWFhYOiBtb3ZlIHRoaXMgcHJvY2VkdXJlIHRvIGFuIHV0aWxpdHkg bW9kdWxlCisoZGVmaW5lKiAodW5jb21wcmVzc2VkLWZpbGUtZmV0Y2ggdXJsIGhhc2gtYWxnbyBo YXNoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIzpvcHRpb25hbCBuYW1lCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIzprZXkgKHN5c3RlbSAoJWN1cnJlbnQt c3lzdGVtKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZ3VpbGUgKGRlZmF1 bHQtZ3VpbGUpKSkKKyAgKG1sZXQgJXN0b3JlLW1vbmFkICgoZHJ2ICh1cmwtZmV0Y2ggdXJsIGhh c2gtYWxnbyBoYXNoIG5hbWUKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IzpzeXN0ZW0gc3lzdGVtCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICM6 Z3VpbGUgZ3VpbGUpKSkKKyAgICAoZ2V4cC0+ZGVyaXZhdGlvbiAob3IgbmFtZSAoYmFzZW5hbWUg dXJsKSkKKyAgICAgICAgICAgICAgICAgICAgICAjfihiZWdpbgorICAgICAgICAgICAgICAgICAg ICAgICAgICAobWtkaXIgIyRvdXRwdXQpCisgICAgICAgICAgICAgICAgICAgICAgICAgIChzZXRl bnYgIlBBVEgiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBl bmQgIyRnemlwICIvYmluIikpCisgICAgICAgICAgICAgICAgICAgICAgICAgIChjaGRpciAjJG91 dHB1dCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgKGNvcHktZmlsZSAjJGRydiAoYmFzZW5h bWUgIyR1cmwpKSkpKSkKKworKGRlZmluZS1wdWJsaWMgZW1hY3MtY29uc3RhbnRzCisgIChwYWNr YWdlCisgICAgKG5hbWUgImVtYWNzLWNvbnN0YW50cyIpCisgICAgKHZlcnNpb24gIjIuMiIpCisg ICAgKHNvdXJjZQorICAgICAob3JpZ2luCisgICAgICAgKGZpbGUtbmFtZSAoc3RyaW5nLWFwcGVu ZCBuYW1lICItIiB2ZXJzaW9uICIuZWwiKSkKKyAgICAgICAobWV0aG9kIHVuY29tcHJlc3NlZC1m aWxlLWZldGNoKQorICAgICAgICh1cmkgImh0dHBzOi8vc3RhZmYuZm53aS51dmEubmwvYy5kb21p bmlrL1Rvb2xzL2NvbnN0YW50cy9jb25zdGFudHMuZWwiKQorICAgICAgIChwYXRjaGVzCisgICAg ICAgIChsaXN0IChzZWFyY2gtcGF0Y2ggImVtYWNzLWNvbnN0YW50cy1saXNwLWxpa2UucGF0Y2gi KSkpCisgICAgICAgKHNoYTI1NgorICAgICAgICAoYmFzZTMyCisgICAgICAgICAiMTRxMDk0YXBo c2pocThna2x2N2k1YTdieWwweWd6NjNjdjNuNmI1cDhqaTJqeTBtbm53MyIpKSkpCisgICAgKGJ1 aWxkLXN5c3RlbSBlbWFjcy1idWlsZC1zeXN0ZW0pCisgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9z dGFmZi5mbndpLnV2YS5ubC9jLmRvbWluaWsvVG9vbHMvY29uc3RhbnRzIikKKyAgICAoc3lub3Bz aXMgIkVudGVyIGRlZmluaXRpb24gb2YgY29uc3RhbnRzIGludG8gYW4gRW1hY3MgYnVmZmVyIikK KyAgICAoZGVzY3JpcHRpb24KKyAgICAgIlRoaXMgcGFja2FnZSBwcm92aWRlcyBmdW5jdGlvbnMg Zm9yIGluc2VydGluZyB0aGUgZGVmaW5pdGlvbiBvZiBuYXR1cmFsCitjb25zdGFudHMgYW5kIHVu aXRzIGludG8gYW4gRW1hY3MgYnVmZmVyLiIpCisgICAgKGxpY2Vuc2UgbGljZW5zZTpncGwyKykp KQpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3BhdGNoZXMvZW1hY3MtY29uc3RhbnRzLWxpc3At bGlrZS5wYXRjaCBiL2dudS9wYWNrYWdlcy9wYXRjaGVzL2VtYWNzLWNvbnN0YW50cy1saXNwLWxp a2UucGF0Y2gKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNWVjMzdmMwotLS0g L2Rldi9udWxsCisrKyBiL2dudS9wYWNrYWdlcy9wYXRjaGVzL2VtYWNzLWNvbnN0YW50cy1saXNw LWxpa2UucGF0Y2gKQEAgLTAsMCArMSw4MSBAQAorQWRkIFNjaGVtZSBzdXBwb3J0CisKKy0tLSBj b25zdGFudHMvY29uc3RhbnRzLmVsLm9yaWcJMjAxNS0xMi0yNiAxNzo0NDozMS43MzQ1MjA4MzMg KzAxMDAKKysrKyBjb25zdGFudHMvY29uc3RhbnRzLmVsCTIwMTUtMTItMzAgMTc6NDE6MjguNDAy ODcxMjYzICswMTAwCitAQCAtNjg0LDYgKzY4NCwzMyBAQAorIAorIChldmFsLXdoZW4tY29tcGls ZSAoZGVmdmFyIGN0YWJsZSkpCisgCisrKGRlZnVuIGNvbnN0YW50cy1pcy1saXNwLWxpa2UgKG1v ZGUpCisrICAoc2F2ZS1tYXRjaC1kYXRhCisrICAgIChzdHJpbmctbWF0Y2ggIlxcKGxpc3BcXHxz Y2hlbWVcXCkiIChzeW1ib2wtbmFtZSBtb2RlKSkpKQorKworKyhkZWZ1biBjb25zdGFudHMtaXMt c2V0LWxpa2UgKCkKKysgIChzYXZlLWV4Y3Vyc2lvbgorKyAgICAoY29uZGl0aW9uLWNhc2Ugbmls CisrICAgICAgICAoc2F2ZS1tYXRjaC1kYXRhCisrICAgICAgICAgIChwcm9nbiAodXAtbGlzdCAt MSkKKysgICAgICAgICAgICAgICAgIChvciAobG9va2luZy1hdCAiKHNldFtxZiFdP1xcPiIpIChs b29raW5nLWF0ICIoZGVmaW5lXFw+IikpKSkKKysgICAgICAoZXJyb3IgbmlsKSkpKSAgICAgOyBy ZXR1cm4gdmFsdWUgbmlsIG1lYW5zIHVzZSBkZWZhdWx0CisrCisrOzs7IyMjYXV0b2xvYWQKKyso ZGVmdW4gY29uc3RhbnRzLWxpc3AtbGlrZS1mdW5jdGlvbiAoKQorKyAgIkNoZWNrIGNvbnRleHQg Zm9yIGNvbnN0YW50cyBpbnNlcnRpb24uIgorKyAgKGlmIChjb25zdGFudHMtaXMtc2V0LWxpa2Up CisrICAgICAgJyhlbWFjcy1saXNwLW1vZGUgIiVuICV2JXQ7ICVkICV1IiAiZSIgIigqICVwICV2 KSIpCisrICAgICcoZW1hY3MtbGlzcC1tb2RlICIoJW4gJXYpJXQ7ICVkICV1IiAiZSIgIigqICVw ICV2KSIpKSkKKysKKys7OzsjIyNhdXRvbG9hZAorKyhtYXBjIChsYW1iZGEgKG1vZGUtaG9vaykK KysgICAgICAgIChhZGQtaG9vayBtb2RlLWhvb2sKKysgICAgICAgICAgICAgICAgICAobGFtYmRh ICgpCisrICAgICAgICAgICAgICAgICAgICAoc2V0cSBjb25zdGFudHMtbGFuZ3VhZ2UtZnVuY3Rp b24KKysgICAgICAgICAgICAgICAgICAgICAgICAgICdjb25zdGFudHMtbGlzcC1saWtlLWZ1bmN0 aW9uKSkpKQorKyAgICAgICcoc2NoZW1lLW1vZGUtaG9vayBlbWFjcy1saXNwLW1vZGUtaG9vayBs aXNwLW1vZGUtaG9vaykpCisrCisgOzs7IyMjYXV0b2xvYWQKKyAoZGVmdW4gY29uc3RhbnRzLWlu c2VydCAoJm9wdGlvbmFsIHVuaXQtc3lzdGVtIG5hbWVzKQorICAgIkluc2VydCBvbmUgb3IgbW9y ZSBuYXR1cmFsIGNvbnN0YW50IGRlZmluaXRpb25zIGluIHNvdXJjZSBjb2RlLgorQEAgLTgyNiw4 ICs4NTMsOSBAQAorICAgICAgICAgICAgIChmdW5jYWxsIHByb2Nlc3MtZnVuYyBpbnMpKQorICAg ICAgICAgOzsgSGVyZSBjb21lcyB0aGUgaW5zZXJ0aW9uIHN0dWZmIGZvciBzb3VyY2UgY29kZSBl ZGl0aW5nIG1vZGVzLgorICAgICAgICAgOzsgRmlyc3QgbWFrZSBzdXJlIHdlIHN0YXJ0IGEgbmV3 IGxpbmUKKy0gICAgICAgIChpZiAoc3RyaW5nLW1hdGNoCistICAgICAgICAgICAgICJcXFMtIiAo YnVmZmVyLXN1YnN0cmluZyAocG9pbnQtYXQtYm9sKSAocG9pbnQtYXQtZW9sKSkpCisrICAgICAg ICAoaWYgKGFuZCAoc3RyaW5nLW1hdGNoCisrICAgICAgICAgICAgICAgICAgIlxcUy0iIChidWZm ZXItc3Vic3RyaW5nIChwb2ludC1hdC1ib2wpIChwb2ludC1hdC1lb2wpKSkKKysgICAgICAgICAg ICAgICAgIChub3QgKGNvbnN0YW50cy1pcy1saXNwLWxpa2UgbW9kZSkpKQorICAgICAgICAgICAg IDs7IG5vbi1lbXB0eSBsaW5lLCBpbnNlcnQgYWZ0ZXIgdGhpcyBsaW5lCisgICAgICAgICAgICAg KHByb2duIAorICAgICAgICAgICAgICAgKGVuZC1vZi1saW5lIDEpIAorQEAgLTg0MSwxMyArODY5 LDI0IEBACisgICAgICAgICAgIChpZiAoc3RyaW5nLW1hdGNoICJcXCguKlxcKSV0XFwoLipcXCki IGxpbmUpCisgICAgICAgICAgICAgICAobGV0ICgoY29tbWVudC1jb2x1bW4gNDIpKQorICAgICAg ICAgICAgICAgICAoaW5zZXJ0IChtYXRjaC1zdHJpbmcgMSBsaW5lKSkKKy0gICAgICAgICAgICAg ICAgKGluZGVudC10byBjb21tZW50LWNvbHVtbikKKy0gICAgICAgICAgICAgICAgKGluc2VydCAo bWF0Y2gtc3RyaW5nIDIgbGluZSkpKQorKyAgICAgICAgICAgICAgICAoaWYgKGFuZCAoY29uc3Rh bnRzLWlzLWxpc3AtbGlrZSBtb2RlKQorKyAgICAgICAgICAgICAgICAgICAgICAgICAob3IgKGNv bnN0YW50cy1pcy1zZXQtbGlrZSkKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChudWxs IGNsaXN0KSkpCisrICAgICAgICAgICAgICAgICAgICAoc2F2ZS1leGN1cnNpb24KKysgICAgICAg ICAgICAgICAgICAgICAgKHByb2duCisrICAgICAgICAgICAgICAgICAgICAgICAgKG1vdmUtdG8t Y29sdW1uIGNvbW1lbnQtY29sdW1uIHQpCisrICAgICAgICAgICAgICAgICAgICAgICAgKGluc2Vy dCAobWF0Y2gtc3RyaW5nIDIgbGluZSkpCisrICAgICAgICAgICAgICAgICAgICAgICAgOzsgaW5z ZXJ0IGEgbmV3bGluZSBzdWNoIHRoYXQgcGFyZWRpdCdzIE0tKSBjYW4gbW9kZQorKyAgICAgICAg ICAgICAgICAgICAgICAgIDs7IHRoZSBjbG9zaW5nIHBhcmVudGhlc2VzIHRvIHRoZSBuZXh0IGxp bmUuCisrICAgICAgICAgICAgICAgICAgICAgICAgKG5ld2xpbmUtYW5kLWluZGVudCkpKQorKyAg ICAgICAgICAgICAgICAgIChwcm9nbgorKyAgICAgICAgICAgICAgICAgICAgKGluZGVudC10byBj b21tZW50LWNvbHVtbikKKysgICAgICAgICAgICAgICAgICAgIChpbnNlcnQgKG1hdGNoLXN0cmlu ZyAyIGxpbmUpKSkpKQorICAgICAgICAgICAgIChpbnNlcnQgbGluZSkpKQorLSAgICAgICAgKGlm IGNvbnN0YW50cy1pbmRlbnQtY29kZQorLSAgICAgICAgICAgIChuZXdsaW5lLWFuZC1pbmRlbnQp CistICAgICAgICAgIChuZXdsaW5lKSkpKSkpCistCisrICAgICAgICAodW5sZXNzIChhbmQgKGNv bnN0YW50cy1pcy1saXNwLWxpa2UgbW9kZSkgKG51bGwgY2xpc3QpKQorKyAgICAgICAgICAoaWYg Y29uc3RhbnRzLWluZGVudC1jb2RlCisrICAgICAgICAgICAgICAobmV3bGluZS1hbmQtaW5kZW50 KQorKyAgICAgICAgICAgIChuZXdsaW5lKSkpKSkpKQorIDs7OyMjI2F1dG9sb2FkCisgKGRlZnVu IGNvbnN0YW50cy1nZXQgKCZvcHRpb25hbCBjb25zdCBtZXNzYWdlKQorICAgIlJldHVybiB0aGUg dmFsdWUgb2YgQ09OU1QgYXMgZGVmaW5lZCBpbiB0aGUgY29uc3RhbnRzIHBhY2thZ2UuCi0tIAoy LjYuMwoK --001a1141665a685037052820ef80--