Re: [PATCH] gnu: Add urwid

[Omar Radwan <toxemicsquire4@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 4030 bytes --]

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.org> wrote:

> Omar Radwan <toxemicsquire4@gmail.com> writes:
>
> > From 7d65731aaec1b3dbca9364bc2b0f18c9fc9992e5 Mon Sep 17 00:00:00 2001
> > From: Omar Radwan <toxemicsquire4@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)
>
> > ---
> >  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 © 2014 Mark H Weaver <mhw@netris.org>
> >  ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
> >  ;;; Copyright © 2014, 2015 Federico Beffa <beffa@fbengineering.ch>
> > -;;;
> > +;;; Copyright © 2015 Omar Radwan <toxemicsquire4@gmail.com>
> >  ;;; This file is part of GNU Guix.
>
> Please keep the blank line below the copyright notices.
>
> More importantly, the encoding of the "©" is getting munged somewhere,
> so this patch won't apply cleanly.
>
> >  ;;;
> >  ;;; GNU Guix is free software; you can redistribute it and/or modify it
> > @@ -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 includes
> 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
>

[-- Attachment #1.2: Type: text/html, Size: 5872 bytes --]

[-- Attachment #2: 0002-gnu-Add-urwid.patch --]
[-- Type: text/x-patch, Size: 2275 bytes --]

From e4226f8ac4ae23835aa5f57808d3f2063a131d84 Mon Sep 17 00:00:00 2001
From: Omar Radwan <toxemicsquire4@gmail.com>
Date: Sun, 1 Feb 2015 20:40:22 -0800
Subject: [PATCH 2/2] gnu: Add urwid * gnu/packages/python.scm (urwid): New
 Variable

---
 gnu/packages/python.scm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 19016b4..1e44dbb 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2014, 2015 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2015 Omar Radwan <toxemicsquire4@gmail.com>
+
 ;;; This file is part of GNU Guix.
 ;;;
 ;;; GNU Guix is free software; you can redistribute it and/or modify it
@@ -2857,19 +2858,20 @@ and written in Python.")
     (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
+      (uri (list (string-append "https:/pypi.python.org/packages/source/u/urwid/urwid-"version".tar.gz")
+       ;;Downloading from the upstream URI above fails die 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"))
       (sha256
        (base32
         "18mb0yy94sjc434rd61m2sfnw27sa0nyrszpj5a9r9zh7fnlzw19"))))
     (build-system python-build-system)
-    (inputs `(("python-2" ,python-2)
-
-                ("python2-setuptools" ,python2-setuptools)))
-    (home-page "urwid.org/")
+    (arguements `(("python-2" ,python-2)))
+    (native-imputs `(("python2-setuptools" ,python2-setuptools)))
+    (home-page "http://urwid.org/")
     (synopsis "Console user interface library for Python")
     (description
-     "Urwid is a console user interface library for python. It includes many features useful for text
-console application")
+     "Urwid  is  a  console  user  interface  library  for  python.  It
+ includes  many  features  useful  for  text
+console  applications.")
     (license lgpl2.1)))

--
2.2.1