guix-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Kallithea - looking for someone to take over.


From: ng0
Subject: Kallithea - looking for someone to take over.
Date: Fri, 23 Sep 2016 19:56:15 +0000

Hi,

I worked on kallithea-scm, while I am very close to finishing it I'd
like to let someone else finish this if possible. I need to concentrate
on my own tasks which are primarily circling aroung gnunet, psyced,
secushare.
If anyone feels like they want to take this over here are some snippets
in addition:

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 1bdce65..f636555 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8501,6 +8501,20 @@ RabbitMQ messaging server is the most popular
implementation.")
                 ("python2-unittest2" ,python2-unittest2)
                 ,@(package-inputs kombu))))))

+;; required for pyparsing-1.5.0 which is required by celery-2.2.5
which is required by kallithea
+(define-public python2-kombu-1
+  (package
+    (inherit python2-kombu)
+    (name "python2-kombu-1")
+    (version "1.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "kombu" version))
+       (sha256
+        (base32
+         "0vvfmjq4r55zslrfpamkg557qb6n291krzk39xzw12fxwbd6llmf"))))))
+




diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 1bdce65..918e150 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8577,6 +8577,20 @@ synchronously (wait until ready).")
                        ("python2-mock" ,python2-mock)
                        ,@(package-native-inputs celery))))))



+(define-public python2-celery-2.2.5
+  (package
+    (inherit python2-celery)
+    (version "2.2.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "celery" version))
+       (sha256
+        (base32
+         "04vaappycwh7vpx1jhy3ycb20hzs44ky8vvbi4cd37fgk0drndwg"))))
+    (inputs `(("python2-pyparsing-1.5.0" ,python2-pyparsing-1.5.0)
+                       ,@(package-inputs python2-celery)))))
+




Appended are the 18 patches, I got stuck at the last one just before
kallithea. Some might need minor cleanup, probably the ones where I had
to create old python modules and just wanted to rush through it...
If you move stuff around or make changes, please keep my name+email in
the commit messages and headers, thanks.

From 19a50b5471b0c314b1c4ce3e2eefee3923531abe Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Wed, 14 Sep 2016 11:54:27 +0000
Subject: [PATCH 01/18] gnu: Add python-geventhttpclient.

* gnu/packages/python.scm (python-geventhttpclient): New variable.
---
 gnu/packages/python.scm | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index e2e1ec2..d18aa79 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -9174,6 +9174,45 @@ to provide a high-level synchronous API on top of the 
libev event loop.")
 (define-public python2-gevent
   (package-with-python2 python-gevent))
 
+(define-public python-geventhttpclient
+  (package
+    (name "python-geventhttpclient")
+    (version "1.3.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "geventhttpclient" version))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; https://github.com/gwik/geventhttpclient/pull/82
+                  (delete-file-recursively 
"src/geventhttpclient/tests/__pycache__")))
+              (sha256
+               (base32
+                "07d0q3wzmml75227r6y6mrl5a0zpf4v9gj0ni5rhbyzmaj4az1xx"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-certifi" ,python-certifi)
+       ("python-gevent" ,python-gevent)
+       ("python-six" ,python-six)
+       ("python-pytest" ,python-pytest)
+       ("python-pytest-runner" ,python-pytest-runner)))
+    (home-page "https://github.com/gwik/geventhttpclient";)
+    (synopsis "http client library for gevent")
+    (description
+     "High performance, concurrent HTTP client library
+for Python using gevent.")
+    (license (list license:expat
+                   ;; http_parser.c is based on src/http/ngx_http_parse.c
+                   ;; from NGINX copyright Igor Sysoev
+                   license:bsd-3))
+    (properties `((python2-variant . ,(delay python2-geventhttpclient))))))
+
+(define-public python2-geventhttpclient
+  (package
+    (inherit (package-with-python2
+              (strip-python2-variant python-geventhttpclient)))
+    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))
+
 (define-public python-twisted
   (package
     (name "python-twisted")
-- 
2.10.0

From 970d5b68df38607842796b7845916195abe227c1 Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Wed, 14 Sep 2016 13:23:01 +0000
Subject: [PATCH 02/18] gnu: Add python-fastimport.

* gnu/packages/python.scm (python-fastimport): New variable.
---
 gnu/packages/python.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index d18aa79..001545e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1451,6 +1451,31 @@ software.")
 (define-public python2-extras
   (package-with-python2 python-extras))
 
+(define-public python-fastimport
+  (package
+    (name "python-fastimport")
+    (version "0.9.6")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "fastimport" version))
+              (sha256
+               (base32
+                "1aqjsin4rmqm7ln4j0p73fzxifws6c6ikgyhav7r137m2ixsxl43"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f)) ; No tests
+    (home-page "htps://github.com/jelmer/python-fastimport")
+    (synopsis "VCS fastimport/fastexport parser")
+    (description
+     "Library for parsing the fastimport VCS serialization format")
+    (license license:gpl2+)))
+
+(define-public python2-fastimport
+  (package
+    (inherit (package-with-python2
+              (strip-python2-variant python-fastimport)))
+    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))
+
 (define-public python-mimeparse
   (package
     (name "python-mimeparse")
-- 
2.10.0

From 4150b0e2eab5ed6b22e2647333b0b8eb0fa758b5 Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Wed, 14 Sep 2016 14:10:28 +0000
Subject: [PATCH 03/18] gnu: Add python-dulwich.

* gnu/packages/python.scm (python-dulwich): New variable.
---
 gnu/packages/python.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 001545e..02f718a 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -693,6 +693,41 @@ certificate returned by the server to which a connection 
has been established,
 and verifies that it matches the intended target hostname.")
     (license license:psfl)))
 
