From mboxrd@z Thu Jan 1 00:00:00 1970 From: Omar Radwan Subject: Re: [PATCH] gnu: Add urwid Date: Sun, 1 Feb 2015 20:57:33 -0800 Message-ID: References: <87bnlddowe.fsf@netris.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=001a1140dc62d04567050e13ca4d Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI94q-0004Re-Kj for guix-devel@gnu.org; Sun, 01 Feb 2015 23:57:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YI94o-0004mm-J6 for guix-devel@gnu.org; Sun, 01 Feb 2015 23:57:36 -0500 Received: from mail-ig0-x231.google.com ([2607:f8b0:4001:c05::231]:37849) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI94o-0004md-99 for guix-devel@gnu.org; Sun, 01 Feb 2015 23:57:34 -0500 Received: by mail-ig0-f177.google.com with SMTP id z20so14425997igj.4 for ; Sun, 01 Feb 2015 20:57:33 -0800 (PST) In-Reply-To: <87bnlddowe.fsf@netris.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 To: Mark H Weaver Cc: guix-devel --001a1140dc62d04567050e13ca4d Content-Type: multipart/alternative; boundary=001a1140dc62d04562050e13ca4b --001a1140dc62d04562050e13ca4b Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Here's a patch that does all the changes you requested to the previous patch file On Sun, Feb 1, 2015 at 6:32 PM, Mark H Weaver wrote: > Omar Radwan writes: > > > From 7d65731aaec1b3dbca9364bc2b0f18c9fc9992e5 Mon Sep 17 00:00:00 2001 > > From: Omar Radwan > > Date: Sun, 1 Feb 2015 14:43:59 -0800 > > Subject: [PATCH] gnu: Add urwid > > Minor nits: add a period above, and: > > > * gnu/packages/python.scm(urwid) New variable. > > This should be: > > * gnu/packages/python.scm (urwid): New variable. > > (add missing space and colon) > > > --- > > gnu/packages/python.scm | 27 ++++++++++++++++++++++++++- > > 1 file changed, 26 insertions(+), 1 deletion(-) > > > > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm > > index 4b30695..19016b4 100644 > > --- a/gnu/packages/python.scm > > +++ b/gnu/packages/python.scm > > @@ -5,7 +5,7 @@ > > ;;; Copyright =C3=82=C2=A9 2014 Mark H Weaver > > ;;; Copyright =C3=82=C2=A9 2014 Eric Bavier > > ;;; Copyright =C3=82=C2=A9 2014, 2015 Federico Beffa > > -;;; > > +;;; Copyright =C3=82=C2=A9 2015 Omar Radwan > > ;;; This file is part of GNU Guix. > > Please keep the blank line below the copyright notices. > > More importantly, the encoding of the "=C2=A9" is getting munged somewher= e, > so this patch won't apply cleanly. > > > ;;; > > ;;; GNU Guix is free software; you can redistribute it and/or modify i= t > > @@ -2848,3 +2848,28 @@ and written in Python.") > > > > (define-public python2-html5lib > > (package-with-python2 python-html5lib)) > > + > > + > > +(define-public urwid > > + (package > > + (name "urwid") > > + (version "1.3.0") > > + (source > > + (origin > > + (method url-fetch) > > + (uri (string-append > > +" > https://pkgs.fedoraproject.org/repo/pkgs/python-urwid/urwid-1.3.0.tar.gz/= a989acd54f4ff1a554add464803a9175/urwid-1.3.0.tar.gz")) > ;;upstream can't be used because Pypi don't have ETag headers in qoutes > > How about this instead: > > (uri (list (string-append > "https://pypi.python.org/packages/source/u/urwid/urwid-= " > version ".tar.gz") > ;; Downloading from the upstream URI above fails due to = an > ;; invalid ETag header. > " > https://pkgs.fedoraproject.org/repo/pkgs/python-urwid/urwid-1.3.0.tar.gz/= a989acd54f4ff1a554add464803a9175/urwid-1.3.0.tar.gz > ")) > > This first tries to download from the canonical upstream URL, in case > they fix their ETag headers, but falls back to the Fedora mirror. > > > + (sha256 > > + (base32 > > + "18mb0yy94sjc434rd61m2sfnw27sa0nyrszpj5a9r9zh7fnlzw19")))) > > + (build-system python-build-system) > > + (inputs `(("python-2" ,python-2) > > + > > + ("python2-setuptools" ,python2-setuptools))) > > When using 'python-build-system', instead of adding python-2 as an > input, we should do this instead: > > (arguments `(#:python ,python-2)) > > And 'python2-setuptools' should be a native-input: > > (native-inputs `(("python2-setuptools" ,python2-setuptools))) > > > + (home-page "urwid.org/") > > This should be a valid URL; in this case: > > (home-page "http://urwid.org") > > > + (synopsis "Console user interface library for Python") > > + (description > > + "Urwid is a console user interface library for python. It include= s > many features useful for text > > +console application") > > Double-space between sentences, keep lines < 80 columns, and add an "s" > and period at the end, e.g.: > > (description > "Urwid is a console user interface library for python. It includes > many > features useful for text console applications.") > > > + (license lgpl2.1))) > > + > > Can you send an updated patch? > > Thanks! > Mark > --001a1140dc62d04562050e13ca4b Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Here's a patch that does all the changes you requested= to the previous patch file

