From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:33490) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8opP-0003RA-Gt for guix-patches@gnu.org; Mon, 02 Mar 2020 12:26:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8opO-0003lg-3D for guix-patches@gnu.org; Mon, 02 Mar 2020 12:26:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60566) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8opN-0003lc-Vv for guix-patches@gnu.org; Mon, 02 Mar 2020 12:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j8opN-0002yh-Rw for guix-patches@gnu.org; Mon, 02 Mar 2020 12:26:01 -0500 Subject: [bug#39547] [PATCH v3] sources.json: array instead of list References: <20200210170418.32076-1-zimon.toutoune@gmail.com> In-Reply-To: <20200210170418.32076-1-zimon.toutoune@gmail.com> Resent-Message-ID: MIME-Version: 1.0 From: zimoun Date: Mon, 2 Mar 2020 18:24:49 +0100 Message-ID: Content-Type: multipart/mixed; boundary="0000000000009501fb059fe27718" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39547@debbugs.gnu.org, Ludovic =?UTF-8?Q?Court=C3=A8s?= --0000000000009501fb059fe27718 Content-Type: text/plain; charset="UTF-8" Hi Ludo, Attached, the tiny modification to output the list (array) of URLs instead of the first one. The version number is still '1' because I do not know yet if lewo would bump it. Note also that "transformer" is not useful any more because 'packages-json-builder' and 'sources-json-builder' returns both vectors now. Cheers, simon --0000000000009501fb059fe27718 Content-Type: text/x-patch; charset="UTF-8"; name="v3-0001-website-Refactor-and-resolve-mirror-of-JSON-packa.patch" Content-Disposition: attachment; filename="v3-0001-website-Refactor-and-resolve-mirror-of-JSON-packa.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k7aqbgsw1 RnJvbSA1N2E0NDRmNmYyMTVmYjYzMjc3MTkxNjFhNmU2YWQ0YWQyMjkyNzNmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiB6aW1vdW4gPHppbW9uLnRvdXRvdW5lQGdtYWlsLmNvbT4KRGF0 ZTogTW9uLCAxMCBGZWIgMjAyMCAxNzo1MjoxMyArMDEwMApTdWJqZWN0OiBbUEFUQ0ggdjMgMS8y XSB3ZWJzaXRlOiBSZWZhY3RvciBhbmQgcmVzb2x2ZSBtaXJyb3I6Ly8gb2YgSlNPTgogcGFja2Fn ZSBsaXN0LgoKKiB3ZWJzaXRlL2FwcHMvcGFja2FnZXMvYnVpbGRlci5zY20gKG9yaWdpbi0+anNv bik6IE5ldyBwcm9jZWR1cmUuCi0tLQogd2Vic2l0ZS9hcHBzL3BhY2thZ2VzL2J1aWxkZXIuc2Nt IHwgMzQgKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI0 IGluc2VydGlvbnMoKyksIDEwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3dlYnNpdGUvYXBw cy9wYWNrYWdlcy9idWlsZGVyLnNjbSBiL3dlYnNpdGUvYXBwcy9wYWNrYWdlcy9idWlsZGVyLnNj bQppbmRleCA5ZGM0NGM5Li5kM2E3NzdlIDEwMDY0NAotLS0gYS93ZWJzaXRlL2FwcHMvcGFja2Fn ZXMvYnVpbGRlci5zY20KKysrIGIvd2Vic2l0ZS9hcHBzL3BhY2thZ2VzL2J1aWxkZXIuc2NtCkBA IC0yLDYgKzIsNyBAQAogOzs7IENvcHlyaWdodCDCqSAyMDE3IEx1ZG92aWMgQ291cnTDqHMgPGx1 ZG9AZ251Lm9yZz4KIDs7OyBDb3B5cmlnaHQgwqkgMjAxOSBSaWNhcmRvIFd1cm11cyA8cmVrYWRv QGVsZXBobHkubmV0PgogOzs7IENvcHlyaWdodCDCqSAyMDE5IE5pY29sw7IgQmFsemFyb3R0aSA8 bmljb2xvQG5peG8ueHl6PgorOzs7IENvcHlyaWdodCDCqSAyMDIwIFNpbW9uIFRvdXJuaWVyIDx6 aW1vbi50b3V0b3VuZUBnbWFpbC5jb20+CiA7OzsKIDs7OyBJbml0aWFsbHkgd3JpdHRlbiBieSBz aXJnYXppbAogOzs7IHdobyB3YWl2ZXMgYWxsIGNvcHlyaWdodCBpbnRlcmVzdCBvbiB0aGlzIGZp bGUuCkBAIC0zNywxMyArMzgsMTYgQEAKICAgIzp1c2UtbW9kdWxlIChoYXVudCBwYWdlKQogICAj OnVzZS1tb2R1bGUgKGhhdW50IHV0aWxzKQogICAjOnVzZS1tb2R1bGUgKHNyZmkgc3JmaS0xKQor ICAjOnVzZS1tb2R1bGUgKHNyZmkgc3JmaS0yNikKICAgIzp1c2UtbW9kdWxlIChndWl4IHBhY2th Z2VzKQogICAjOnVzZS1tb2R1bGUgKGd1aXggZG93bmxvYWQpCiAgICM6dXNlLW1vZHVsZSAoZ3Vp eCBnaXQtZG93bmxvYWQpCiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBzdm4tZG93bmxvYWQpCiAgICM6 dXNlLW1vZHVsZSAoZ3VpeCB1dGlscykgICAgICAgICAgICAgICAgICAgICAgIDtsb2NhdGlvbgor ICAjOnVzZS1tb2R1bGUgKChndWl4IGJ1aWxkIGRvd25sb2FkKSAjOnNlbGVjdCAobWF5YmUtZXhw YW5kLW1pcnJvcnMpKQogICAjOnVzZS1tb2R1bGUgKGpzb24pCiAgICM6dXNlLW1vZHVsZSAoaWNl LTkgbWF0Y2gpCisgICM6dXNlLW1vZHVsZSAoKHdlYiB1cmkpICM6c2VsZWN0IChzdHJpbmctPnVy aSB1cmktPnN0cmluZykpCiAgICM6ZXhwb3J0IChidWlsZGVyKSkKIAogCkBAIC04NCwzMyArODgs NDMgQEAKICAgOzsgTWF4aW11bSBudW1iZXIgb2YgcGFja2FnZXMgc2hvd24gb24gL3BhY2thZ2Vz LgogICAzMCkKIAotKGRlZmluZSAocGFja2FnZXMtanNvbi1idWlsZGVyKQotICAiUmV0dXJuIGEg SlNPTiBwYWdlIGxpc3RpbmcgYWxsIHBhY2thZ2VzLiIKLSAgKGRlZmluZSAob3JpZ2luLT5qc29u IG9yaWdpbikKKyhkZWZpbmUgKG9yaWdpbi0+anNvbiBvcmlnaW4pCiAgICAgKGRlZmluZSBtZXRo b2QKICAgICAgIChvcmlnaW4tbWV0aG9kIG9yaWdpbikpCiAKKyAgICAoZGVmaW5lIHVyaSAgICAg ICAgICAgICAgICAgICAgICAgICA7cmVwcmVzZW50ZWQgYXMgc3RyaW5nCisgICAgICAob3JpZ2lu LXVyaSBvcmlnaW4pKQorCisgICAgKGRlZmluZSAocmVzb2x2ZSB1cmxzKQorICAgICAgKG1hcCB1 cmktPnN0cmluZworICAgICAgICAgICAoYXBwZW5kLW1hcCAoY3V0IG1heWJlLWV4cGFuZC1taXJy b3JzIDw+ICVtaXJyb3JzKQorICAgICAgICAgICAgICAgICAgICAgICAobWFwIHN0cmluZy0+dXJp IHVybHMpKSkpCisKICAgICBgKCh0eXBlIC4gLChjb25kICgoZXE/IHVybC1mZXRjaCBtZXRob2Qp ICd1cmwpCiAgICAgICAgICAgICAgICAgICAgICAoKGVxPyBnaXQtZmV0Y2ggbWV0aG9kKSAnZ2l0 KQogICAgICAgICAgICAgICAgICAgICAgKChlcT8gc3ZuLWZldGNoIG1ldGhvZCkgJ3N2bikKICAg ICAgICAgICAgICAgICAgICAgIChlbHNlICAgICAgICAgICAgICAgICAgICNuaWwpKSkKICAgICAg ICxAKGNvbmQgKChlcT8gdXJsLWZldGNoIG1ldGhvZCkKLSAgICAgICAgICAgICAgIGAoKCJ1cmwi IC4gLChtYXRjaCAob3JpZ2luLXVyaSBvcmlnaW4pCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICgoPyBzdHJpbmc/IHVybCkgKHZlY3RvciB1cmwpKQotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAoKHVybHMgLi4uKSAobGlzdC0+dmVjdG9yIHVybHMpKSkpKSkKKyAgICAgICAgICAg ICAgIGAoKCJ1cmwiIC4gLChsaXN0LT52ZWN0b3IKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAocmVzb2x2ZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobWF0Y2ggdXJpCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgKCg/IHN0cmluZz8gdXJsKSAobGlzdCB1cmwpKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgodXJscyAuLi4pIHVybHMpKSkpKSkpCiAg ICAgICAgICAgICAgICgoZXE/IGdpdC1mZXRjaCBtZXRob2QpCi0gICAgICAgICAgICAgICBgKCgi Z2l0X3VybCIgLiAsKGdpdC1yZWZlcmVuY2UtdXJsIChvcmlnaW4tdXJpIG9yaWdpbikpKSkpCisg ICAgICAgICAgICAgICBgKCgiZ2l0X3VybCIgLiAsKGdpdC1yZWZlcmVuY2UtdXJsIHVyaSkpKSkK ICAgICAgICAgICAgICAgKChlcT8gc3ZuLWZldGNoIG1ldGhvZCkKLSAgICAgICAgICAgICAgIGAo KCJzdm5fdXJsIiAuICwoc3ZuLXJlZmVyZW5jZS11cmwgKG9yaWdpbi11cmkgb3JpZ2luKSkpKSkK KyAgICAgICAgICAgICAgIGAoKCJzdm5fdXJsIiAuICwoc3ZuLXJlZmVyZW5jZS11cmwgdXJpKSkp KQogICAgICAgICAgICAgICAoZWxzZSAnKCkpKQogICAgICAgLEAoaWYgKGVxPyBtZXRob2QgZ2l0 LWZldGNoKQotICAgICAgICAgICAgYCgoImdpdF9yZWYiIC4gLChnaXQtcmVmZXJlbmNlLWNvbW1p dCAob3JpZ2luLXVyaSBvcmlnaW4pKSkpCisgICAgICAgICAgICBgKCgiZ2l0X3JlZiIgLiAsKGdp dC1yZWZlcmVuY2UtY29tbWl0IHVyaSkpKQogICAgICAgICAgICAgJygpKQogICAgICAgLEAoaWYg KGVxPyBtZXRob2Qgc3ZuLWZldGNoKQogICAgICAgICAgICAgYCgoInN2bl9yZXZpc2lvbiIgLiAs KHN2bi1yZWZlcmVuY2UtcmV2aXNpb24KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAob3JpZ2luLXVyaSBvcmlnaW4pKSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgdXJpKSkpCiAgICAgICAgICAgICAnKCkpKSkKIAorKGRlZmluZSAocGFja2FnZXMtanNvbi1i dWlsZGVyKQorICAiUmV0dXJuIGEgSlNPTiBwYWdlIGxpc3RpbmcgYWxsIHBhY2thZ2VzLiIKICAg KGRlZmluZSAocGFja2FnZS0+anNvbiBwYWNrYWdlKQogICAgIChkZWZpbmUgY3BlLW5hbWUKICAg ICAgIChhc3NvYy1yZWYgKHBhY2thZ2UtcHJvcGVydGllcyBwYWNrYWdlKSAnY3BlLW5hbWUpKQot LSAKMi4yNS4wCgo= --0000000000009501fb059fe27718 Content-Type: text/x-patch; charset="US-ASCII"; name="v3-0002-website-Provide-JSON-sources-list-used-by-Softwar.patch" Content-Disposition: attachment; filename="v3-0002-website-Provide-JSON-sources-list-used-by-Softwar.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k7aqbgq80 RnJvbSA3MzU1N2JjMDA3NjBiNDQwNGJmZTE3ZWNiM2FjYTk4M2M2ZGNjMTFlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiB6aW1vdW4gPHppbW9uLnRvdXRvdW5lQGdtYWlsLmNvbT4KRGF0 ZTogVHVlLCAxOCBGZWIgMjAyMCAxMzoyNToxNCArMDEwMApTdWJqZWN0OiBbUEFUQ0ggdjMgMi8y XSB3ZWJzaXRlOiBQcm92aWRlIEpTT04gc291cmNlcyBsaXN0IHVzZWQgYnkgU29mdHdhcmUKIEhl cml0YWdlLgoKRm9ybWF0IGRpc2N1c3NlZCBoZXJlIDxodHRwczovL2ZvcmdlLnNvZnR3YXJlaGVy aXRhZ2Uub3JnL0QyMDI1IzUxMjY5Pi4KCiogd2Vic2l0ZS9hcHBzL3BhY2thZ2VzL2J1aWxkZXIu c2NtIChvcmlnaW4tPmpzb24pOiBBZGQgbGlzdCBtb2RpZmllci4KKiB3ZWJzaXRlL2FwcHMvcGFj a2FnZXMvYnVpbGRlci5zY20gKHNvdXJjZXMtanNvbi1idWlsZGVyKTogTmV3IHByb2NlZHVyZS4K LS0tCiB3ZWJzaXRlL2FwcHMvcGFja2FnZXMvYnVpbGRlci5zY20gfCAyMCArKysrKysrKysrKysr KysrKystLQogMSBmaWxlIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvd2Vic2l0ZS9hcHBzL3BhY2thZ2VzL2J1aWxkZXIuc2NtIGIvd2Vic2l0 ZS9hcHBzL3BhY2thZ2VzL2J1aWxkZXIuc2NtCmluZGV4IGQzYTc3N2UuLjNmYzEyODUgMTAwNjQ0 Ci0tLSBhL3dlYnNpdGUvYXBwcy9wYWNrYWdlcy9idWlsZGVyLnNjbQorKysgYi93ZWJzaXRlL2Fw cHMvcGFja2FnZXMvYnVpbGRlci5zY20KQEAgLTc0LDYgKzc0LDcgQEAKICAgKGZsYXR0ZW4KICAg IChsaXN0CiAgICAgKGluZGV4LWJ1aWxkZXIpCisgICAgKHNvdXJjZXMtanNvbi1idWlsZGVyKQog ICAgIChwYWNrYWdlcy1qc29uLWJ1aWxkZXIpCiAgICAgKHBhY2thZ2VzLWJ1aWxkZXIpCiAgICAg KHBhY2thZ2UtbGlzdC1idWlsZGVyKSkpKQpAQCAtODgsNyArODksNyBAQAogICA7OyBNYXhpbXVt IG51bWJlciBvZiBwYWNrYWdlcyBzaG93biBvbiAvcGFja2FnZXMuCiAgIDMwKQogCi0oZGVmaW5l IChvcmlnaW4tPmpzb24gb3JpZ2luKQorKGRlZmluZSogKG9yaWdpbi0+anNvbiBvcmlnaW4gIzpv cHRpb25hbCAodHJhbnNmb3JtZXIgbGlzdC0+dmVjdG9yKSkKICAgICAoZGVmaW5lIG1ldGhvZAog ICAgICAgKG9yaWdpbi1tZXRob2Qgb3JpZ2luKSkKIApAQCAtMTA1LDcgKzEwNiw3IEBACiAgICAg ICAgICAgICAgICAgICAgICAoKGVxPyBzdm4tZmV0Y2ggbWV0aG9kKSAnc3ZuKQogICAgICAgICAg ICAgICAgICAgICAgKGVsc2UgICAgICAgICAgICAgICAgICAgI25pbCkpKQogICAgICAgLEAoY29u ZCAoKGVxPyB1cmwtZmV0Y2ggbWV0aG9kKQotICAgICAgICAgICAgICAgYCgoInVybCIgLiAsKGxp c3QtPnZlY3RvcgorICAgICAgICAgICAgICAgYCgoInVybCIgLiAsKHRyYW5zZm9ybWVyCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgKHJlc29sdmUKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKG1hdGNoIHVyaQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgoPyBzdHJp bmc/IHVybCkgKGxpc3QgdXJsKSkKQEAgLTE1NSw2ICsxNTYsMjEgQEAKIAkgICAgIChsaXN0LT52 ZWN0b3IgKG1hcCBwYWNrYWdlLT5qc29uIChhbGwtcGFja2FnZXMpKSkKICAgICAgICAgICAgICBz Y20tPmpzb24pKQogCisoZGVmaW5lIChzb3VyY2VzLWpzb24tYnVpbGRlcikKKyAgIlJldHVybiBh IEpTT04gcGFnZSBsaXN0aW5nIGFsbCB0aGUgc291cmNlcy4KKworU2VlIDxodHRwczovL2Zvcmdl LnNvZnR3YXJlaGVyaXRhZ2Uub3JnL0QyMDI1IzUxMjY5Pi4iCisgIChkZWZpbmUgKHBhY2thZ2Ut Pmpzb24gcGFja2FnZSkKKyAgICBgKCxAKGlmIChvcmlnaW4/IChwYWNrYWdlLXNvdXJjZSBwYWNr YWdlKSkKKyAgICAgICAgICAgIChvcmlnaW4tPmpzb24gKHBhY2thZ2Utc291cmNlIHBhY2thZ2Up KQorICAgICAgICAgICAgYCgoInR5cGUiIC4gIm5vLW9yaWdpbiIpCisgICAgICAgICAgICAgICgi bmFtZSIgLiAsKHBhY2thZ2UtbmFtZSBwYWNrYWdlKSkpKSkpCisKKyAgKG1ha2UtcGFnZSAic291 cmNlcy5qc29uIgorICAgICAgICAgICAgIGAoKCJzb3VyY2VzIiAuICwobGlzdC0+dmVjdG9yICht YXAgcGFja2FnZS0+anNvbiAoYWxsLXBhY2thZ2VzKSkpKQorICAgICAgICAgICAgICAgKCJ2ZXJz aW9uIiAuICIxIikpCisgICAgICAgICAgICAgc2NtLT5qc29uKSkKKwogKGRlZmluZSAoaW5kZXgt YnVpbGRlcikKICAgIlJldHVybiBhIEhhdW50IHBhZ2UgbGlzdGluZyBzb21lIHJhbmRvbSBwYWNr YWdlcy4iCiAgIChkZWZpbmUgKHNhbXBsZSBuIGZyb20pCi0tIAoyLjI1LjAKCg== --0000000000009501fb059fe27718--