From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: Re: [PATCH] small patchseries to add the irc bot limnoria. Date: Mon, 03 Oct 2016 11:59:54 +0000 Message-ID: <87r37xy75x.fsf@we.make.ritual.n0.is> References: <871t0hjnw7.fsf@we.make.ritual.n0.is> <20160920213826.GA6526@jasmine> <8760ppfy9u.fsf@we.make.ritual.n0.is> <87shsttbg0.fsf@we.make.ritual.n0.is> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1br1vI-0003hw-E3 for guix-devel@gnu.org; Mon, 03 Oct 2016 08:00:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1br1vB-0002xw-K1 for guix-devel@gnu.org; Mon, 03 Oct 2016 08:00:43 -0400 Received: from aibo.runbox.com ([91.220.196.211]:55821) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1br1vB-0002vw-9S for guix-devel@gnu.org; Mon, 03 Oct 2016 08:00:37 -0400 Received: from [10.9.9.210] (helo=mailfront10.runbox.com) by bars.runbox.com with esmtp (Exim 4.71) (envelope-from ) id 1br1vA-0001ff-GM for guix-devel@gnu.org; Mon, 03 Oct 2016 14:00:36 +0200 Received: from x5d83ed7f.dyn.telefonica.de ([93.131.237.127] helo=localhost) by mailfront10.runbox.com with esmtpsa (uid:892961 ) (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) id 1br1uV-0007E5-FM for guix-devel@gnu.org; Mon, 03 Oct 2016 13:59:55 +0200 In-Reply-To: <87shsttbg0.fsf@we.make.ritual.n0.is> 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" To: guix-devel@gnu.org Hi, can someone please apply this? I had the impression this was good to go. Thanks. If you lack context or whatever, use the guix-devel archive search function. ng0 writes: > [ Unknown signature status ] > ng0 writes: > >> Leo Famulari writes: >> >>> [ Unknown signature status ] >>> On Sun, Sep 18, 2016 at 02:14:32PM +0000, ng0 wrote: >>>> This is a small patchseries to add the bot limnoria, based on supybot. >>> >>> Thanks! >>> >>>> * gnu/packages/python.scm (python-socksipy-branch): New variable. >>> >>>> + (home-page "http://code.google.com/p/socksipy-branch/") >> >> Right, it is now https://code.google.com/archive/p/socksipy-branch/ >> until Google will finally to decide to shut down yet another product >> people relied on. >> >>> >>> Error 404. >>> >>>> +(define-public python2-socksipy-branch >>>> + (package-with-python2 >>>> + (strip-python2-variant python-socksipy-branch))) >>> >>> I don't think this needs strip-python2-variant. It should be enough to >>> use package-with-python2. >> >> I found this failed very often for me. I can try it again. > > Oh, I meant something different. Just using package-with.. worked. > >>>> Subject: [PATCH 2/4] license: Add freebsd-doc. >>>> >>>> * guix/licenses.scm (freebsd-doc): New variable. >>> >>> LGTM >>> >>>> Subject: [PATCH 3/4] gnu: Add python-feedparser. >>>> >>>> * gnu/packages/python.scm (python-feedparser): New variable. >>> >>> LGTM >>> >>>> Subject: [PATCH 4/4] gnu: Add limnoria. >>>> >>>> * gnu/packages/irc.scm (limnoria): New variable. >>> >>> LGTM. It would be nice to figure out how to run the tests, if they are >>> meant to be run by distributions.. > > From 4372d38c20abc54070777c605e0946c1ef7cebf1 Mon Sep 17 00:00:00 2001 > From: ng0 > Date: Sun, 18 Sep 2016 13:16:23 +0000 > Subject: [PATCH 1/4] gnu: Add python-socksipy-branch. > > * gnu/packages/python.scm (python-socksipy-branch): New variable. > --- > gnu/packages/python.scm | 28 ++++++++++++++++++++++++++++ > 1 file changed, 28 insertions(+) > > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm > index a186557..896566c 100644 > --- a/gnu/packages/python.scm > +++ b/gnu/packages/python.scm > @@ -3731,6 +3731,34 @@ routines such as routines for numerical integration and optimization.") > (define-public python2-scipy > (package-with-python2 python-scipy)) > > +(define-public python-socksipy-branch > + (package > + (name "python-socksipy-branch") > + (version "1.01") > + (source > + (origin > + (method url-fetch) > + (uri (pypi-uri "SocksiPy-branch" version)) > + (sha256 > + (base32 > + "01l41v4g7fy9fzvinmjxy6zcbhgqaif8dhdqm4w90fwcw9h51a8p")))) > + (build-system python-build-system) > + (arguments > + `(#:tests? #f)) ; There are no tests > + (home-page "https://code.google.com/archive/p/socksipy-branch/") > + (synopsis "Python SOCKS module") > + (description > + "SocksiPy - A Python SOCKS client module. It provides a > +socket-like interface that supports connections to any TCP > +service through the use of a SOCKS4, SOCKS5 or HTTP proxy. > +The original version was developed by Dan Haim, this is a > +branch created by Mario Vilas to address some open issues, > +as the original project seems to have been abandoned circa 2007.") > + (license license:bsd-3))) > + > +(define-public python2-socksipy-branch > + (package-with-python2 python-socksipy-branch)) > + > (define-public python-sqlalchemy > (package > (name "python-sqlalchemy") > -- > 2.10.0 > > From 478ea32c2e357f65aa8e89235f674291a17f3317 Mon Sep 17 00:00:00 2001 > From: ng0 > Date: Sun, 18 Sep 2016 13:57:33 +0000 > Subject: [PATCH 2/4] license: Add freebsd-doc. > > * guix/licenses.scm (freebsd-doc): New variable. > --- > guix/licenses.scm | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/guix/licenses.scm b/guix/licenses.scm > index 265f048..92c120e 100644 > --- a/guix/licenses.scm > +++ b/guix/licenses.scm > @@ -8,6 +8,7 @@ > ;;; Copyright © 2016 Leo Famulari > ;;; Copyright © 2016 Fabian Harfert > ;;; Copyright © 2016 Rene Saavedra > +;;; Copyright © 2016 ng0 > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -43,6 +44,7 @@ > epl1.0 > expat > freetype > + freebsd-doc > giftware > gpl1 gpl1+ gpl2 gpl2+ gpl3 gpl3+ > gfl1.0 > @@ -276,6 +278,11 @@ at URI, which may be a file:// URI pointing the package's tree." > "https://www.gnu.org/licenses/fdl.html" > "https://www.gnu.org/licenses/license-list#FDL")) > > +(define freebsd-doc > + (license "FreeBSD Documentation License" > + "https://www.freebsd.org/copyright/freebsd-doc-license.html" > + "https://www.gnu.org/licenses/license-list.html#FreeBSDDL")) > + > (define opl1.0+ > (license "Open Publication License 1.0 or later" > "http://opencontent.org/openpub/" > -- > 2.10.0 > > From 3a60d3e415e957ea2683cbbf762edc9d256a7dcc Mon Sep 17 00:00:00 2001 > From: ng0 > Date: Sun, 18 Sep 2016 13:58:25 +0000 > Subject: [PATCH 3/4] gnu: Add python-feedparser. > > * gnu/packages/python.scm (python-feedparser): New variable. > --- > gnu/packages/web.scm | 29 +++++++++++++++++++++++++++++ > 1 file changed, 29 insertions(+) > > diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm > index 342262b..8acae63 100644 > --- a/gnu/packages/web.scm > +++ b/gnu/packages/web.scm > @@ -45,6 +45,7 @@ > #:use-module (guix build-system cmake) > #:use-module (guix build-system r) > #:use-module (guix build-system trivial) > + #:use-module (guix build-system python) > #:use-module (gnu packages) > #:use-module (gnu packages apr) > #:use-module (gnu packages documentation) > @@ -3146,6 +3147,34 @@ http://opensearch.a9.com} compatible search engines.") > their web site.") > (home-page "http://search.cpan.org/~gaas/WWW-RobotRules/"))) > > +(define-public python-feedparser > + (package > + (name "python-feedparser") > + (version "5.2.1") > + (source > + (origin > + (method url-fetch) > + (uri (pypi-uri "feedparser" version ".tar.bz2")) > + (sha256 > + (base32 > + "00hb4qg2am06g81mygfi1jsbx8830024jm45g6qp9g8fr6am91yf")))) > + (build-system python-build-system) > + (home-page > + "https://github.com/kurtmckee/feedparser") > + (synopsis "Parse feeds in Python") > + (description > + "Universal feed parser which handles RSS 0.9x, RSS 1.0, RSS 2.0, > +CDF, Atom 0.3, and Atom 1.0 feeds.") > + (license (list l:bsd-2 ; source code > + l:freebsd-doc)))) ; documentation > + > +(define-public python2-feedparser > + (let ((base (package-with-python2 > + (strip-python2-variant python-feedparser)))) > + (package (inherit base) > + (native-inputs > + `(("python2-setuptools" ,python2-setuptools)))))) > + > (define-public r-httpuv > (package > (name "r-httpuv") > -- > 2.10.0 > > From 5bdd00e1c4d900df58d5c52f20042a2c6d6dfd98 Mon Sep 17 00:00:00 2001 > From: ng0 > Date: Sun, 18 Sep 2016 14:11:20 +0000 > Subject: [PATCH 4/4] gnu: Add limnoria. > > * gnu/packages/irc.scm (limnoria): New variable. > --- > gnu/packages/irc.scm | 42 ++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 40 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm > index 1058bef..2e0cd33 100644 > --- a/gnu/packages/irc.scm > +++ b/gnu/packages/irc.scm > @@ -3,7 +3,7 @@ > ;;; Copyright © 2014 Kevin Lemonnier > ;;; Copyright © 2015 Ludovic Courtès > ;;; Copyright © 2015, 2016 Efraim Flashner > -;;; Copyright © 2016 ng0 > +;;; Copyright © 2016 ng0 > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -26,6 +26,7 @@ > #:use-module (guix packages) > #:use-module (guix build-system cmake) > #:use-module (guix build-system gnu) > + #:use-module (guix build-system python) > #:use-module (gnu packages) > #:use-module (gnu packages aspell) > #:use-module (gnu packages autogen) > @@ -48,7 +49,8 @@ > #:use-module (gnu packages python) > #:use-module (gnu packages qt) > #:use-module (gnu packages tcl) > - #:use-module (gnu packages tls)) > + #:use-module (gnu packages tls) > + #:use-module (gnu packages web)) > > (define-public quassel > (package > @@ -291,3 +293,39 @@ and extensible with plugins and scripts.") > (description > "sic is a simple IRC client, even more minimalistic than ii.") > (license license:expat))) > + > +(define-public limnoria > + (package > + (name "limnoria") > + (version "2016.08.07") > + (source > + (origin > + (method url-fetch) > + (uri (pypi-uri "limnoria" version)) > + (sha256 > + (base32 > + "0w1d98hfhn4iqrczam7zahhqsvxa79n3xfcrm4jwkg5lba4f9ccm")))) > + (build-system python-build-system) > + (inputs > + `(("python-pytz" ,python-pytz) > + ("python-chardet" ,python-chardet) > + ("python-dateutil" ,python-dateutil) > + ("python-gnupg" ,python-gnupg) > + ("python-feedparser" ,python-feedparser) > + ("python-sqlalchemy" ,python-sqlalchemy) > + ("python-socksipy-branch" ,python-socksipy-branch) > + ("python-ecdsa" ,python-ecdsa))) > + (native-inputs > + `(("python-mock" ,python-mock))) > + ;; Despite the existence of a test folder there is no test phase. > + ;; We need to package https://github.com/ProgVal/irctest and write > + ;; our own testphase. > + (arguments > + `(#:tests? #f)) > + (home-page "https://github.com/ProgVal/Limnoria") > + (synopsis "Modified version of Supybot (an IRC bot and framework)") > + (description > + "Modified version of Supybot with Python 3 and IRCv3 support, > +embedded web server, translations (fr, fi, it, hu, de), and many > +other enhancements and bug fixes.") > + (license license:bsd-3))) > -- > 2.10.0 > > > -- > ng0 --