[PATCH] Add tinycm.

[ng0 <ngillmann@runbox.com>]

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

This adds tinycm. But now that I am finished, I think this is not what I
wanted, I wanted http://tinycm.slitaz.org/ . I assumed without looking
at the source that this is just a fork.
Well, no damage in more packages I'd say.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-python-boolexp.patch --]
[-- Type: text/x-patch, Size: 1881 bytes --]

From 8930f01a7953b7881fc505b8b4ed2084f37a86b0 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Tue, 20 Sep 2016 11:15:48 +0000
Subject: [PATCH 1/8] gnu: Add python-boolexp.

* gnu/packages/python.scm (python-boolexp): 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 a186557..995332e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -499,6 +499,35 @@ John the Ripper).")
 (define-public python2-py-bcrypt
   (package-with-python2 python-py-bcrypt))
 
+(define-public python-boolexp
+  (package
+    (name "python-boolexp")
+    (version "0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "boolexp" version))
+              (sha256
+               (base32
+                "01rgzy6abpa4pscmcw4bmr5fl5ij4knff2y0ah73sg8lazhf1sdm"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f))
+    (inputs
+     `(("python-pyparsing" ,python-pyparsing)))
+    ;; ("python2-pyandoc" ,python2-pyandoc) ; A pandoc wrapper, TODO: package it.
+    (home-page "https://bitbucket.org/pfacka/boolexp")
+    (synopsis "Safe boolean expression evaluator")
+    (description
+     "Boolexp provides \"safe\" evaluation of boolean expressions for use cases
+where eval might be dangerous.  Boolexp expressions are context-free and mimic
+Python sytax.  Only basic math opearations and data structures are provided.")
+    (license license:expat)))
+
+(define-public python2-boolexp
+  (let ((boolexp (package-with-python2 python-boolexp)))
+    (package (inherit boolexp)
+      (native-inputs
+       `(("python2-setuptools" ,python2-setuptools))))))
 
 (define-public python-paramiko
   (package
-- 
2.10.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-gnu-Add-python-colorlog.patch --]
[-- Type: text/x-patch, Size: 1729 bytes --]

From 0f1c67cdd9043ea6a232816d6e217fd07f567a81 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Tue, 20 Sep 2016 13:44:20 +0000
Subject: [PATCH 2/8] gnu: Add python-colorlog.

* gnu/packages/python.scm (python-colorlog): 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 995332e..6561db7 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -529,6 +529,33 @@ Python sytax.  Only basic math opearations and data structures are provided.")
       (native-inputs
        `(("python2-setuptools" ,python2-setuptools))))))
 
+(define-public python-colorlog
+  (package
+    (name "python-colorlog")
+    (version "2.7.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "colorlog" version))
+       (sha256
+        (base32
+         "0gpkja9zcplf29zmjcvix7pnic4xkbb1s0lkaab4k01r6np7s6cf"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-colorama" ,python-colorama)))
+    (home-page "https://github.com/borntyping/python-colorlog")
+    (synopsis "Log formatting with colors")
+    (description
+     "@code{colorlog.ColoredFormatter} is a formatter for use with
+the Python logging module that outputs records using terminal colors.")
+    (license license:expat)))
+
+(define-public python2-colorlog
+  (let ((colorlog (package-with-python2 python-colorlog)))
+    (package (inherit colorlog)
+      (native-inputs
+       `(("python2-setuptools" ,python2-setuptools))))))
+
 (define-public python-paramiko
   (package
     (name "python-paramiko")
-- 
2.10.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.4: 0003-gnu-Add-python2-ruamel.ordereddict.patch --]
[-- Type: text/x-patch, Size: 1891 bytes --]

From 4ab213cb4bdbfa8ebfde5027516411ddde6b5035 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Tue, 20 Sep 2016 14:25:41 +0000
Subject: [PATCH 3/8] gnu: Add python2-ruamel.ordereddict

* gnu/packages/python.scm (python2-ruamel.ordereddict): 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 6561db7..faf2748 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -556,6 +556,34 @@ the Python logging module that outputs records using terminal colors.")
       (native-inputs
        `(("python2-setuptools" ,python2-setuptools))))))
 
+(define-public python2-ruamel.ordereddict
+  (package
+    (name "python2-ruamel.ordereddict")
+    (version "0.4.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "ruamel.ordereddict" version))
+       (sha256
+        (base32
+         "1xmkl8v9l9inm2pyxgc1fm5005yxm7fkd5gv74q7lj1iy5qc8n3h"))))
+    (build-system python-build-system)
+    ;; XXX: https://bitbucket.org/ruamel/ordereddict/issues/2
+    (arguments
+     `(#:python ,python-2))
+    (inputs
+     `(("python2-setuptools" ,python2-setuptools)))
+    (home-page "https://bitbucket.org/ruamel/ordereddict")
+    (synopsis "Version of @code{dict} that keeps keys in insertion
+resp. sorted order")
+    (description
+     "This is an implementation of an ordered dictionary with Key
+Insertion Order and Key Value Insertion Order.  The standard library
+module OrderedDict, implemented later, implements a subset of
+ordereddict functionality.  Sorted dictionaries are also provided.
+Currently only with Key Sorted Order.")
+    (license license:expat)))
+
 (define-public python-paramiko
   (package
     (name "python-paramiko")
-- 
2.10.0


[-- Attachment #1.5: 0004-gnu-Add-python-distro.patch --]
[-- Type: text/x-patch, Size: 3031 bytes --]

From aa035ba98df9041a36ff54893e54be03af42fcad Mon Sep 17 00:00:00 2001
From: ng0 <ngillmann@runbox.com>
Date: Wed, 21 Sep 2016 09:54:18 +0000
Subject: [PATCH 4/8] gnu: Add python-distro.

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

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index faf2748..4d321df 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -23,7 +23,7 @@
 ;;; Copyright © 2016 Daniel Pimentel <d4n1@d4n1.org>
 ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2016 Troy Sankey <sankeytms@gmail.com>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 ng0 <ngillmann@runbox.com>
 ;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
 ;;; Copyright © 2016 David Craven <david@craven.ch>
 ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
@@ -781,6 +781,44 @@ 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-distro
+(package
+  (name "python-distro")
+  (version "0.6.0")
+  (source
+    (origin
+      (method url-fetch)
+      (uri (pypi-uri "distro" version))
+      (sha256
+        (base32
+          "1xkj2id1b3b4ix3b4yrfy6pgcsp71n0fbq4475r17a4a8fj5f5v7"))))
+  (build-system python-build-system)
+  (inputs
+   `(("python-six" ,python-six)))
+  (home-page "https://github.com/nir0s/distro")
+  (synopsis "alternative implementation for Python's platform.linux_distribution()")
+  (description
+   "The distro package provides information about the GNU-Linux distribution it runs on,
+such as a reliable machine-readable ID, or version information.
+It is a renewed alternative implementation for Python's original
+platform.linux_distribution function, which became necessary because Python 3.5
+deprecated this function, and Python 3.7 is expected to remove it altogether. 
+Its predecessor function platform.dist was already deprecated since Python 2.6 and is
+also expected to be removed in Python 3.7.  The distro package implements a robust and
+inclusive way of retrieving the information about a GNU-Linux distribution based on new
+standards and old methods, namely from these data sources (from high to low precedence):
+@enumerate
+@item The os-release file /etc/os-release, if present.
+@item The output of the lsb_release command, if available.
+@item The distro release file (/etc/*(-|_)(release|version)), if present.")
+  (license license:asl2.0)))
+
+(define-public python2-distro
+  (let ((distro (package-with-python2 python-distro)))
+    (package (inherit distro)
+      (native-inputs
+       `(("python2-setuptools" ,python2-setuptools))))))
+
 (define-public python-h5py
   (package
     (name "python-h5py")
-- 
2.10.0


[-- Attachment #1.6: 0005-mailmap-Add-new-address-for-ng0.patch --]
[-- Type: text/x-patch, Size: 1205 bytes --]

From f2339786a1707dc53415156d6f973f339235b481 Mon Sep 17 00:00:00 2001
From: ng0 <ngillmann@runbox.com>
Date: Wed, 21 Sep 2016 09:55:40 +0000
Subject: [PATCH 5/8] mailmap: Add new address for ng0.

---
 .mailmap | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index 2af7760..4f756ec 100644
--- a/.mailmap
+++ b/.mailmap
@@ -30,9 +30,10 @@ Ludovic Courtès <ludo@gnu.org> <ludovic.courtes@inria.fr>
 Mathieu Lirzin <mthl@gnu.org> <mthl@openmailbox.org>
 Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org>
 Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
-ng0 <ng0@we.make.ritual.n0.is> <niasterisk@grrlz.net>
-ng0 <ng0@we.make.ritual.n0.is> <ng@niasterisk.space>
-ng0 <ng0@we.make.ritual.n0.is> <ng0@libertad.pw>
+ng0 <ngillmann@runbox.com> <ng0@we.make.ritual.n0.is>
+ng0 <ngillmann@runbox.com> <niasterisk@grrlz.net>
+ng0 <ngillmann@runbox.com> <ng@niasterisk.space>
+ng0 <ngillmann@runbox.com> <ng0@libertad.pw>
 Pjotr Prins <pjotr.public01@thebird.nl>
 Pjotr Prins <pjotr.public01@thebird.nl> <pjotr.public12@thebird.nl>
 Raimon Grau <raimonster@gmail.com> <raimon@3scale.net>
-- 
2.10.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.7: 0006-gnu-Add-python-typing.patch --]
[-- Type: text/x-patch, Size: 1743 bytes --]

From 75ac81e9b47f6a5a6112af9a19c22cd691e79e61 Mon Sep 17 00:00:00 2001
From: ng0 <ngillmann@runbox.com>
Date: Wed, 21 Sep 2016 11:08:14 +0000
Subject: [PATCH 6/8] gnu: Add python-typing.

* gnu/packages/python.scm (python-typing): 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 4d321df..2bcf2d8 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -1304,6 +1304,33 @@ Python 3.3+.")
 (define-public python2-simplejson
   (package-with-python2 python-simplejson))
 
+(define-public python-typing
+  (package
+    (name "python-typing")
+    (version "3.5.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "typing" version ".2.tar.gz"))
+       (sha256
+        (base32
+         "0bvpqkmrnl5qs5491yb4irrkd8sha84g6xy8cclp3bsk4qlk9kib"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f)) ; No tests
+    (home-page "https://docs.python.org/3.5/library/typing.html")
+    (synopsis "Type Hints for Python")
+    (description
+     "This is a backport of the standard library typing module to
+Python versions older than 3.5.  Typing defines a standard notation
+for Python function and variable type annotations.  The notation can
+be used for documenting code in a concise, standard format, and it has
+been designed to also be used by static and runtime type checkers,
+static analyzers, IDEs and other tools.")
+    (license (package-license python))))
+
+(define-public python2-typing
+  (package-with-python2 python-typing))
 
 (define-public python-pyicu
   (package
-- 
2.10.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.8: 0007-gnu-Add-python-ruamel.yaml.patch --]
[-- Type: text/x-patch, Size: 2085 bytes --]

From 01dad343da9e1857e9ec4b2a174e9b211fdb7019 Mon Sep 17 00:00:00 2001
From: ng0 <ngillmann@runbox.com>
Date: Wed, 21 Sep 2016 11:31:07 +0000
Subject: [PATCH 7/8] gnu: Add python-ruamel.yaml.

* gnu/packages/python.scm (python-ruamel.yaml): 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 2bcf2d8..5583aa6 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2758,6 +2758,41 @@ object.")
 (define-public python2-pyyaml
   (package-with-python2 python-pyyaml))
 
+(define-public python-ruamel.yaml
+  (package
+    (name "python-ruamel.yaml")
+    (version "0.12.14")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "ruamel.yaml" version))
+       (sha256
+        (base32
+         "1w23nqswsq083xc0qpkw764n1a4v5g9p4fz1jkp6xbrzr9mrkqp7"))))
+    (build-system python-build-system)
+    (arguments
+     `(;; Otherwise it complains that you have to do "pypi install ."
+       #:configure-flags (list "--single-version-externally-managed"
+                               "--record=ruamel.yaml.txt")))
+    (inputs
+     `(("python-typing" ,python-typing)))
+    (home-page "https://bitbucket.org/ruamel/yaml")
+    (synopsis "YAML 1.2 loader/dumper package for Python")
+    (description
+     "@code{ruamel.yaml} is a YAML 1.2 parser/emitter that supports roundtrip
+preservation of comments, seq/map flow style, and map key order.")
+    (license license:expat)))
+
+(define-public python2-ruamel.yaml
+  (package (inherit (package-with-python2
+                     (strip-python2-variant python-ruamel.yaml)))
+    (name "python2-ruamel.yaml")
+    (inputs
+     `(("python2-ruamel.ordereddict" ,python2-ruamel.ordereddict)
+       ("python2-typing" ,python2-typing)))
+    (native-inputs
+     `(("python2-setuptools" ,python2-setuptools)))))
+
 (define-public python-virtualenv
   (package
     (name "python-virtualenv")
-- 
2.10.0


[-- Attachment #1.9: 0008-gnu-Add-tinycm.patch --]
[-- Type: text/x-patch, Size: 2480 bytes --]

From 19b307b35132d1d817c787df0de0140a84c06405 Mon Sep 17 00:00:00 2001
From: ng0 <ngillmann@runbox.com>
Date: Wed, 21 Sep 2016 11:42:20 +0000
Subject: [PATCH 8/8] gnu: Add tinycm.

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

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 342262b..7695b7e 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -13,7 +13,7 @@
 ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
 ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2016 Clément Lassieur <clement@lassieur.org>
-;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Copyright © 2016 ng0 <ngillmann@runbox.com>
 ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -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)
@@ -3287,6 +3288,34 @@ where data can be processed either in memory, on disk, or streaming via the
 callback or connection interfaces.")
     (license l:expat)))
 
+(define-public tinycm
+  (package
+    (name "tinycm")
+    (version "0.1.29")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "tinycm" version))
+       (sha256
+        (base32
+         "0d8fsmhdv410bvz1plk32whdad5qq1ixi9a2wnnqx3dpv6cixi0y"))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-boolexp" ,python-boolexp)
+       ("python-colorama" ,python-colorama)
+       ("python-colorlog" ,python-colorlog)
+       ("python-distro" ,python-distro)
+       ("python-networkx" ,python-networkx)
+       ("python-pyparsing" ,python-pyparsing)
+       ("python-requests" ,python-requests)
+       ("python-ruamel.yaml" ,python-ruamel.yaml)
+       ("python-tabulate" ,python-tabulate)
+       ("python-typing" ,python-typing)))
+    (home-page "https://github.com/MartijnBraam/TinyCM")
+    (synopsis "Tiny Configuration Management tool")
+    (description "Tiny Configuration Management tool")
+    (license l:expat)))
+
 (define-public gumbo-parser
   (package
     (name "gumbo-parser")
-- 
2.10.0


[-- Attachment #1.10: Type: text/plain, Size: 26 bytes --]


-- 
              ng0

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 800 bytes --]