From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Bavier Subject: Re: [PATCH] gnu: unison: Add "doc" output. Date: Fri, 8 Jan 2016 01:13:41 -0600 Message-ID: <20160108011341.263e863a@openmailbox.org> References: <20151218194215.50af651c@openmailbox.org> <8737uwu5xg.fsf@gnu.org> <20151220220138.1346f5b5@PocketWee> <8760zsozld.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/4W4.HU6aPVS3B+rbRM/iQe0" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHRFO-0003bV-4E for guix-devel@gnu.org; Fri, 08 Jan 2016 02:14:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHRFK-0004rG-S6 for guix-devel@gnu.org; Fri, 08 Jan 2016 02:14:06 -0500 Received: from smtp18.openmailbox.org ([62.4.1.52]:60599) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHRFK-0004qu-Ff for guix-devel@gnu.org; Fri, 08 Jan 2016 02:14:02 -0500 In-Reply-To: <8760zsozld.fsf@gnu.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.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Cc: guix-devel@gnu.org --MP_/4W4.HU6aPVS3B+rbRM/iQe0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Mon, 21 Dec 2015 11:39:10 +0100 ludo@gnu.org (Ludovic Court=C3=A8s) wrote: > Eric Bavier skribis: >=20 > > On Sun, 20 Dec 2015 23:11:07 +0100 > > ludo@gnu.org (Ludovic Court=C3=A8s) wrote: > > =20 > >> Eric Bavier skribis: > >> =20 > >> > +(define (unison-doc ext version hash) > >> > + (origin > >> > + (method url-fetch) > >> > + (uri (string-append "https://www.seas.upenn.edu/~bcpierce/uniso= n/" > >> > + "download/releases/unison-" version "/uniso= n-" > >> > + version "-manual." ext)) > >> > + (sha256 (base32 hash)))) =20 > >>=20 > >> [...] > >> =20 > >> > + `(("doc-pdf" > >> > + ,(unison-doc "pdf" version > >> > + "0y5mywjn352nw4wqli94gnc5vn1f72g56jqqk1nqajz0a= rk998nb")) > >> > + ("doc-ps" > >> > + ,(unison-doc "ps" version > >> > + "11awy1xxhmckwnx42hllmngmx8q4ck18vpwpgfqqhj0x8= vx0b3ha")) > >> > + ("doc-html" > >> > + ,(unison-doc "html" version > >> > + "06myrpv067j5ffm265fm0a83gm41j9bv3ps3yiyb1hqgf= y1qy3ah")))) =20 > >>=20 > >> Could we instead build them from source? =20 > > > > Possibly. The documentation source is not available in the download > > tarball, only in the developer svn repository, so we could do an svn > > fetch of that. Would that be alright? =20 >=20 > Sure. Attached is an updated patch that pulls the unison source from the developer svn repository and builds the documentation from that. The origin snippet is a bit more than I had hoped for, but it works. `~Eric --MP_/4W4.HU6aPVS3B+rbRM/iQe0 Content-Type: text/plain Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-unison-Add-doc-output.patch RnJvbSBjOGEwMDg2ZGI0ZDc4MDkxZTA2MzI2YTVmZmU1NWE3YmYyNTQzMDkxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQ0KRnJvbTogRXJpYyBCYXZpZXIgPGJhdmllckBtZW1iZXIuZnNmLm9yZz4N CkRhdGU6IEZyaSwgMTggRGVjIDIwMTUgMTk6Mjk6MjIgLTA2MDANClN1YmplY3Q6IFtQQVRDSF0g Z251OiB1bmlzb246IEFkZCAiZG9jIiBvdXRwdXQuDQoNCiogZ251L3BhY2thZ2VzL29jYW1sLnNj bSAodW5pc29uKVtzb3VyY2VdOiBVc2Ugc3ZuLWZldGNoIHdpdGggc25pcHBldC4NCiAgW291dHB1 dHNdOiBOZXcgZmllbGQuDQogIFtuYXRpdmUtaW5wdXRzXTogQWRkIGdob3N0c2NyaXB0LCB0ZXhs aXZlLCBoZXZlYSwgYW5kIGx5bnguDQogIFthcmd1bWVudHNdOiBBZGQgJ2luc3RhbGwtZG9jIHBo YXNlLg0KLS0tDQogZ251L3BhY2thZ2VzL29jYW1sLnNjbSB8IDkxICsrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tDQogMSBmaWxlIGNoYW5nZWQsIDgyIGlu c2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pDQoNCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMv b2NhbWwuc2NtIGIvZ251L3BhY2thZ2VzL29jYW1sLnNjbQ0KaW5kZXggN2Y4MGZjOC4uMTk5NDNj ZiAxMDA2NDQNCi0tLSBhL2dudS9wYWNrYWdlcy9vY2FtbC5zY20NCisrKyBiL2dudS9wYWNrYWdl cy9vY2FtbC5zY20NCkBAIC0zLDYgKzMsNyBAQA0KIDs7OyBDb3B5cmlnaHQgwqkgMjAxNCwgMjAx NSBNYXJrIEggV2VhdmVyIDxtaHdAbmV0cmlzLm9yZz4NCiA7OzsgQ29weXJpZ2h0IMKpIDIwMTUg QW5kcmVhcyBFbmdlIDxhbmRyZWFzQGVuZ2UuZnI+DQogOzs7IENvcHlyaWdodCDCqSAyMDE1IERh dmlkIEhhc2hlIDxkYXZpZC5oYXNoZUBkaGFzaGUuY29tPg0KKzs7OyBDb3B5cmlnaHQgwqkgMjAx NiBFcmljIEJhdmllciA8YmF2aWVyQG1lbWJlci5mc2Yub3JnPg0KIDs7Ow0KIDs7OyBUaGlzIGZp bGUgaXMgcGFydCBvZiBHTlUgR3VpeC4NCiA7OzsNCkBAIC0yMyw2ICsyNCw3IEBADQogICAjOnVz ZS1tb2R1bGUgKChndWl4IGxpY2Vuc2VzKSAjOmhpZGUgKHpsaWIpKQ0KICAgIzp1c2UtbW9kdWxl IChndWl4IHBhY2thZ2VzKQ0KICAgIzp1c2UtbW9kdWxlIChndWl4IGRvd25sb2FkKQ0KKyAgIzp1 c2UtbW9kdWxlIChndWl4IHN2bi1kb3dubG9hZCkNCiAgICM6dXNlLW1vZHVsZSAoZ3VpeCB1dGls cykNCiAgICM6dXNlLW1vZHVsZSAoZ3VpeCBidWlsZC1zeXN0ZW0gZ251KQ0KICAgIzp1c2UtbW9k dWxlIChnbnUgcGFja2FnZXMpDQpAQCAtMzYsNiArMzgsOCBAQA0KICAgIzp1c2UtbW9kdWxlIChn bnUgcGFja2FnZXMgY29tcHJlc3Npb24pDQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB4 b3JnKQ0KICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgdGV4bGl2ZSkNCisgICM6dXNlLW1v ZHVsZSAoZ251IHBhY2thZ2VzIGdob3N0c2NyaXB0KQ0KKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFj a2FnZXMgbHlueCkNCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHBlcmwpDQogICAjOnVz ZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBweXRob24pDQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNr YWdlcyBuY3Vyc2VzKQ0KQEAgLTQ5NiwxNiArNTAwLDY3IEBAIGxpYnBhbmVsLCBsaWJyc3ZnIGFu ZCBxdWFydHouIikNCiAgICAgKHZlcnNpb24gIjIuNDguMyIpDQogICAgIChzb3VyY2UNCiAgICAg ICAob3JpZ2luDQotICAgICAgICAobWV0aG9kIHVybC1mZXRjaCkNCi0gICAgICAgICAgKHVyaSAo c3RyaW5nLWFwcGVuZCAiaHR0cHM6Ly93d3cuc2Vhcy51cGVubi5lZHUvfmJjcGllcmNlL3VuaXNv bi8iDQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImRvd25sb2FkL3JlbGVhc2VzL3N0 YWJsZS91bmlzb24tIiB2ZXJzaW9uDQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIi50 YXIuZ3oiKSkNCi0gICAgICAgICAgKHNoYTI1Ng0KLSAgICAgICAgICAgIChiYXNlMzINCi0gICAg ICAgICAgICAgICIxMHNsbjUycm5uc2oyMTNqeTMxNjZtMHE5N3Fwd25yd2w2bW01Mjl4ZnkxMHgz eGtxM2dsIikpKSkNCisgICAgICAgIChtZXRob2Qgc3ZuLWZldGNoKQ0KKyAgICAgICAgKHVyaSAo c3ZuLXJlZmVyZW5jZQ0KKyAgICAgICAgICAgICAgKHVybCAoc3RyaW5nLWFwcGVuZCAiaHR0cHM6 Ly93ZWJkYXYuc2Vhcy51cGVubi5lZHUvc3ZuLyINCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgInVuaXNvbi9icmFuY2hlcy8iDQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICh2ZXJzaW9uLW1ham9yK21pbm9yIHZlcnNpb24pKSkNCisgICAgICAgICAgICAgIChy ZXZpc2lvbiA1MzUpKSkNCisgICAgICAgIChmaWxlLW5hbWUgKHN0cmluZy1hcHBlbmQgbmFtZSAi LSIgdmVyc2lvbiAiLWNoZWNrb3V0IikpDQorICAgICAgICAoc2hhMjU2DQorICAgICAgICAgKGJh c2UzMg0KKyAgICAgICAgICAiMDQ4NnM1M3d5YXlpY2o5ZjJyYWoyZHZ3dms0eHl6YXIyMTlyY2Nj MWljemR3aXhtNHgwNSIpKQ0KKyAgICAgICAgKG1vZHVsZXMgJygoZ3VpeCBidWlsZCB1dGlscykN CisgICAgICAgICAgICAgICAgICAgKGljZS05IHJkZWxpbSkNCisgICAgICAgICAgICAgICAgICAg KGljZS05IHJlZ2V4KQ0KKyAgICAgICAgICAgICAgICAgICAoc3JmaSBzcmZpLTEpKSkNCisgICAg ICAgIChzbmlwcGV0DQorICAgICAgICAgYChiZWdpbg0KKyAgICAgICAgICAgIDs7IFRoZSBzdm4g cmV2aXNpb24gaW4gdGhlIHJlbGVhc2UgdGFyYmFsbCBhcHBlYXJzIHRvIGJlDQorICAgICAgICAg ICAgOzsgYXJ0aWZpY2lhbGx5IG1hbmlwdWxhdGVkIGluIG9yZGVyIHRvIHNldCB0aGUgZGVzaXJl ZCBwb2ludA0KKyAgICAgICAgICAgIDs7IHZlcnNpb24gbnVtYmVyLiAgQmVjYXVzZSB0aGUgcG9p bnQgdmVyc2lvbiBpcyBjYWxjdWxhdGVkIGR1cmluZw0KKyAgICAgICAgICAgIDs7IHRoZSBidWls ZCwgd2UgY2FuIG9mZnNldCBwb2ludFZlcnNpb25PcmlnaW4gYnkgdGhlIGRlc2lyZWQNCisgICAg ICAgICAgICA7OyBwb2ludCB2ZXJzaW9uIGFuZCB3cml0ZSB0aGF0IGludG8gIlJldjogJWQiLiAg V2UgZG8gdGhpcyByYXRoZXINCisgICAgICAgICAgICA7OyB0aGFuIGhhcmRjb2RpbmcgdGhlIG5l Y2Vzc2FyeSByZXZpc2lvbiBudW1iZXIsIGZvcg0KKyAgICAgICAgICAgIDs7IG1haW50YWluYWJp bGl0eS4NCisgICAgICAgICAgICAod2l0aC1hdG9taWMtZmlsZS1yZXBsYWNlbWVudCAic3JjL21r UHJvamVjdEluZm8ubWwiDQorICAgICAgICAgICAgICAobGFtYmRhIChpbiBvdXQpDQorICAgICAg ICAgICAgICAgIChsZXQgKChwdC12ZXIgKHN0cmluZy0+bnVtYmVyICh0aGlyZCAoc3RyaW5nLXNw bGl0ICx2ZXJzaW9uICNcLikpKSkNCisgICAgICAgICAgICAgICAgICAgICAgKHB0LXJ4ICAobWFr ZS1yZWdleHAgIl5sZXQgcG9pbnRWZXJzaW9uT3JpZ2luID0gKFswLTldKykiKSkNCisgICAgICAg ICAgICAgICAgICAgICAgKHJldi1yeCAobWFrZS1yZWdleHAgIlJldjogWzAtOV0rIikpKQ0KKyAg ICAgICAgICAgICAgICAgIChsZXQgbG9vcCAoKHB0LW9yaWdpbiAjZikpDQorICAgICAgICAgICAg ICAgICAgICAobGV0ICgobGluZSAocmVhZC1saW5lIGluICdjb25jYXQpKSkNCisgICAgICAgICAg ICAgICAgICAgICAgKGNvbmQNCisgICAgICAgICAgICAgICAgICAgICAgICgocmVnZXhwLWV4ZWMg cHQtcnggbGluZSkNCisgICAgICAgICAgICAgICAgICAgICAgICA9PiAobGFtYmRhIChtKQ0KKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgKGJlZ2luDQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIChkaXNwbGF5IGxpbmUgb3V0KQ0KKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAobG9vcCAoc3RyaW5nLT5udW1iZXIgKG1hdGNoOnN1YnN0cmluZyBtIDEpKSkpKSkNCisg ICAgICAgICAgICAgICAgICAgICAgICgocmVnZXhwLWV4ZWMgcmV2LXJ4IGxpbmUpDQorICAgICAg ICAgICAgICAgICAgICAgICAgPT4gKGxhbWJkYSAobSkNCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIChiZWdpbg0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoZm9ybWF0IG91 dCAifmFSZXY6IH5kfmEiDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KG1hdGNoOnByZWZpeCBtKQ0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICgrIHB0LW9yaWdpbiBwdC12ZXIpDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgKG1hdGNoOnN1ZmZpeCBtKSkNCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KGR1bXAtcG9ydCBpbiBvdXQpKSkpIDtkb25lDQorICAgICAgICAgICAgICAgICAgICAgICAoZWxz ZQ0KKyAgICAgICAgICAgICAgICAgICAgICAgIChkaXNwbGF5IGxpbmUgb3V0KQ0KKyAgICAgICAg ICAgICAgICAgICAgICAgIChsb29wIHB0LW9yaWdpbikpKSkpKSkpDQorICAgICAgICAgICAgOzsg V2l0aG91dCB0aGUgJy1maXgnIGFyZ3VtZW50LCB0aGUgaHRtbCBmaWxlIHByb2R1Y2VkIGRvZXMg bm90DQorICAgICAgICAgICAgOzsgaGF2ZSBmdW5jdGlvbmluZyBpbnRlcm5hbCBoeXBlcmxpbmtz Lg0KKyAgICAgICAgICAgIChzdWJzdGl0dXRlKiAiZG9jL01ha2VmaWxlIg0KKyAgICAgICAgICAg ICAgKCgiaGV2ZWEgdW5pc29uIikgImhldmVhIC1maXggdW5pc29uIikpKSkpKQ0KICAgICAoYnVp bGQtc3lzdGVtIGdudS1idWlsZC1zeXN0ZW0pDQorICAgIChvdXRwdXRzICcoIm91dCINCisgICAg ICAgICAgICAgICAiZG9jIikpICAgICAgICAgICAgICAgICAgOyAxLjkgTWlCIG9mIGRvY3VtZW50 YXRpb24NCiAgICAgKG5hdGl2ZS1pbnB1dHMNCi0gICAgIGAoKCJvY2FtbCIgLG9jYW1sKSkpDQor ICAgICBgKCgib2NhbWwiICxvY2FtbCkNCisgICAgICAgOzsgRm9yIGRvY3VtZW50YXRpb24NCisg ICAgICAgKCJnaG9zdHNjcmlwdCIgLGdob3N0c2NyaXB0KQ0KKyAgICAgICAoInRleGxpdmUiICx0 ZXhsaXZlKQ0KKyAgICAgICAoImhldmVhIiAsaGV2ZWEpDQorICAgICAgICgibHlueCIgLGx5bngp KSkNCiAgICAgKGFyZ3VtZW50cw0KICAgICAgYCgjOnBhcmFsbGVsLWJ1aWxkPyAjZg0KICAgICAg ICAjOnBhcmFsbGVsLXRlc3RzPyAjZg0KQEAgLTUyMiw3ICs1NzcsMjUgQEAgbGlicGFuZWwsIGxp YnJzdmcgYW5kIHF1YXJ0ei4iKQ0KICAgICAgICAgICAgICAgICAgICAgICAoYmluIChzdHJpbmct YXBwZW5kIG91dCAiL2JpbiIpKSkNCiAgICAgICAgICAgICAgICAgIChta2Rpci1wIGJpbikNCiAg ICAgICAgICAgICAgICAgIChzZXRlbnYgIkhPTUUiIG91dCkgOyBmb3JjZXMgY29ycmVjdCBJTlNU QUxMRElSIGluIE1ha2VmaWxlDQotICAgICAgICAgICAgICAgICAjdCkpKSkpKQ0KKyAgICAgICAg ICAgICAgICAgI3QpKSkNCisgICAgICAgICAgIChhZGQtYWZ0ZXIgJ2luc3RhbGwgJ2luc3RhbGwt ZG9jDQorICAgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBpbnB1dHMgb3V0cHV0cyAjOmFsbG93 LW90aGVyLWtleXMpDQorICAgICAgICAgICAgICAgKGxldCAoKGRvYyAoc3RyaW5nLWFwcGVuZCAo YXNzb2MtcmVmIG91dHB1dHMgImRvYyIpDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAiL3NoYXJlL2RvYy91bmlzb24iKSkpDQorICAgICAgICAgICAgICAgICAobWtk aXItcCBkb2MpDQorICAgICAgICAgICAgICAgICA7OyBUaGlzIGZpbGUgbmVlZHMgd3JpdGUtcGVy bWlzc2lvbnMsIGJlY2F1c2UgaXQncw0KKyAgICAgICAgICAgICAgICAgOzsgb3ZlcndyaXR0ZW4g YnkgJ2RvY3MnIGR1cmluZyBkb2N1bWVudGF0aW9uIGdlbmVyYXRpb24uDQorICAgICAgICAgICAg ICAgICAoY2htb2QgInNyYy9zdHJpbmdzLm1sIiAjbzYwMCkNCisgICAgICAgICAgICAgICAgIChh bmQgKHplcm8/IChzeXN0ZW0qICJtYWtlIiAiZG9jcyINCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICJURVhESVJFQ1RJVkVTPVxcXFxkcmFmdGZhbHNlIikpDQorICAgICAg ICAgICAgICAgICAgICAgIChiZWdpbg0KKyAgICAgICAgICAgICAgICAgICAgICAgIChmb3ItZWFj aCAobGFtYmRhIChmKQ0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChpbnN0 YWxsLWZpbGUgZiBkb2MpKQ0KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAobWFw IChsYW1iZGEgKGV4dCkNCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IChzdHJpbmctYXBwZW5kDQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgImRvYy91bmlzb24tbWFudWFsLiIgZXh0KSkNCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnKCJwcyIgInBkZiIgImR2aSIgImh0bWwiKSkpDQorICAgICAgICAgICAg ICAgICAgICAgICAgI3QpKSkpKSkpKQ0KICAgICAoaG9tZS1wYWdlICJodHRwczovL3d3dy5jaXMu dXBlbm4uZWR1L35iY3BpZXJjZS91bmlzb24vIikNCiAgICAgKHN5bm9wc2lzICJGaWxlIHN5bmNo cm9uaXplciIpDQogICAgIChkZXNjcmlwdGlvbg0KLS0gDQoyLjYuMw0KDQo= --MP_/4W4.HU6aPVS3B+rbRM/iQe0--