+(define-public python-dulwich
+  (package
+    (name "python-dulwich")
+    (version "0.14.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "dulwich" version))
+       (sha256
+        (base32
+         "14xsyxha6qyxxyf0ma3zv1sy31iy22vzwayk519n7a1gwzk4j7vw"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f)) ; swift module not yet ported to python3, 5 tests fail
+    (inputs
+     `(("python-mock" ,python-mock)
+       ("python-gevent" ,python-gevent)
+       ("python-geventhttpclient" ,python-geventhttpclient)
+       ("python-fastimport" ,python-fastimport)))
+    (home-page "https://www.dulwich.io/";)
+    (synopsis "Python Git Library")
+    (description
+     "Dulwich is a Python implementation of the Git file formats and protocols,
+which does not depend on Git itself.  All functionality is available in pure 
Python.
+Optional C extensions can be built for improved performance.")
+    (license (list license:asl2.0 license:gpl2+))
+    (properties `((python2-variant . ,(delay python2-dulwich))))))
+
+(define-public python2-dulwich
+  (package
+    (inherit (package-with-python2
+              (strip-python2-variant python-dulwich)))
+    (native-inputs
+     `(("python2-setuptools" ,python2-setuptools)))))
+
 (define-public python-h5py
   (package
     (name "python-h5py")
-- 
2.10.0

From fa0d377a8da14bccacf2605bd1914e02a584cc01 Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Wed, 14 Sep 2016 14:18:56 +0000
Subject: [PATCH 04/18] gnu: Add address@hidden

* gnu/packages/version-control.scm (address@hidden): New variable.
---
 gnu/packages/version-control.scm | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 29559bd..14b4dab 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -617,6 +617,18 @@ It efficiently handles projects of any size
 and offers an easy and intuitive interface.")
     (license license:gpl2+)))
 
+(define-public address@hidden
+  (package
+    (inherit mercurial)
+    (version "3.7.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://www.mercurial-scm.org/";
+                                  "release/mercurial-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0c2vkad9piqkggyk8y310rf619qgdfcwswnk3nv21mg2fhnw96f0"))))))
+
 (define-public neon
   (package
     (name "neon")
-- 
2.10.0

From 6ec0a6631e01192d085751c5e4aac801605c22b5 Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Wed, 14 Sep 2016 14:24:36 +0000
Subject: [PATCH 05/18] gnu: Add python2-mysql-python.

* gnu/packages/python.scm (python2-mysql-python): New variable.
---
 gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 02f718a..67b35aa 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3510,6 +3510,35 @@ toolkits.")
          ,@(fold alist-delete (package-propagated-inputs matplotlib)
                  '("python-pycairo" "python-pygobject" "python-tkinter")))))))
 
+(define-public python2-mysql-python
+  (package
+    (name "python2-mysql-python")
+    (version "1.2.5")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "MySQL-python" version ".zip"))
+       (sha256
+        (base32
+         "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f ; tests require a running mysqld at /run/mysqld/mysqld.sock
+       #:python ,python-2)) ; Application is python2 only
+    (inputs
+     `(("python2-setuptools" ,python2-setuptools)
+       ("unzip" ,unzip)
+       ("mysql" ,mysql)
+       ("zlib" ,zlib)
+       ("openssl" ,openssl)
+       ("python2-sphinx" ,python2-sphinx)
+       ("python2-nose" ,python2-nose)))
+    (home-page "https://github.com/farcepest/MySQLdb1";)
+    (synopsis "Python interface to MySQL")
+    (description "MySQLdb is an interface to the popular MySQL
+database server for Python.")
+    (license license:gpl3)))
+
 (define-public python2-pysnptools
   (package
     (name "python2-pysnptools")
-- 
2.10.0

From febd5c7cce113b489fb6c14a02a63610415f3427 Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Fri, 23 Sep 2016 11:12:11 +0000
Subject: [PATCH 06/18] gnu: Add python-dulwich-0.9.9.

* gnu/packages/python.scm (python-dulwich-0.9.9): New variable.
---
 gnu/packages/python.scm | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 67b35aa..37a8010 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -23,7 +23,7 @@
 ;;; Copyright © 2016 Daniel Pimentel <address@hidden>
 ;;; Copyright © 2016 Sou Bunnbu <address@hidden>
 ;;; Copyright © 2016 Troy Sankey <address@hidden>
-;;; Copyright © 2016 ng0 <address@hidden>
+;;; Copyright © 2016 ng0 <address@hidden>
 ;;; Copyright © 2016 Dylan Jeffers <address@hidden@openmailbox.org>
 ;;; Copyright © 2016 David Craven <address@hidden>
 ;;; Copyright © 2016 Marius Bakke <address@hidden>
@@ -728,6 +728,35 @@ Optional C extensions can be built for improved 
performance.")
     (native-inputs
      `(("python2-setuptools" ,python2-setuptools)))))
 
+;; kallithea-0.3.2 needs dulwich-0.9.9
+(define-public python-dulwich-0.9.9
+  (package
+    (inherit python-dulwich)
+    (name "python-dulwich-0.9.9")
+    (version "0.9.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://dulwich.io/releases/dulwich-"; version 
".tar.gz"))
+       (sha256
+        (base32
+         "15l45063rpb5jn2c5b4x82fcjdg7p1bxnj9jh810032diln7ckh8"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f)) ; swift module not yet ported to python3, 5 tests fail
+    (inputs
+     `(("python-mock" ,python-mock)
+       ("python-gevent" ,python-gevent)
+       ("python-geventhttpclient" ,python-geventhttpclient)
+       ("python-fastimport" ,python-fastimport)))))
+
+(define-public python2-dulwich-0.9.9
+  (package
+    (inherit (package-with-python2
+              (strip-python2-variant python-dulwich-0.9.9)))
+    (native-inputs
+     `(("python2-setuptools" ,python2-setuptools)))))
+
 (define-public python-h5py
   (package
     (name "python-h5py")
-- 
2.10.0

From 2e06a690920a373b046191d9c4d62f2143a767e2 Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Fri, 23 Sep 2016 11:40:39 +0000
Subject: [PATCH 07/18] gnu: Add python-repoze.lru.

* gnu/packages/python.scm (python-repoze.lru): New variable.
---
 gnu/packages/python.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 37a8010..61c97e2 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1814,6 +1814,33 @@ result back.")
       (native-inputs `(("python2-setuptools" ,python2-setuptools)
                        ,@(package-native-inputs base))))))
 
+(define-public python-repoze.lru
+  (package
+    (name "python-repoze.lru")
+    (version "0.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "repoze.lru" version))
+       (sha256
+        (base32
+         "0cdx3fq67qfcdrb3h9rjjcvks2zfrgyd834indncplqnywxk4yhg"))))
+    (build-system python-build-system)
+    (home-page "http://www.repoze.org";)
+    (synopsis "Tiny LRU cache implementation and decorator")
+    (description
+     "Repoze integrates Zope technologies with WSGI and reusable Python 
middleware.")
+    (properties `((python2-variant . ,(delay python2-repoze.lru))))
+    (license license:repoze)))
+
+(define-public python2-repoze.lru
+  (let ((base (package-with-python2
+               (strip-python2-variant python-repoze.lru))))
+    (package
+      (inherit base)
+      (native-inputs
+       `(("python2-setuptools" ,python2-setuptools))))))
+
 (define-public python-scripttest
   (package
     (name "python-scripttest")
-- 
2.10.0

From 5016c8848de09d52bc899ee1fd8a2a4ea5beebea Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Fri, 23 Sep 2016 11:56:29 +0000
Subject: [PATCH 08/18] gnu: Add python-routes.

* gnu/packages/python.scm (python-routes): New variable.
---
 gnu/packages/python.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 61c97e2..6fea678 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1841,6 +1841,40 @@ result back.")
       (native-inputs
        `(("python2-setuptools" ,python2-setuptools))))))
 
+(define-public python-routes
+  (package
+    (name "python-routes")
+    (version "2.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "Routes" version))
+       (sha256
+        (base32
+         "0l83p5prsjq0cccm6596dpv1inlafa1p7q1v8rrvi40ivjsq1hwq"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-repoze.lru" ,python-repoze.lru)
+       ("python-six" ,python-six)
+       ("python-coverage" ,python-coverage)
+       ("python-webob" ,python-webob)
+       ("python-webtest" ,python-webtest)
+       ("python-nose" ,python-nose)))
+    (home-page "http://routes.readthedocs.org/";)
+    (synopsis "Routing Recognition and Generation Tools")
+    (description
+     "A Routing package for Python that matches URLs to dicts and vice versa.")
+    (properties `((python2-variant . ,(delay python2-routes))))
+    (license license:expat)))
+
+(define-public python2-routes
+  (let ((base (package-with-python2
+               (strip-python2-variant python-routes))))
+    (package
+      (inherit base)
+      (native-inputs
+       `(("python2-setuptools" ,python2-setuptools))))))
+
 (define-public python-scripttest
   (package
     (name "python-scripttest")
-- 
2.10.0

From 9afd076f56bc9c89d2fac67c1a7989bc108f375e Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Fri, 23 Sep 2016 12:11:09 +0000
Subject: [PATCH 09/18] gnu: Add python-routes-1.13.

* gnu/packages/python.scm (python-routes-1.13): New variable.
---
 gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6fea678..3009cd8 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1875,6 +1875,35 @@ result back.")
       (native-inputs
        `(("python2-setuptools" ,python2-setuptools))))))
 