On Sun, Feb 1, 2015 at 6:32 PM, Mark H Weaver <mhw@netris.or= g> wrote:
Omar Radwan <<= a href=3D"mailto:toxemicsquire4@gmail.com">toxemicsquire4@gmail.com>= writes:

> From 7d65731aaec1b3dbca9364bc2b0f18c9fc9992e5 Mon Sep 17 00:00:00 2001=
> From: Omar Radwan <toxe= micsquire4@gmail.com>
> Date: Sun, 1 Feb 2015 14:43:59 -0800
> Subject: [PATCH] gnu: Add urwid

Minor nits: add a period above, and:

> * gnu/packages/python.scm(urwid) New variable.

This should be:

* gnu/packages/python.scm (urwid): New variable.

(add missing space and colon)

> ---
>=C2=A0 gnu/packages/python.scm | 27 ++++++++++++++++++++++++++-
>=C2=A0 1 file changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 4b30695..19016b4 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -5,7 +5,7 @@
>=C2=A0 ;;; Copyright =C3=82=C2=A9 2014 Mark H Weaver <mhw@netris.org>
>=C2=A0 ;;; Copyright =C3=82=C2=A9 2014 Eric Bavier <bavier@member.fsf.org>
>=C2=A0 ;;; Copyright =C3=82=C2=A9 2014, 2015 Federico Beffa <beffa@fbengineering.ch>
> -;;;
> +;;; Copyright =C3=82=C2=A9 2015 Omar Radwan <toxemicsquire4@gmail.com>
>=C2=A0 ;;; This file is part of GNU Guix.

Please keep the blank line below the copyright notices.

More importantly, the encoding of the "=C2=A9" is getting munged = somewhere,
so this patch won't apply cleanly.

