From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Soo Subject: Re: [WIP] gnu: Add fd. (rust) Date: Thu, 6 Feb 2020 19:45:10 +0000 Message-ID: References: <20200206163205.20668-1-tanguy@bioneland.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0000000000006f95c5059ded831c" Return-path: Received: from eggs.gnu.org ([2001:470:142:3::10]:59969) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1izn5a-0003OI-OV for guix-devel@gnu.org; Thu, 06 Feb 2020 14:45:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1izn5X-0006Nu-U9 for guix-devel@gnu.org; Thu, 06 Feb 2020 14:45:26 -0500 Received: from mail-vs1-xe2c.google.com ([2607:f8b0:4864:20::e2c]:42065) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1izn5W-0006Jv-KY for guix-devel@gnu.org; Thu, 06 Feb 2020 14:45:23 -0500 Received: by mail-vs1-xe2c.google.com with SMTP id b79so4567729vsd.9 for ; Thu, 06 Feb 2020 11:45:22 -0800 (PST) In-Reply-To: <20200206163205.20668-1-tanguy@bioneland.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-mx.org@gnu.org Sender: "Guix-devel" To: Tanguy Le Carrour Cc: Guix-devel --0000000000006f95c5059ded831c Content-Type: text/plain; charset="UTF-8" Hi Tanguy, > I've just submitted 2 patches to add 2 trivial rust dependencies I need. > But even with those, `fd` does not build! :-( Nice! I have a working set of patches. I'll attach them so you can compare. > > ``` > starting phase `build' > error: no matching package named `term_size` found > location searched: registry `https://github.com/rust-lang/crates.io-index` > perhaps you meant: term_size > required by package `clap v2.33.0` > ... which is depended on by `fd-find v7.4.0 (/tmp/guix-build-fd-7.4.0.drv-0/fd-find-7.4.0)` > command "cargo" "build" "--release" failed with status 101 > ``` > > I tried adding `term_size` to `cargo-inputs` or to `cargo-development-inputs`, > but it did not solve my problem. Am I missing something?! > > I'm not a rust specialist, so any help would be welcome! Clap is missing a dependency in our package set currently. My patches fix that. Good luck! John --0000000000006f95c5059ded831c Content-Type: text/x-patch; charset="US-ASCII"; name="0004-gnu-rust-regex-1.1-Update-to-1.1.9.patch" Content-Disposition: attachment; filename="0004-gnu-rust-regex-1.1-Update-to-1.1.9.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k6b5gqtc3 RnJvbSBhYTc4NDdlNTc4YmJjNDBmMTU4Mzc3ZDUyNjVhN2Q1ZDQ5ZTdiYWRmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2huIFNvbyA8anNvbzFAYXN1LmVkdT4KRGF0ZTogVHVlLCAy MSBKYW4gMjAyMCAwOTo1NToyMSAtMDgwMApTdWJqZWN0OiBbUEFUQ0ggNC83XSBnbnU6IHJ1c3Qt cmVnZXgtMS4xOiBVcGRhdGUgdG8gMS4xLjkuCgoqIGdudS9wYWNrYWdlcy9jcmF0ZXMtaW8uc2Nt IChydXN0LXJlZ2V4LTEuMSk6IFVwZGF0ZSBpdC4KLS0tCiBnbnUvcGFja2FnZXMvY3JhdGVzLWlv LnNjbSB8IDYgKysrLS0tCiAxIGZpbGUgY2hhbmdlZCwgMyBpbnNlcnRpb25zKCspLCAzIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9jcmF0ZXMtaW8uc2NtIGIvZ251L3Bh Y2thZ2VzL2NyYXRlcy1pby5zY20KaW5kZXggNDk4MzZlNzYxNS4uYmZlMzY5NDNiYiAxMDA2NDQK LS0tIGEvZ251L3BhY2thZ2VzL2NyYXRlcy1pby5zY20KKysrIGIvZ251L3BhY2thZ2VzL2NyYXRl cy1pby5zY20KQEAgLTk2NTksNyArOTY1OSw3IEBAIHVzZXMgZmluaXRlIGF1dG9tYXRhIGFuZCBn dWFyYW50ZWVzIGxpbmVhciB0aW1lIG1hdGNoaW5nIG9uIGFsbCBpbnB1dHMuIikKICAgKHBhY2th Z2UKICAgICAoaW5oZXJpdCBydXN0LXJlZ2V4LTEuMykKICAgICAobmFtZSAicnVzdC1yZWdleCIp Ci0gICAgKHZlcnNpb24gIjEuMS43IikKKyAgICAodmVyc2lvbiAiMS4xLjkiKQogICAgIChzb3Vy Y2UKICAgICAgKG9yaWdpbgogICAgICAgIChtZXRob2QgdXJsLWZldGNoKQpAQCAtOTY2OCw3ICs5 NjY4LDcgQEAgdXNlcyBmaW5pdGUgYXV0b21hdGEgYW5kIGd1YXJhbnRlZXMgbGluZWFyIHRpbWUg bWF0Y2hpbmcgb24gYWxsIGlucHV0cy4iKQogICAgICAgICAoc3RyaW5nLWFwcGVuZCBuYW1lICIt IiB2ZXJzaW9uICIudGFyLmd6IikpCiAgICAgICAgKHNoYTI1NgogICAgICAgICAoYmFzZTMyCi0g ICAgICAgICAiMXBhYmFqcHAwd3piN2RtMngzMmd5OHc3azBtd3lrcjZ6c3Z6bjBmZ3ByNnB3dzQw aGJxYiIpKSkpCisgICAgICAgICAiMWJhNDdpdnE4bDF5aWtpd2lram5xNWJhcmFnNmlxZmdjcHhs ejIyNjNmcWJxOXkya242ciIpKSkpCiAgICAgKGFyZ3VtZW50cwogICAgICBgKCM6c2tpcC1idWls ZD8gI3QKICAgICAgICAjOmNhcmdvLWlucHV0cwpAQCAtOTY4MSw3ICs5NjgxLDcgQEAgdXNlcyBm aW5pdGUgYXV0b21hdGEgYW5kIGd1YXJhbnRlZXMgbGluZWFyIHRpbWUgbWF0Y2hpbmcgb24gYWxs IGlucHV0cy4iKQogICAgICAgICgoInJ1c3QtZG9jLWNvbW1lbnQiICxydXN0LWRvYy1jb21tZW50 LTAuMykKICAgICAgICAgKCJydXN0LWxhenktc3RhdGljIiAscnVzdC1sYXp5LXN0YXRpYy0xLjMp CiAgICAgICAgICgicnVzdC1xdWlja2NoZWNrIiAscnVzdC1xdWlja2NoZWNrLTAuOCkKLSAgICAg ICAgKCJydXN0LXJhbmQiICxydXN0LXJhbmQtMC40KSkpKSkpCisgICAgICAgICgicnVzdC1yYW5k IiAscnVzdC1yYW5kLTAuNikpKSkpKQogCiAoZGVmaW5lLXB1YmxpYyBydXN0LXJlZ2V4LTAuMgog ICAocGFja2FnZQotLSAKMi4yNS4wCgo= --0000000000006f95c5059ded831c Content-Type: text/x-patch; charset="US-ASCII"; name="0003-gnu-Add-rust-lscolors-0.6.patch" Content-Disposition: attachment; filename="0003-gnu-Add-rust-lscolors-0.6.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k6b5gqtc2 RnJvbSAzZmE0MmQ2NTBlMGQ4NmZkN2IwYzFiMDVhZGEwY2I5NzYxMjJhNjczIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2huIFNvbyA8anNvbzFAYXN1LmVkdT4KRGF0ZTogVHVlLCAy MSBKYW4gMjAyMCAwOToyODo0OSAtMDgwMApTdWJqZWN0OiBbUEFUQ0ggMy83XSBnbnU6IEFkZCBy dXN0LWxzY29sb3JzLTAuNi4KCiogZ251L3BhY2thZ2VzL2NyYXRlcy1pby5zY20gKHJ1c3QtbHNj b2xvcnMtMC42KTogTmV3IHZhcmlhYmxlLgotLS0KIGdudS9wYWNrYWdlcy9jcmF0ZXMtaW8uc2Nt IHwgMjcgKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUgY2hhbmdlZCwgMjcgaW5z ZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9jcmF0ZXMtaW8uc2NtIGIvZ251 L3BhY2thZ2VzL2NyYXRlcy1pby5zY20KaW5kZXggZWYxYzMxMzE1YS4uNDk4MzZlNzYxNSAxMDA2 NDQKLS0tIGEvZ251L3BhY2thZ2VzL2NyYXRlcy1pby5zY20KKysrIGIvZ251L3BhY2thZ2VzL2Ny YXRlcy1pby5zY20KQEAgLTY4NTYsNiArNjg1NiwzMyBAQCBwYWlycyBpbiBpbnNlcnRpb24gb3Jk ZXIuIikKICAgICAobGljZW5zZSAobGlzdCBsaWNlbnNlOmFzbDIuMAogICAgICAgICAgICAgICAg ICAgIGxpY2Vuc2U6ZXhwYXQpKSkpCiAKKyhkZWZpbmUtcHVibGljIHJ1c3QtbHNjb2xvcnMtMC42 CisgIChwYWNrYWdlCisgICAgKG5hbWUgInJ1c3QtbHNjb2xvcnMiKQorICAgICh2ZXJzaW9uICIw LjYuMCIpCisgICAgKHNvdXJjZQorICAgICAob3JpZ2luCisgICAgICAgKG1ldGhvZCB1cmwtZmV0 Y2gpCisgICAgICAgKHVyaSAoY3JhdGUtdXJpICJsc2NvbG9ycyIgdmVyc2lvbikpCisgICAgICAg KGZpbGUtbmFtZQorICAgICAgICAoc3RyaW5nLWFwcGVuZCBuYW1lICItIiB2ZXJzaW9uICIudGFy Lmd6IikpCisgICAgICAgKHNoYTI1NgorICAgICAgICAoYmFzZTMyCisgICAgICAgICAiMGp4c2dr bjM3OGt4a2lxZHNoZGpkY2x3NXd3cDJ4YXo0NWNxZDN5dzg1ZmhuOGEzOGZ6YSIpKSkpCisgICAg KGJ1aWxkLXN5c3RlbSBjYXJnby1idWlsZC1zeXN0ZW0pCisgICAgKGFyZ3VtZW50cworICAgICBg KCM6c2tpcC1idWlsZD8gI3QKKyAgICAgICAjOmNhcmdvLWlucHV0cworICAgICAgICgoInJ1c3Qt YW5zaS10ZXJtIiAscnVzdC1hbnNpLXRlcm0tMC4xMSkpCisgICAgICAgIzpjYXJnby1kZXZlbG9w bWVudC1pbnB1dHMKKyAgICAgICAoKCJydXN0LXRlbXBmaWxlIiAscnVzdC10ZW1wZmlsZS0zLjEp KSkpCisgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRodWIuY29tL3NoYXJrZHAvbHNjb2xvcnMi KQorICAgIChzeW5vcHNpcworICAgICAiQ29sb3JpemUgcGF0aHMgdXNpbmcgdGhlIExTX0NPTE9S UyBlbnZpcm9ubWVudCB2YXJpYWJsZSIpCisgICAgKGRlc2NyaXB0aW9uCisgICAgICJDb2xvcml6 ZSBwYXRocyB1c2luZyB0aGUgTFNfQ09MT1JTIGVudmlyb25tZW50IHZhcmlhYmxlLiIpCisgICAg KGxpY2Vuc2UgKGxpc3QgbGljZW5zZTpleHBhdCBsaWNlbnNlOmFzbDIuMCkpKSkKKwogKGRlZmlu ZS1wdWJsaWMgcnVzdC1uZXctZGVidWctdW5yZWFjaGFibGUtMS4wCiAgIChwYWNrYWdlCiAgICAg KG5hbWUgInJ1c3QtbmV3LWRlYnVnLXVucmVhY2hhYmxlIikKLS0gCjIuMjUuMAoK --0000000000006f95c5059ded831c Content-Type: text/x-patch; charset="US-ASCII"; name="0005-gnu-Add-rust-ansi-term-0.12.patch" Content-Disposition: attachment; filename="0005-gnu-Add-rust-ansi-term-0.12.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k6b5gqtc4 RnJvbSBhYWQ0YmViNDk4ZjhiMjhjYjZkYzMwZjQ4NGIxNmZjMzk0MzA2YmZjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2huIFNvbyA8anNvbzFAYXN1LmVkdT4KRGF0ZTogVHVlLCAy MSBKYW4gMjAyMCAwOTo1Njo1NSAtMDgwMApTdWJqZWN0OiBbUEFUQ0ggNS83XSBnbnU6IEFkZCBy dXN0LWFuc2ktdGVybS0wLjEyLgoKKiBnbnUvcGFja2FnZXMvY3JhdGVzLWlvLnNjbSAocnVzdC1h bnNpLXRlcm0tMC4xMik6IE5ldyB2YXJpYWJsZS4KKiBnbi9wYWNrYWdlcy9jcmF0ZXMtaW8uc2Nt IChydXN0LWFuc2ktdGVybS0wLjExKTogSW5oZXJpdCBmcm9tIHJ1c3QtYW5zaS10ZXJtLTAuMTIu Ci0tLQogZ251L3BhY2thZ2VzL2NyYXRlcy1pby5zY20gfCAyMyArKysrKysrKysrKysrKysrKysr KysrKwogMSBmaWxlIGNoYW5nZWQsIDIzIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9nbnUv cGFja2FnZXMvY3JhdGVzLWlvLnNjbSBiL2dudS9wYWNrYWdlcy9jcmF0ZXMtaW8uc2NtCmluZGV4 IGJmZTM2OTQzYmIuLjdiN2Y3NzAyM2MgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9jcmF0ZXMt aW8uc2NtCisrKyBiL2dudS9wYWNrYWdlcy9jcmF0ZXMtaW8uc2NtCkBAIC0yMzIsNiArMjMyLDI5 IEBAIHRleHQgb3IgYmx1ZSB1bmRlcmxpbmVkIHRleHQsIG9uIEFOU0kgdGVybWluYWxzLiIpCiAg ICAgICAgIzpjYXJnby1pbnB1dHMKICAgICAgICAoKCJydXN0LXdpbmFwaSIgLHJ1c3Qtd2luYXBp LTAuMykpKSkpKQogCisoZGVmaW5lLXB1YmxpYyBydXN0LWFuc2ktdGVybS0wLjExCisgIChwYWNr YWdlCisgICAgKGluaGVyaXQgcnVzdC1hbnNpLXRlcm0tMC4xMikKKyAgICAodmVyc2lvbiAiMC4x MS4wIikKKyAgICAoc291cmNlCisgICAgICAob3JpZ2luCisgICAgICAgIChtZXRob2QgdXJsLWZl dGNoKQorICAgICAgICAodXJpIChjcmF0ZS11cmkgImFuc2lfdGVybSIgdmVyc2lvbikpCisgICAg ICAgIChmaWxlLW5hbWUgKHN0cmluZy1hcHBlbmQgKHBhY2thZ2UtbmFtZSBydXN0LWFuc2ktdGVy bS0wLjEyKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICItIiB2ZXJzaW9uICIu Y3JhdGUiKSkKKyAgICAgICAgKHNoYTI1NgorICAgICAgICAgKGJhc2UzMgorICAgICAgICAgICIx NndwdnJnaHZkMDM1MzU4NGkxaWRuc2dtMHIzdmNoZzhmeXJtMHg4YXl2MXJndmJsamdmIikpKSkK KyAgICAoYXJndW1lbnRzCisgICAgIGAoIzpza2lwLWJ1aWxkPyAjdAorICAgICAgICM6Y2FyZ28t aW5wdXRzCisgICAgICAgKCgicnVzdC1zZXJkZSIgLHJ1c3Qtc2VyZGUtMS4wKQorICAgICAgICAo InJ1c3Qtd2luYXBpIiAscnVzdC13aW5hcGktMC4zKSkKKyAgICAgICAjOmNhcmdvLWRldmVsb3Bt ZW50LWlucHV0cworICAgICAgICgoInJ1c3QtZG9jLWNvbW1lbnQiICxydXN0LWRvYy1jb21tZW50 LTAuMykKKyAgICAgICAgKCJydXN0LXJlZ2V4IiAscnVzdC1yZWdleC0xLjEpCisgICAgICAgICgi cnVzdC1zZXJkZS1qc29uIiAscnVzdC1zZXJkZS1qc29uLTEuMCkpKSkpKQorCiAoZGVmaW5lLXB1 YmxpYyBydXN0LWFudGlkb3RlLTEuMAogICAocGFja2FnZQogICAgIChuYW1lICJydXN0LWFudGlk b3RlIikKLS0gCjIuMjUuMAoK --0000000000006f95c5059ded831c Content-Type: text/x-patch; charset="US-ASCII"; name="0001-gnu-Add-rust-nix-0.14.patch" Content-Disposition: attachment; filename="0001-gnu-Add-rust-nix-0.14.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k6b5gqqk0 RnJvbSAzOGQxYTZmODNlOTk5ZTM3NmFlZWYwM2Y0OThkNWZiOTcwYTkyMTAyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2huIFNvbyA8anNvbzFAYXN1LmVkdT4KRGF0ZTogVHVlLCAy MSBKYW4gMjAyMCAxMDoxMDoyOSAtMDgwMApTdWJqZWN0OiBbUEFUQ0ggMS83XSBnbnU6IEFkZCBy dXN0LW5peC0wLjE0LgoKKiBnbnUvcGFja2FnZXMvY3JhdGVzLWlvLnNjbSAocnVzdC1uaXgtMC4x NCk6IEFkZCBpdC4KLS0tCiBnbnUvcGFja2FnZXMvY3JhdGVzLWlvLnNjbSB8IDMxICsrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCAzMSBpbnNlcnRpb25zKCsp CgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2NyYXRlcy1pby5zY20gYi9nbnUvcGFja2FnZXMv Y3JhdGVzLWlvLnNjbQppbmRleCA3MjdlN2M5NTEwLi5jZmIzZDA0ODI1IDEwMDY0NAotLS0gYS9n bnUvcGFja2FnZXMvY3JhdGVzLWlvLnNjbQorKysgYi9nbnUvcGFja2FnZXMvY3JhdGVzLWlvLnNj bQpAQCAtNjkxNCw2ICs2OTE0LDM3IEBAIHJlbGVhc2UgKGZvcmsgb2YgZGVidWdfdW5yZWFjaGFi bGUpIikKIHByb3ZlIGEgZnVuY3Rpb24gY2FuJ3QgZXZlciBwYW5pYy4iKQogICAgIChsaWNlbnNl IChsaXN0IGxpY2Vuc2U6ZXhwYXQgbGljZW5zZTphc2wyLjApKSkpCiAKKyhkZWZpbmUtcHVibGlj IHJ1c3Qtbml4LTAuMTQKKyAgKHBhY2thZ2UKKyAgICAoaW5oZXJpdCBydXN0LW5peC0wLjE1KQor ICAgICh2ZXJzaW9uICIwLjE0LjEiKQorICAgIChzb3VyY2UKKyAgICAgKG9yaWdpbgorICAgICAg IChtZXRob2QgdXJsLWZldGNoKQorICAgICAgICh1cmkgKGNyYXRlLXVyaSAibml4IiB2ZXJzaW9u KSkKKyAgICAgICAoZmlsZS1uYW1lCisgICAgICAgIChzdHJpbmctYXBwZW5kIChwYWNrYWdlLW5h bWUgcnVzdC1uaXgtMC4xNSkKKyAgICAgICAgICAgICAgICAgICAgICAgIi0iIHZlcnNpb24gIi50 YXIuZ3oiKSkKKyAgICAgICAoc2hhMjU2CisgICAgICAgIChiYXNlMzIKKyAgICAgICAgICIxa214 ZGxtdm5tcThjZnBtcjNnNndrMzdyd2kyeWJkdnAxejZ6MzgzMW0xcDIzcDJud2tjIikpKSkKKyAg ICAoYXJndW1lbnRzCisgICAgIGAoIzpza2lwLWJ1aWxkPyAjdAorICAgICAgICM6Y2FyZ28taW5w dXRzCisgICAgICAgKCgicnVzdC1iaXRmbGFncyIgLHJ1c3QtYml0ZmxhZ3MtMSkKKyAgICAgICAg KCJydXN0LWNjIiAscnVzdC1jYy0xLjApCisgICAgICAgICgicnVzdC1jZmctaWYiICxydXN0LWNm Zy1pZi0wLjEpCisgICAgICAgICgicnVzdC1saWJjIiAscnVzdC1saWJjLTAuMikKKyAgICAgICAg KCJydXN0LXZvaWQiICxydXN0LXZvaWQtMS4wKSkKKyAgICAgICAjOmNhcmdvLWRldmVsb3BtZW50 LWlucHV0cworICAgICAgICgoInJ1c3QtYnl0ZXMiICxydXN0LWJ5dGVzLTAuNCkKKyAgICAgICAg KCJydXN0LWNhcHMiICxydXN0LWNhcHMtMC4zKQorICAgICAgICAoInJ1c3QtY2MiICxydXN0LWNj LTEuMCkKKyAgICAgICAgKCJydXN0LWxhenktc3RhdGljIiAscnVzdC1sYXp5LXN0YXRpYy0xLjMp CisgICAgICAgICgicnVzdC1yYW5kIiAscnVzdC1yYW5kLTAuNikKKyAgICAgICAgKCJydXN0LXN5 c2N0bCIgLHJ1c3Qtc3lzY3RsLTAuNCkKKyAgICAgICAgKCJydXN0LXRlbXBmaWxlIiAscnVzdC10 ZW1wZmlsZS0zLjApKSkpKSkKKwogKGRlZmluZS1wdWJsaWMgcnVzdC1ub2Ryb3AtMC4xCiAgIChw YWNrYWdlCiAgICAgKG5hbWUgInJ1c3Qtbm9kcm9wIikKLS0gCjIuMjUuMAoK --0000000000006f95c5059ded831c Content-Type: text/x-patch; charset="US-ASCII"; name="0002-gnu-Add-rust-ctrlc-3.1.patch" Content-Disposition: attachment; filename="0002-gnu-Add-rust-ctrlc-3.1.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k6b5gqqk1 RnJvbSBmYTMyZDYxZTdkZmQ1ZTA2MjIwNGEyZDE0ODc3MmUyY2JiYzQ5MTBhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2huIFNvbyA8anNvbzFAYXN1LmVkdT4KRGF0ZTogVHVlLCAy MSBKYW4gMjAyMCAwOToyNjowNSAtMDgwMApTdWJqZWN0OiBbUEFUQ0ggMi83XSBnbnU6IEFkZCBy dXN0LWN0cmxjLTMuMS4KCiogZ251L3BhY2thZ2VzL2NyYXRlcy1pby5zY20gKHJ1c3QtY3RybGMt My4xKTogTmV3IHZhcmlhYmxlLgotLS0KIGdudS9wYWNrYWdlcy9jcmF0ZXMtaW8uc2NtIHwgMjkg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCAyOSBpbnNlcnRp b25zKCspCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2NyYXRlcy1pby5zY20gYi9nbnUvcGFj a2FnZXMvY3JhdGVzLWlvLnNjbQppbmRleCBjZmIzZDA0ODI1Li5lZjFjMzEzMTVhIDEwMDY0NAot LS0gYS9nbnUvcGFja2FnZXMvY3JhdGVzLWlvLnNjbQorKysgYi9nbnUvcGFja2FnZXMvY3JhdGVz LWlvLnNjbQpAQCAtMjI4Niw2ICsyMjg2LDM1IEBAIGludHJpbnNpY3MuIikKICAgICAgIkJhcmUg Ym9uZXMgQ1NWIHBhcnNpbmcgd2l0aCBub19zdGQgc3VwcG9ydC4iKQogICAgIChsaWNlbnNlIChs aXN0IGxpY2Vuc2U6dW5saWNlbnNlIGxpY2Vuc2U6ZXhwYXQpKSkpCiAKKyhkZWZpbmUtcHVibGlj IHJ1c3QtY3RybGMtMy4xCisgIChwYWNrYWdlCisgICAgKG5hbWUgInJ1c3QtY3RybGMiKQorICAg ICh2ZXJzaW9uICIzLjEuMyIpCisgICAgKHNvdXJjZQorICAgICAob3JpZ2luCisgICAgICAgKG1l dGhvZCB1cmwtZmV0Y2gpCisgICAgICAgKHVyaSAoY3JhdGUtdXJpICJjdHJsYyIgdmVyc2lvbikp CisgICAgICAgKGZpbGUtbmFtZQorICAgICAgICAoc3RyaW5nLWFwcGVuZCBuYW1lICItIiB2ZXJz aW9uICIudGFyLmd6IikpCisgICAgICAgKHNoYTI1NgorICAgICAgICAoYmFzZTMyCisgICAgICAg ICAiMHp6OGFkNGJrMjhzMTExYWY1dnkxYzVraWk0encwY2doODdpdnpnajI4Zjhua2NkNXB5NyIp KSkpCisgICAgKGJ1aWxkLXN5c3RlbSBjYXJnby1idWlsZC1zeXN0ZW0pCisgICAgKGFyZ3VtZW50 cworICAgICBgKCM6c2tpcC1idWlsZD8gI3QKKyAgICAgICAjOmNhcmdvLWlucHV0cworICAgICAg ICgoInJ1c3Qtbml4IiAscnVzdC1uaXgtMC4xNCkKKyAgICAgICAgKCJydXN0LXdpbmFwaSIgLHJ1 c3Qtd2luYXBpLTAuMykpCisgICAgICAgIzpjYXJnby1kZXZlbG9wbWVudC1pbnB1dHMKKyAgICAg ICAoKCJydXN0LXdpbmFwaSIgLHJ1c3Qtd2luYXBpLTAuMykpKSkKKyAgICAoaG9tZS1wYWdlCisg ICAgICJodHRwczovL2dpdGh1Yi5jb20vRGV0ZWdyL3J1c3QtY3RybGMiKQorICAgIChzeW5vcHNp cworICAgICAiRWFzeSBDdHJsLUMgaGFuZGxlciBmb3IgUnVzdCBwcm9qZWN0cyIpCisgICAgKGRl c2NyaXB0aW9uCisgICAgICJFYXN5IEN0cmwtQyBoYW5kbGVyIGZvciBSdXN0IHByb2plY3RzLiIp CisgICAgKGxpY2Vuc2UgKGxpc3QgbGljZW5zZTpleHBhdCBsaWNlbnNlOmFzbDIuMCkpKSkKKwog KGRlZmluZS1wdWJsaWMgcnVzdC1jdXJsLXN5cy0wLjQKICAgKHBhY2thZ2UKICAgICAobmFtZSAi cnVzdC1jdXJsLXN5cyIpCi0tIAoyLjI1LjAKCg== --0000000000006f95c5059ded831c Content-Type: text/x-patch; charset="US-ASCII"; name="0006-gnu-rust-clap-2-Add-dependency.patch" Content-Disposition: attachment; filename="0006-gnu-rust-clap-2-Add-dependency.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k6b5gqtc5 RnJvbSA4NzFlMzQ5ZTM1NWNkM2UzNjM1MmE1MGJkNjBhNjI1OTFiNDIyZTFjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2huIFNvbyA8anNvbzFAYXN1LmVkdT4KRGF0ZTogVHVlLCAy MSBKYW4gMjAyMCAxMDowNToyOCAtMDgwMApTdWJqZWN0OiBbUEFUQ0ggNi83XSBnbnU6IHJ1c3Qt Y2xhcC0yOiBBZGQgZGVwZW5kZW5jeS4KCiogZ251L3BhY2thZ2VzL2NyYXRlcy1pby5zY20gKHJ1 c3QtY2xhcC0yKTpbYXJndW1lbnRzXSBBZGQgY2FyZ28gaW5wdXQuCi0tLQogZ251L3BhY2thZ2Vz L2NyYXRlcy1pby5zY20gfCAxICsKIDEgZmlsZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKQoKZGlm ZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9jcmF0ZXMtaW8uc2NtIGIvZ251L3BhY2thZ2VzL2NyYXRl cy1pby5zY20KaW5kZXggN2I3Zjc3MDIzYy4uZDc0YjVhMWQ0MCAxMDA2NDQKLS0tIGEvZ251L3Bh Y2thZ2VzL2NyYXRlcy1pby5zY20KKysrIGIvZ251L3BhY2thZ2VzL2NyYXRlcy1pby5zY20KQEAg LTE1MTYsNiArMTUxNiw3IEBAIGRlcGVuZGluZyBvbiBhIGxhcmdlIG51bWJlciBvZiAjW2NmZ10g cGFyYW1ldGVycy4gIFN0cnVjdHVyZWQgbGlrZSBhbgogICAgICAgICAoInJ1c3QtYml0ZmxhZ3Mi ICxydXN0LWJpdGZsYWdzLTEpCiAgICAgICAgICgicnVzdC1jbGlwcHkiICxydXN0LWNsaXBweS0w LjApCiAgICAgICAgICgicnVzdC1zdHJzaW0iICxydXN0LXN0cnNpbS0wLjgpCisgICAgICAgICgi cnVzdC10ZXJtLXNpemUiICxydXN0LXRlcm0tc2l6ZS0wLjMpCiAgICAgICAgICgicnVzdC10ZXh0 d3JhcCIgLHJ1c3QtdGV4dHdyYXAtMC4xMSkKICAgICAgICAgKCJydXN0LXVuaWNvZGUtd2lkdGgi ICxydXN0LXVuaWNvZGUtd2lkdGgtMC4xKQogICAgICAgICAoInJ1c3QtdmVjLW1hcCIgLHJ1c3Qt dmVjLW1hcC0wLjgpCi0tIAoyLjI1LjAKCg== --0000000000006f95c5059ded831c Content-Type: text/x-patch; charset="US-ASCII"; name="0007-gnu-Add-fd.patch" Content-Disposition: attachment; filename="0007-gnu-Add-fd.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k6b5gqtc6 RnJvbSA1NTMzM2Y1YWU3OTRmMTE1MzFlNGIxY2VkNTQ2NDc1ZmVhNDlmOGJmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2huIFNvbyA8anNvbzFAYXN1LmVkdT4KRGF0ZTogVHVlLCAy MSBKYW4gMjAyMCAwOTozMzozMyAtMDgwMApTdWJqZWN0OiBbUEFUQ0ggNy83XSBnbnU6IEFkZCBm ZC4KCiogZ251L3BhY2thZ2VzL2NyYXRlcy1pby5zY20gKGZkKTogTmV3IHZhcmlhYmxlLgotLS0K IGdudS9wYWNrYWdlcy9ydXN0LWFwcHMuc2NtIHwgNzMgKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCA3MyBpbnNlcnRpb25zKCspCgpkaWZmIC0t Z2l0IGEvZ251L3BhY2thZ2VzL3J1c3QtYXBwcy5zY20gYi9nbnUvcGFja2FnZXMvcnVzdC1hcHBz LnNjbQppbmRleCA1YjYxY2RjNTQyLi41NTU2YjFhNTQ5IDEwMDY0NAotLS0gYS9nbnUvcGFja2Fn ZXMvcnVzdC1hcHBzLnNjbQorKysgYi9nbnUvcGFja2FnZXMvcnVzdC1hcHBzLnNjbQpAQCAtMjIs OCArMjIsMTAgQEAKICAgIzp1c2UtbW9kdWxlIChndWl4IGJ1aWxkLXN5c3RlbSBjYXJnbykKICAg Izp1c2UtbW9kdWxlIChndWl4IGRvd25sb2FkKQogICAjOnVzZS1tb2R1bGUgKGd1aXggcGFja2Fn ZXMpCisgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGJhc2gpCiAgICM6dXNlLW1vZHVsZSAo Z251IHBhY2thZ2VzIGNvbXByZXNzaW9uKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBj cmF0ZXMtaW8pCisgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGplbWFsbG9jKQogICAjOnVz ZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBwa2ctY29uZmlnKQogICAjOnVzZS1tb2R1bGUgKGdudSBw YWNrYWdlcyB0bHMpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHZlcnNpb24tY29udHJv bCkpCkBAIC0xMjUsNiArMTI3LDc3IEBAIHByb2dyYW0gQGNvZGV7bHN9LiAgSXQgdXNlcyBjb2xv dXJzIHRvIGRpc3Rpbmd1aXNoIGZpbGUgdHlwZXMgYW5kIG1ldGFkYXRhLiAgSXQKIGFsc28ga25v d3MgYWJvdXQgc3ltbGlua3MsIGV4dGVuZGVkIGF0dHJpYnV0ZXMsIGFuZCBHaXQuIikKICAgICAo bGljZW5zZSBsaWNlbnNlOmV4cGF0KSkpCiAKKyhkZWZpbmUtcHVibGljIGZkCisgIChwYWNrYWdl CisgICAgKG5hbWUgImZkIikKKyAgICAodmVyc2lvbiAiNy40LjAiKQorICAgIChzb3VyY2UKKyAg ICAgKG9yaWdpbgorICAgICAgIChtZXRob2QgdXJsLWZldGNoKQorICAgICAgICh1cmkgKGNyYXRl LXVyaSAiZmQtZmluZCIgdmVyc2lvbikpCisgICAgICAgKGZpbGUtbmFtZQorICAgICAgICAoc3Ry aW5nLWFwcGVuZCBuYW1lICItIiB2ZXJzaW9uICIudGFyLmd6IikpCisgICAgICAgKHNoYTI1Ngor ICAgICAgICAoYmFzZTMyCisgICAgICAgICAiMTQ3bTg3MnpmZjBzcndxOXZheGtrYmFiMDZnM2Zr a2xiazFnMmx4OTB2ZGhnczM3ZjV4aiIpKSkpCisgICAgKGJ1aWxkLXN5c3RlbSBjYXJnby1idWls ZC1zeXN0ZW0pCisgICAgKGFyZ3VtZW50cworICAgICBgKCM6Y2FyZ28taW5wdXRzCisgICAgICAg KCgicnVzdC1hbnNpLXRlcm0iICxydXN0LWFuc2ktdGVybS0wLjEyKQorICAgICAgICAoInJ1c3Qt YXR0eSIgLHJ1c3QtYXR0eS0wLjIpCisgICAgICAgICgicnVzdC1jbGFwIiAscnVzdC1jbGFwLTIp CisgICAgICAgICgicnVzdC1jdHJsYyIgLHJ1c3QtY3RybGMtMy4xKQorICAgICAgICAoInJ1c3Qt Z2xvYnNldCIgLHJ1c3QtZ2xvYnNldC0wLjQpCisgICAgICAgICgicnVzdC1odW1hbnRpbWUiICxy dXN0LWh1bWFudGltZS0xLjMpCisgICAgICAgICgicnVzdC1pZ25vcmUiICxydXN0LWlnbm9yZS0w LjQpCisgICAgICAgICgicnVzdC1qZW1hbGxvY2F0b3IiICxydXN0LWplbWFsbG9jYXRvci0wLjMp CisgICAgICAgICgicnVzdC1sYXp5LXN0YXRpYyIgLHJ1c3QtbGF6eS1zdGF0aWMtMS40KQorICAg ICAgICAoInJ1c3QtbGliYyIgLHJ1c3QtbGliYy0wLjIpCisgICAgICAgICgicnVzdC1sc2NvbG9y cyIgLHJ1c3QtbHNjb2xvcnMtMC42KQorICAgICAgICAoInJ1c3QtbnVtLWNwdXMiICxydXN0LW51 bS1jcHVzLTEuMTApCisgICAgICAgICgicnVzdC1yZWdleCIgLHJ1c3QtcmVnZXgtMS4zKQorICAg ICAgICAoInJ1c3QtcmVnZXgtc3ludGF4IiAscnVzdC1yZWdleC1zeW50YXgtMC42KSkKKyAgICAg ICAjOmNhcmdvLWRldmVsb3BtZW50LWlucHV0cworICAgICAgICgoInJ1c3QtY2xhcCIgLHJ1c3Qt Y2xhcC0yKQorICAgICAgICAoInJ1c3QtZGlmZiIgLHJ1c3QtZGlmZi0wLjEpCisgICAgICAgICgi cnVzdC1maWxldGltZSIgLHJ1c3QtZmlsZXRpbWUtMC4yKQorICAgICAgICAoInJ1c3QtdGVtcGRp ciIgLHJ1c3QtdGVtcGRpci0wLjMpCisgICAgICAgICgicnVzdC12ZXJzaW9uLWNoZWNrIiAscnVz dC12ZXJzaW9uLWNoZWNrLTAuOSkpCisgICAgICAgIzpwaGFzZXMKKyAgICAgICAobW9kaWZ5LXBo YXNlcyAlc3RhbmRhcmQtcGhhc2VzCisgICAgICAgICAoYWRkLWFmdGVyICd1bnBhY2sgJ292ZXJy aWRlLWplbWFsbG9jCisgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBpbnB1dHMgIzphbGxvdy1v dGhlci1rZXlzKQorICAgICAgICAgICAgIChsZXQgKChqZW1hbGxvYyAoYXNzb2MtcmVmIGlucHV0 cyAiamVtYWxsb2MiKSkpCisgICAgICAgICAgICAgICAoc2V0ZW52ICJKRU1BTExPQ19PVkVSUklE RSIKKyAgICAgICAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgamVtYWxsb2MgIi9saWIv bGliamVtYWxsb2NfcGljLmEiKSkpCisgICAgICAgICAgICAgI3QpKQorICAgICAgICAgKGFkZC1h ZnRlciAnaW5zdGFsbCAnaW5zdGFsbC1leHRyYQorICAgICAgICAgICAobGFtYmRhKiAoIzprZXkg b3V0cHV0cyAjOmFsbG93LW90aGVyLWtleXMpCisgICAgICAgICAgICAgKGxldCogKChvdXQgKGFz c29jLXJlZiBvdXRwdXRzICJvdXQiKSkKKyAgICAgICAgICAgICAgICAgICAgKGluc3RhbGwtY29t cGxldGlvbgorICAgICAgICAgICAgICAgICAgICAgKGxhbWJkYSAoY29tcGxldGlvbiBvdXQtZGly KQorICAgICAgICAgICAgICAgICAgICAgICAoZm9yLWVhY2gKKyAgICAgICAgICAgICAgICAgICAg ICAgIChsYW1iZGEgKGYpCisgICAgICAgICAgICAgICAgICAgICAgICAgIChpbnN0YWxsLWZpbGUg ZiAoc3RyaW5nLWFwcGVuZCBvdXQgb3V0LWRpcikpKQorICAgICAgICAgICAgICAgICAgICAgICAg KGZpbmQtZmlsZXMgInRhcmdldC9yZWxlYXNlL2J1aWxkLyIgY29tcGxldGlvbikpKSkpCisgICAg ICAgICAgICAgICA7OyBNYW5wYWdlcworICAgICAgICAgICAgICAgKGluc3RhbGwtZmlsZSAiZG9j L2ZkLjEiIChzdHJpbmctYXBwZW5kIG91dCAiL3NoYXJlL21hbi9tYW4xIikpCisgICAgICAgICAg ICAgICA7OyBDb21wbGV0aW9ucworICAgICAgICAgICAgICAgKGluc3RhbGwtY29tcGxldGlvbgor ICAgICAgICAgICAgICAgICJeZmQuYmFzaCQiICIvZXRjL2Jhc2gtY29tcGxldGlvbi5kIikKKyAg ICAgICAgICAgICAgIChpbnN0YWxsLWNvbXBsZXRpb24KKyAgICAgICAgICAgICAgICAiXmZkLmZp c2gkIiAiL3NoYXJlL2Zpc2gvdmVuZG9yX2NvbXBsZXRpb25zLmQiKQorICAgICAgICAgICAgICAg KGluc3RhbGwtY29tcGxldGlvbgorICAgICAgICAgICAgICAgICJeX2ZkJCIgIi9zaGFyZS96c2gv c2l0ZS1mdW5jdGlvbnMiKQorICAgICAgICAgICAgICAgI3QpKSkpKSkKKyAgICAoaW5wdXRzIGAo KCJqZW1hbGxvYyIgLGplbWFsbG9jKSkpCisgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9naXRodWIu Y29tL3NoYXJrZHAvZmQiKQorICAgIChzeW5vcHNpcworICAgICAiU2ltcGxlLCBmYXN0IGFuZCB1 c2VyLWZyaWVuZGx5IGFsdGVybmF0aXZlIHRvIGZpbmQiKQorICAgIChkZXNjcmlwdGlvbgorICAg ICAiZmQgaXMgYSBzaW1wbGUsIGZhc3QgYW5kIHVzZXItZnJpZW5kbHkgYWx0ZXJuYXRpdmUgdG8g ZmluZC4iKQorICAgIChsaWNlbnNlIChsaXN0IGxpY2Vuc2U6ZXhwYXQgbGljZW5zZTphc2wyLjAp KSkpCisKIChkZWZpbmUtcHVibGljIHJpcGdyZXAKICAgKHBhY2thZ2UKICAgICAobmFtZSAicmlw Z3JlcCIpCi0tIAoyLjI1LjAKCg== --0000000000006f95c5059ded831c--