+;; Required by kallithea-0.3.2
+(define-public python-routes-1.13
+  (package
+    (inherit python-routes)
+    (version "1.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "Routes" version))
+       (sha256
+        (base32
+         "19r4yr4nyz8iw3ykp8mc93xjlaybjgzyi7lhwf1azdydayix20yc"))))
+    (inputs
+     `(("python-repoze.lru" ,python-repoze.lru)
+       ("python-six" ,python-six)
+       ("python-coverage" ,python-coverage)
+       ("python-webob" ,python-webob)
+       ("python-webtest" ,python-webtest)
+       ("python-nose" ,python-nose)
+       ("python-paste" ,python-paste)))))
+
+(define-public python2-routes-1.13
+  (let ((base (package-with-python2
+               (strip-python2-variant python-routes-1.13))))
+    (package
+      (inherit base)
+      (native-inputs
+       `(("python2-setuptools" ,python2-setuptools))))))
+
 (define-public python-scripttest
   (package
     (name "python-scripttest")
-- 
2.10.0

From 432abeb5907f25abd672be464c37eaf0a5dde52d Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Fri, 23 Sep 2016 15:24:06 +0000
Subject: [PATCH 10/18] gnu: Add python-urlobject.

* gnu/packages/python.scm (python-urlobject): New variable.
---
 gnu/packages/python.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3009cd8..a5de01e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1636,6 +1636,30 @@ standard library.")
      `(#:python ,python-2
        #:tests? #f)))) ; no setup.py test command
 
+(define-public python-urlobject
+  (package
+    (name "python-urlobject")
+    (version "2.4.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "URLObject" version))
+       (sha256
+        (base32
+         "0mswa40s1m5hs5yydb75i2bqb0l49gn0mmkzb0g5nj493nl0h3yx"))))
+    (build-system python-build-system)
+    (home-page "http://github.com/zacharyvoase/urlobject";)
+    (synopsis "Utility class for manipulating URLs")
+    (description
+     "URLObject is a utility class for manipulating URLs.")
+    (license license:public-domain)))
+
+(define-public python2-urlobject
+  (let ((base (package-with-python2 (strip-python2-variant python-urlobject))))
+    (package
+      (inherit base)
+      (inputs `(("python2-setuptools" ,python2-setuptools))))))
+
 (define-public python-py
   (package
     (name "python-py")
-- 
2.10.0

From 00e1cea18ecf6fdb1e03d3a3a8a384abaecc64a9 Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Fri, 23 Sep 2016 15:31:30 +0000
Subject: [PATCH 11/18] gnu: Add python-urlobject-2.3.4.

* gnu/packages/python.scm (python-urlobject-2.3.4): New variable.
---
 gnu/packages/python.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index a5de01e..12da100 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1660,6 +1660,25 @@ standard library.")
       (inherit base)
       (inputs `(("python2-setuptools" ,python2-setuptools))))))
 
+;; kallithea-0.3.2 needs this
+(define-public python-urlobject-2.3.4
+  (package
+    (inherit python-urlobject)
+    (version "2.3.4")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "URLObject" version))
+       (sha256
+        (base32
+         "0mq4vy80xgvivh7zikf50awi5mw0pi601740bz0m8lnanlnrh85k"))))))
+
+(define-public python2-urlobject-2.3.4
+  (let ((base (package-with-python2 (strip-python2-variant 
python-urlobject-2.3.4))))
+    (package
+      (inherit base)
+      (inputs `(("python2-setuptools" ,python2-setuptools))))))
+
 (define-public python-py
   (package
     (name "python-py")
-- 
2.10.0

From 42fc0d695d9a22257ac150eb585822e116827fde Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Fri, 23 Sep 2016 15:44:58 +0000
Subject: [PATCH 12/18] gnu: Add python-docutils-0.11.

* gnu/packages/python.scm (python-docutils-0.11): New variable.
---
 gnu/packages/python.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 12da100..9c798d7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2882,6 +2882,22 @@ reStructuredText.")
 (define-public python2-docutils
   (package-with-python2 python-docutils))
 
+;; kallithea-0.3.2 needs this
+(define-public python-docutils-0.11
+  (package
+    (inherit python-docutils)
+    (version "0.11")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "docutils" version))
+       (sha256
+        (base32
+         "1jbybs5a396nrjy9m13pgvsxdwaj7jw7nsawkhl4fi1nvxm1dx4s"))))))
+
+(define-public python2-docutils-0.11
+  (package-with-python2 python-docutils-0.11))
+
 (define-public python-pygments
   (package
     (name "python-pygments")
-- 
2.10.0

From 29d3cd9a89e2243d6b03c476e7f71888a104c918 Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Fri, 23 Sep 2016 15:58:00 +0000
Subject: [PATCH 13/18] gnu: Add python-markdown-2.2.1.

* gnu/packages/python.scm (python-markdown-2.2.1): New variable.
---
 gnu/packages/python.scm | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9c798d7..7637c0c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -5588,6 +5588,24 @@ markdown_py is also provided to convert Markdown files 
to HTML.")
 (define-public python2-markdown
   (package-with-python2 python-markdown))
 
+;; kallithea-0.3.2 needs this
+(define-public python-markdown-2.2.1
+  (package
+    (inherit python-markdown)
+    (version "2.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "Markdown" version))
+       (sha256
+        (base32
+         "1dj4mgflxm1xgyxlwrpv0psv1grnvrplaz3a6glsywdbrvps3fgq"))))
+    (arguments
+     `(#:tests? #f)))) ; We would need to package some old version of nose.
+
+(define-public python2-markdown-2.2.1
+  (package-with-python2 python-markdown-2.2.1))
+
 (define-public python-ptyprocess
   (package
     (name "python-ptyprocess")
-- 
2.10.0

From 9185e1a71d65dbd5b327f309ddda7ffb1372a90f Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Fri, 23 Sep 2016 16:11:00 +0000
Subject: [PATCH 14/18] gnu: Add python2-babel-1.3.

* gnu/packages/python.scm (python2-babel-1.3): New variabel.
---
 gnu/packages/python.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7637c0c..0fccf1f 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -664,6 +664,19 @@ etc. ")
 (define-public python2-babel
   (package-with-python2 python-babel))
 
+;; needed for kallithea-0.3.2
+(define-public python2-babel-1.3
+  (package
+    (inherit python2-babel)
+    (version "1.3")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (pypi-uri "Babel" version))
+      (sha256
+       (base32
+        "0bnin777lc53nxd1hp3apq410jj5wx92n08h7h4izpl4f4sx00lz"))))))
+
 (define-public python2-backport-ssl-match-hostname
   (package
     (name "python2-backport-ssl-match-hostname")
-- 
2.10.0

From 8496841fb61b0fddbb0c2c574c0a6339ac4a04a4 Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Fri, 23 Sep 2016 16:55:12 +0000
Subject: [PATCH 15/18] gnu: Add python-pyparsing-1.5.0.

* gnu/packages/python.scm (python-pyparsing-1.5.0): New variable.
---
 gnu/packages/python.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0fccf1f..1bdce65 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3494,6 +3494,19 @@ that client code uses to construct the grammar directly 
in Python code.")
 (define-public python2-pyparsing
   (package-with-python2 python-pyparsing))
 
+(define-public python2-pyparsing-1.5.0
+  (package
+    (inherit python2-pyparsing)
+    (name "python2-pyparsing")
+    (version "1.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pyparsing" version))
+       (sha256
+        (base32
+         "0ff1fgvmvin32xcmnz7xcz4rn57987m52cs91wmjr00qbf09x895"))))))
+
 (define-public python-numpydoc
   (package
     (name "python-numpydoc")
-- 
2.10.0

From 9cbc364b314db22705c8e8de3b817b2ea38fab17 Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Fri, 23 Sep 2016 17:47:54 +0000
Subject: [PATCH 16/18] gnu: Add python-amqplib.

* gnu/packages/python.scm (python-amqplib): New variable.
---
 gnu/packages/python.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 1bdce65..ef14ca4 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8463,6 +8463,33 @@ alternative when librabbitmq is not available.")
       (native-inputs `(("python2-setuptools" ,python2-setuptools)
                        ,@(package-native-inputs amqp))))))
 