>=C2=A0 ;;;
>=C2=A0 ;;; GNU Guix is free software; you can redistribute it and/or mo= dify it
> @@ -2848,3 +2848,28 @@ and written in Python.")
>
>=C2=A0 (define-public python2-html5lib
>=C2=A0 =C2=A0 (package-with-python2 python-html5lib))
> +
> +
> +(define-public urwid
> +=C2=A0 (package
> +=C2=A0 =C2=A0 (name "urwid")
> +=C2=A0 =C2=A0 (version "1.3.0")
> +=C2=A0 =C2=A0 (source
> +=C2=A0 =C2=A0 =C2=A0(origin
> +=C2=A0 =C2=A0 =C2=A0 (method url-fetch)
> +=C2=A0 =C2=A0 =C2=A0 (uri (string-append
> +"https://pkgs.fedoraproject.org/repo/pkgs/python-urwid/urwi= d-1.3.0.tar.gz/a989acd54f4ff1a554add464803a9175/urwid-1.3.0.tar.gz"= ;)) ;;upstream can't be used because Pypi don't have ETag headers i= n qoutes

How about this instead:

=C2=A0 =C2=A0 =C2=A0 (uri (list (string-append
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 "https://pypi.python.org/packages/source/u/urwid/urwid-"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 version &quo= t;.tar.gz")
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0;; Downloadin= g from the upstream URI above fails due to an
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0;; invalid ET= ag header.
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"ht= tps://pkgs.fedoraproject.org/repo/pkgs/python-urwid/urwid-1.3.0.tar.gz/a989= acd54f4ff1a554add464803a9175/urwid-1.3.0.tar.gz"))

This first tries to download from the canonical upstream URL, in case
they fix their ETag headers, but falls back to the Fedora mirror.

> +=C2=A0 =C2=A0 =C2=A0 (sha256
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0(base32
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 "18mb0yy94sjc434rd61m2sfnw27sa0nyrsz= pj5a9r9zh7fnlzw19"))))
> +=C2=A0 =C2=A0 (build-system python-build-system)
> +=C2=A0 =C2=A0 (inputs `(("python-2" ,python-2)
> +
> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ("python= 2-setuptools" ,python2-setuptools)))

When using 'python-build-system', instead of adding python-2 as an<= br> input, we should do this instead:

=C2=A0 =C2=A0 (arguments `(#:python ,python-2))

And 'python2-setuptools' should be a native-input:

=C2=A0 =C2=A0 (native-inputs `(("python2-setuptools" ,python2-set= uptools)))

> +=C2=A0 =C2=A0 (home-page "urwid.org/")

This should be a valid URL; in this case:

=C2=A0 =C2=A0 (home-page "http://urwid.org")

> +=C2=A0 =C2=A0 (synopsis "Console user interface library for Pyth= on")
> +=C2=A0 =C2=A0 (description
> +=C2=A0 =C2=A0 =C2=A0"Urwid is a console user interface library f= or python. It includes many features useful for text
> +console application")

Double-space between sentences, keep lines < 80 columns, and add an &quo= t;s"
and period at the end, e.g.:

=C2=A0 =C2=A0 (description
=C2=A0 =C2=A0 =C2=A0"Urwid is a console user interface library for pyt= hon.=C2=A0 It includes many
features useful for text console applications.")

> +=C2=A0 =C2=A0 (license lgpl2.1)))
> +

Can you send an updated patch?

=C2=A0 =C2=A0 =C2=A0Thanks!
=C2=A0 =C2=A0 =C2=A0 =C2=A0M= ark

--001a1140dc62d04562050e13ca4b-- --001a1140dc62d04567050e13ca4d Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-Add-urwid.patch" Content-Disposition: attachment; filename="0002-gnu-Add-urwid.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_i5ndye270 RnJvbSBlNDIyNmY4YWM0YWUyMzgzNWFhNWY1NzgwOGQzZjIwNjNhMTMxZDg0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBPbWFyIFJhZHdhbiA8dG94ZW1pY3NxdWlyZTRAZ21haWwuY29t PgpEYXRlOiBTdW4sIDEgRmViIDIwMTUgMjA6NDA6MjIgLTA4MDAKU3ViamVjdDogW1BBVENIIDIv Ml0gZ251OiBBZGQgdXJ3aWQgKiBnbnUvcGFja2FnZXMvcHl0aG9uLnNjbSAodXJ3aWQpOiBOZXcK IFZhcmlhYmxlCgotLS0KIGdudS9wYWNrYWdlcy9weXRob24uc2NtIHwgMTggKysrKysrKysrKy0t LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgOCBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvcHl0aG9uLnNjbSBiL2dudS9wYWNrYWdlcy9weXRo b24uc2NtCmluZGV4IDE5MDE2YjQuLjFlNDRkYmIgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9w eXRob24uc2NtCisrKyBiL2dudS9wYWNrYWdlcy9weXRob24uc2NtCkBAIC02LDYgKzYsNyBAQAog Ozs7IENvcHlyaWdodCDCqSAyMDE0IEVyaWMgQmF2aWVyIDxiYXZpZXJAbWVtYmVyLmZzZi5vcmc+ CiA7OzsgQ29weXJpZ2h0IMKpIDIwMTQsIDIwMTUgRmVkZXJpY28gQmVmZmEgPGJlZmZhQGZiZW5n aW5lZXJpbmcuY2g+CiA7OzsgQ29weXJpZ2h0IMKpIDIwMTUgT21hciBSYWR3YW4gPHRveGVtaWNz cXVpcmU0QGdtYWlsLmNvbT4KKwogOzs7IFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBHdWl4Lgog Ozs7CiA7OzsgR05VIEd1aXggaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUg aXQgYW5kL29yIG1vZGlmeSBpdApAQCAtMjg1NywxOSArMjg1OCwyMCBAQCBhbmQgd3JpdHRlbiBp biBQeXRob24uIikKICAgICAoc291cmNlCiAgICAgIChvcmlnaW4KICAgICAgIChtZXRob2QgdXJs LWZldGNoKQotICAgICAgKHVyaSAoc3RyaW5nLWFwcGVuZAotImh0dHBzOi8vcGtncy5mZWRvcmFw cm9qZWN0Lm9yZy9yZXBvL3BrZ3MvcHl0aG9uLXVyd2lkL3Vyd2lkLTEuMy4wLnRhci5nei9hOTg5 YWNkNTRmNGZmMWE1NTRhZGQ0NjQ4MDNhOTE3NS91cndpZC0xLjMuMC50YXIuZ3oiKSkgOzt1cHN0 cmVhbSBjYW4ndCBiZSB1c2VkIGJlY2F1c2UgUHlwaSBkb24ndCBoYXZlIEVUYWcgaGVhZGVycyBp biBxb3V0ZXMKKyAgICAgICh1cmkgKGxpc3QgKHN0cmluZy1hcHBlbmQgImh0dHBzOi9weXBpLnB5 dGhvbi5vcmcvcGFja2FnZXMvc291cmNlL3UvdXJ3aWQvdXJ3aWQtInZlcnNpb24iLnRhci5neiIp CisgICAgICAgOztEb3dubG9hZGluZyBmcm9tIHRoZSB1cHN0cmVhbSBVUkkgYWJvdmUgZmFpbHMg ZGllIHRvIGFuIGludmFsaWQgRVRhZyBoZWFkZXIuCisiaHR0cHM6Ly9wa2dzLmZlZG9yYXByb2pl Y3Qub3JnL3JlcG8vcGtncy9weXRob24tdXJ3aWQvdXJ3aWQtMS4zLjAudGFyLmd6L2E5ODlhY2Q1 NGY0ZmYxYTU1NGFkZDQ2NDgwM2E5MTc1L3Vyd2lkLTEuMy4wLnRhci5neiIpKQogICAgICAgKHNo YTI1NgogICAgICAgIChiYXNlMzIKICAgICAgICAgIjE4bWIweXk5NHNqYzQzNHJkNjFtMnNmbncy N3NhMG55cnN6cGo1YTlyOXpoN2ZubHp3MTkiKSkpKQogICAgIChidWlsZC1zeXN0ZW0gcHl0aG9u LWJ1aWxkLXN5c3RlbSkKLSAgICAoaW5wdXRzIGAoKCJweXRob24tMiIgLHB5dGhvbi0yKQotCi0g ICAgICAgICAgICAgICAgKCJweXRob24yLXNldHVwdG9vbHMiICxweXRob24yLXNldHVwdG9vbHMp KSkKLSAgICAoaG9tZS1wYWdlICJ1cndpZC5vcmcvIikKKyAgICAoYXJndWVtZW50cyBgKCgicHl0 aG9uLTIiICxweXRob24tMikpKQorICAgIChuYXRpdmUtaW1wdXRzIGAoKCJweXRob24yLXNldHVw dG9vbHMiICxweXRob24yLXNldHVwdG9vbHMpKSkKKyAgICAoaG9tZS1wYWdlICJodHRwOi8vdXJ3 aWQub3JnLyIpCiAgICAgKHN5bm9wc2lzICJDb25zb2xlIHVzZXIgaW50ZXJmYWNlIGxpYnJhcnkg Zm9yIFB5dGhvbiIpCiAgICAgKGRlc2NyaXB0aW9uCi0gICAgICJVcndpZCBpcyBhIGNvbnNvbGUg dXNlciBpbnRlcmZhY2UgbGlicmFyeSBmb3IgcHl0aG9uLiBJdCBpbmNsdWRlcyBtYW55IGZlYXR1 cmVzIHVzZWZ1bCBmb3IgdGV4dAotY29uc29sZSBhcHBsaWNhdGlvbiIpCisgICAgICJVcndpZCAg aXMgIGEgIGNvbnNvbGUgIHVzZXIgIGludGVyZmFjZSAgbGlicmFyeSAgZm9yICBweXRob24uICBJ dAorIGluY2x1ZGVzICBtYW55ICBmZWF0dXJlcyAgdXNlZnVsICBmb3IgIHRleHQKK2NvbnNvbGUg IGFwcGxpY2F0aW9ucy4iKQogICAgIChsaWNlbnNlIGxncGwyLjEpKSkKCi0tCjIuMi4xCg== --001a1140dc62d04567050e13ca4d--