+(define-public python-amqplib
+  (package
+    (name "python-amqplib")
+    (version "1.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "amqplib" version ".tgz"))
+       (sha256
+        (base32
+         "0nvy45bb9ws1kmpczpqkkpgzqrzc0h2323zmzchzs2m6h6v6jgc4"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/barryp/py-amqplib";)
+    (synopsis "AMQP Client Library")
+    (description "Python client for the Advanced Message Queuing Procotol 
(AMQP)")
+    (license license:gpl2+)))
+
+(define-public python2-amqplib
+  (let ((amqplib (package-with-python2
+                  (strip-python2-variant python-amqplib))))
+    (package
+      (inherit amqplib)
+      (arguments
+       `(#:tests? #f)) ;; For python2 there are no tests
+      (native-inputs
+       `(("python2-setuptools" ,python2-setuptools))))))
+
 (define-public python-kombu
   (package
     (name "python-kombu")
-- 
2.10.0

From b7d38efd7e7398ebb0e00265f1443951c67fe52a Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Fri, 23 Sep 2016 19:40:19 +0000
Subject: [PATCH 17/18] gnu: Add python2-kombu-1.

* gnu/packages/python.scm (python2-kombu-1): New variable.
---
 gnu/packages/python.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index ef14ca4..de674f3 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -8528,6 +8528,41 @@ RabbitMQ messaging server is the most popular 
implementation.")
                 ("python2-unittest2" ,python2-unittest2)
                 ,@(package-inputs kombu))))))
 
+;; required for pyparsing-1.5.0 which is required by celery-2.2.5 which is 
required by kallithea
+(define-public python2-kombu-1
+  (package
+    (name "python2-kombu-1")
+    (version "1.5.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "kombu" version))
+       (sha256
+        (base32
+         "0vvfmjq4r55zslrfpamkg557qb6n291krzk39xzw12fxwbd6llmf"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:python ,python-2))
+    (inputs
+     `(("python2-amqplib" ,python2-amqplib)
+       ("python2-setuptools" ,python2-setuptools)
+       ("python2-unittest2" ,python2-unittest2)))
+    (propagated-inputs
+     `(("python2-anyjson" ,python2-anyjson)
+       ("python2-amqp" ,python2-amqp)))
+    (native-inputs
+     `(("python2-mock" ,python2-mock)
+       ("python2-nose" ,python2-nose)))
+    (home-page "http://kombu.readthedocs.org";)
+    (synopsis "Message passing library for Python")
+    (description "The aim of Kombu is to make messaging in Python as easy as
+possible by providing an idiomatic high-level interface for the AMQ protocol,
+and also provide proven and tested solutions to common messaging problems.
+AMQP is the Advanced Message Queuing Protocol, an open standard protocol for
+message orientation, queuing, routing, reliability and security, for which the
+RabbitMQ messaging server is the most popular implementation.")
+    (license license:bsd-3)))
+
 (define-public python-billiard
   (package
     (name "python-billiard")
-- 
2.10.0

From a1cd0fe58340cced63a13d04119221811ee23a0b Mon Sep 17 00:00:00 2001
From: ng0 <address@hidden>
Date: Fri, 23 Sep 2016 19:41:31 +0000
Subject: [PATCH 18/18] gnu: Add kallithea.

* gnu/packages/version-control.scm (kallithea): New variable.
---
 gnu/packages/version-control.scm | 47 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 14b4dab..5e0f45e 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -10,7 +10,7 @@
 ;;; Copyright © 2015 Kyle Meyer <address@hidden>
 ;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2016 Leo Famulari <address@hidden>
-;;; Copyright © 2016 ng0 <address@hidden>
+;;; Copyright © 2016 ng0 <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1261,3 +1261,48 @@ a built-in wiki, built-in file browsing, built-in 
tickets system, etc.")
     (description "Stagit creates static pages for git repositories, the 
results can
 be served with a HTTP file server of your choice.")
     (license license:expat)))
+
+(define-public kallithea
+  (package
+    (name "kallithea")
+    (version "0.3.2")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "Kallithea" version))
+              (sha256
+               (base32
+                "1czhdvxcffr957y4h1qy0nlm7w3rzxbgw6vixg48ga02ry47y6l9"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:python ,python-2))
+    (native-inputs
+     `(("python2-setuptools" ,python2-setuptools)))
+    (inputs
+     `(("python2-sphinx" ,python2-sphinx)
+       ("python2-psycopg2" ,python2-psycopg2)
+       ("python2-pastescript" ,python2-pastescript)
+       ("python2-py-bcrypt" ,python2-py-bcrypt)
+       ("mercurial-3.7.3" ,address@hidden) ; mercurial < 3.8
+       ("python2-dulwich-0.9.9" ,python2-dulwich-0.9.9)
+       ("python2-mysql-python" ,python2-mysql-python)))
+    (native-inputs
+       `(("python2-routes-1.13" ,python2-routes-1.13)
+         ("python2-urlobject-2.3.4" ,python2-urlobject-2.3.4)
+         ("python2-mock" ,python2-mock)
+         ("python2-docutils-0.11" ,python2-docutils-0.11)
+         ("python2-markdown-2.2.1" ,python2-markdown-2.2.1)
+         ("python2-dateutil" ,python2-dateutil)
+         ("python2-babel-1.3" ,python2-babel-1.3)
+         ("python2-pytz" ,python2-pytz)
+         ("python2-celery" ,python2-celery)))
+    (home-page "https://kallithea-scm.org/";)
+    (synopsis
+     "Fast and powerful management tool for Mercurial and Git with a built-in 
push/pull
+server, full text search and code-review.")
+    (description
+     "Kallithea, a member project of Software Freedom Conservancy, is a 
GPLv3'd,
+Free Software source code management system that supports two leading version
+control systems, Mercurial and Git, and has a web interface that is easy to use
+for users and admins.  You can install Kallithea on your own server and host
+repositories for the version control system of your choice.")
+    (license license:gpl3)))
-- 
2.10.0

-- 
              ng0

Attachment: signature.asc
Description: PGP signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]