[bug#32263] [PATCH 0/8] Add fdroidserver

[bug#32263] [PATCH 0/8] Add fdroidserver

[Efraim Flashner]

This patch set adds fdroidserver. I haven't worked on a service for it
yet. Since I last worked on it two years ago it seemed like it'd be
better to submit it first and worry about the service later.

Efraim Flashner (8):
  gnu: Add python-docker-pycreds.
  gnu: Add python-pyperclip.
  gnu: Add python-codecov.
  gnu: Add python-androguard.
  gnu: virtualization.scm: Use license prefix.
  gnu: Add python-vagrant.
  gnu: python-docker-py: Update to 1.10.6.
  gnu: Add fdroidserver.

 gnu/packages/android.scm        | 105 +++++++++++++++++++++++++++++++-
 gnu/packages/check.scm          |  25 +++++++-
 gnu/packages/docker.scm         |  42 ++++++++++++-
 gnu/packages/virtualization.scm |  53 +++++++++++-----
 gnu/packages/xdisorg.scm        |  26 +++++++-
 5 files changed, 230 insertions(+), 21 deletions(-)

-- 
2.18.0

[bug#32263] [PATCH 1/8] gnu: Add python-docker-pycreds.

[Efraim Flashner]

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

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index f540417b4..07b5b1ea1 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2016 David Thompson <davet@gnu.org>
+;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -24,6 +25,7 @@
   #:use-module (guix git-download)
   #:use-module (guix build-system python)
   #:use-module (guix utils)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-web))
 
@@ -103,3 +105,39 @@ multi-container Docker applications.  A Compose file is used to configure an
 application’s services.  Then, using a single command, the containers are
 created and all the services are started as specified in the configuration.")
     (license license:asl2.0)))
+
+(define-public python-docker-pycreds
+  (package
+    (name "python-docker-pycreds")
+    (version "0.3.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "docker-pycreds" version))
+        (sha256
+         (base32
+          "1zxvam1q22qb0jf48553nnncnfrcp88ag4xa0qmq6vr0imn9a3lb"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-versioning
+           (lambda _
+             (substitute* "test-requirements.txt"
+               (("3.0.2") ,(package-version python-pytest))
+               (("2.3.1") ,(package-version python-pytest-cov))
+               (("2.4.1") ,(package-version python-flake8)))
+             #t)))))
+    (native-inputs
+     `(("python-flake8" ,python-flake8)
+       ("python-pytest" ,python-pytest)
+       ("python-pytest-cov" ,python-pytest-cov)))
+    (propagated-inputs
+     `(("python-six" ,python-six)))
+    (home-page "https://github.com/shin-/dockerpy-creds")
+    (synopsis
+     "Python bindings for the docker credentials store API")
+    (description
+     "Docker-Pycreds contains the Python bindings for the docker credentials
+store API.")
+    (license license:asl2.0)))
-- 
2.18.0

[bug#32263] [PATCH 2/8] gnu: Add python-pyperclip.

[Efraim Flashner]

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

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 2a8958d37..34cf1c924 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2015 Florian Paul Schmidt <mista.tapas@gmx.net>
 ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
@@ -1476,3 +1476,27 @@ first.  Additionally, xss-lock uses the inhibition logic to lock the screen
 before the system goes to sleep.")
       (home-page "https://bitbucket.org/raymonad/xss-lock")
       (license license:expat))))
+
+(define-public python-pyperclip
+  (package
+    (name "python-pyperclip")
+    (version "1.6.4")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "pyperclip" version))
+        (sha256
+         (base32
+          "1p505c23ji06r28k1y67siihsbdzdf1brhlqpyv9ams4gk9863pp"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:tests? #f)) ; Not clear how to make tests pass.
+    (inputs
+     `(("xclip" ,xclip)
+       ("xsel" ,xsel)))
+    (home-page "https://github.com/asweigart/pyperclip")
+    (synopsis "Python clipboard module")
+    (description
+     "Pyperclip is a clipboard module for Python, handling copy and
+paste clipboard functions.")
+    (license license:bsd-3)))
-- 
2.18.0

[bug#32263] [PATCH 2/8] gnu: Add python-pyperclip.

[Ludovic Courtès]

Efraim Flashner <efraim@flashner.co.il> skribis:

> * gnu/packages/xdisorg.scm (python-pyperclip): New variable.

[...]

> +    (home-page "https://github.com/asweigart/pyperclip")
> +    (synopsis "Python clipboard module")
> +    (description
> +     "Pyperclip is a clipboard module for Python, handling copy and
> +paste clipboard functions.")

Maybe “handling copy/pasting from the X11 clipboard”?

Otherwise LGTM!

[bug#32263] [PATCH 3/8] gnu: Add python-codecov.

[Efraim Flashner]

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

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 42b90bc2b..b56858a0b 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2015, 2017 Cyril Roelandt <tipecaml@gmail.com>
 ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym+a@scratchpost.org>
@@ -1223,6 +1223,29 @@ testing frameworks.")
 (define-public python2-cov-core
  (package-with-python2 python-cov-core))
 
+(define-public python-codecov
+  (package
+    (name "python-codecov")
+    (version "2.0.15")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "codecov" version))
+        (sha256
+         (base32
+          "1217c0vqf7ii65635gvl27a5pfhv0r7zhrpdp9cx640hg73bgn4f"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-unittest2" ,python-unittest2)))
+    (propagated-inputs
+     `(("python-coverage" ,python-coverage)
+       ("python-requests" ,python-requests)))
+    (home-page "http://github.com/codecov/codecov-python")
+    (synopsis "Report uploader")
+    (description
+     "Codecov uploads code coverage reports from many hosted providers.")
+    (license license:asl2.0)))
+
 (define-public python-testpath
   (package
     (name "python-testpath")
-- 
2.18.0

[bug#32263] [PATCH 3/8] gnu: Add python-codecov.

[Ludovic Courtès]

Efraim Flashner <efraim@flashner.co.il> skribis:

> * gnu/packages/check.scm (python-codecov): New variable.

[...]

> +    (home-page "http://github.com/codecov/codecov-python")
> +    (synopsis "Report uploader")

What about “Upload code coverage reports to @code{codecov.io}”?

> +    (description
> +     "Codecov uploads code coverage reports from many hosted providers.")

Maybe “Codecov collects code coverage reports from code written in
Python, Java, C/C++, R, and more, and uploads it to the
@code{codecov.io} service.”?

Otherwise LGTM!

This package seems to follow the Everything as a Service trend…

Ludo’.

[bug#32263] [PATCH 3/8] gnu: Add python-codecov.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1105 bytes --]

On Sun, Jul 29, 2018 at 03:41:38PM +0200, Ludovic Courtès wrote:
> Efraim Flashner <efraim@flashner.co.il> skribis:
> 
> > * gnu/packages/check.scm (python-codecov): New variable.
> 
> [...]
> 
> > +    (home-page "http://github.com/codecov/codecov-python")
> > +    (synopsis "Report uploader")
> 
> What about “Upload code coverage reports to @code{codecov.io}”?

I wasn't sure '@code' blocks and similar were allowed in the synopsis

> 
> > +    (description
> > +     "Codecov uploads code coverage reports from many hosted providers.")
> 
> Maybe “Codecov collects code coverage reports from code written in
> Python, Java, C/C++, R, and more, and uploads it to the
> @code{codecov.io} service.”?
> 
> Otherwise LGTM!
> 
> This package seems to follow the Everything as a Service trend…
> 
> Ludo

Definately not one I was excited about packaging

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

[bug#32263] [PATCH 4/8] gnu: Add python-androguard.

[Efraim Flashner]

* gnu/packages/android.scm (python-androguard): New variable.
---
 gnu/packages/android.scm | 50 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 7618c0e1f..2b3db50e1 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2017 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37,10 +38,12 @@
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages selinux)
   #:use-module (gnu packages ssh)
-  #:use-module (gnu packages version-control)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages version-control)
+  #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages linux))
 
 (define-public android-make-stub
@@ -807,3 +810,48 @@ script that you can put anywhere in your path.")
 Boot Images.  @code{abootimg} can work directly on block devices, or, the
 safest way, on a file image.")
     (license license:gpl2+)))
+
+(define-public python-androguard
+  (package
+    (name "python-androguard")
+    (version "3.2.1")
+    (source
+      (origin
+        ;; The pypi release doesn't have the tests, but the tests use
+        ;; packaged binaries, so we skip them.
+        (method url-fetch)
+        (uri (pypi-uri "androguard" version))
+        (sha256
+         (base32
+          "0ndsw00pkyda4i2s3wi5ap8gbk6a9d23xhhxpdbk02padv8sxkfv"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           ;; Adapted from .travis.yml
+           (lambda _
+             (invoke "nosetests" "--with-coverage" "--with-timer"
+                     "--timer-top-n" "50"))))))
+    (native-inputs
+     `(("python-codecov" ,python-codecov)
+       ("python-coverage" ,python-coverage)
+       ("python-mock" ,python-mock)
+       ("python-nose" ,python-nose)
+       ("python-nose-timer" ,python-nose-timer)))
+    (propagated-inputs
+     `(("python-asn1crypto" ,python-asn1crypto)
+       ("python-colorama" ,python-colorama)
+       ("python-future" ,python-future)
+       ("python-ipython" ,python-ipython)
+       ("python-lxml" ,python-lxml)
+       ("python-matplotlib" ,python-matplotlib)
+       ("python-networkx" ,python-networkx)
+       ("python-pygments" ,python-pygments)
+       ("python-pyperclip" ,python-pyperclip)))
+    (home-page "https://github.com/androguard/androguard")
+    (synopsis "Python tool to play with Android files")
+    (description
+     "Androguard is a full Python tool to play with Android files.  It is
+useful for reverse engineering, analysis of Android applications and more.")
+    (license license:asl2.0)))
-- 
2.18.0

[bug#32263] [PATCH 4/8] gnu: Add python-androguard.

[Ludovic Courtès]

Efraim Flashner <efraim@flashner.co.il> skribis:

> * gnu/packages/android.scm (python-androguard): New variable.

[...]

> +    (home-page "https://github.com/androguard/androguard")
> +    (synopsis "Python tool to play with Android files")

s/play with/manipulate/?

Otherwise LGTM!

[bug#32263] [PATCH 5/8] gnu: virtualization.scm: Use license prefix.

[Efraim Flashner]

* gnu/packages/virtualization.scm: Replace all 'license' values with a
'license:' prefix.
---
 gnu/packages/virtualization.scm | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index ebc57dc36..05605a0bb 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -76,8 +76,7 @@
   #:use-module (guix build-system python)
   #:use-module (guix download)
   #:use-module (guix git-download)
-  #:use-module ((guix licenses) #:select (gpl2 gpl2+ gpl3+ lgpl2.1 lgpl2.1+
-                                               asl2.0))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (srfi srfi-1))
@@ -227,7 +226,7 @@ the KVM kernel module in Linux.  When using KVM, QEMU can virtualize x86,
 server and embedded PowerPC, and S390 guests.")
 
     ;; Many files are GPLv2+, but some are GPLv2-only---e.g., `memory.c'.
-    (license gpl2)
+    (license license:gpl2)
 
     ;; Several tests fail on MIPS; see <http://hydra.gnu.org/build/117914>.
     (supported-systems (delete "mips64el-linux" %supported-systems))))
@@ -337,7 +336,7 @@ system on a hypervisor.  Via GObject Introspection, the API is available in
 all common programming languages.  Vala bindings are also provided.")
     ;; The library files are released under LGPLv2.1 or later; the source
     ;; files in the "tools" directory are released under GPLv2+.
-    (license (list lgpl2.1+ gpl2+))))
+    (license (list license:lgpl2.1+ license:gpl2+))))
 
 (define-public lxc
   (package
@@ -382,7 +381,7 @@ all common programming languages.  Vala bindings are also provided.")
      "LXC is a userspace interface for the Linux kernel containment features.
 Through a powerful API and simple tools, it lets Linux users easily create and
 manage system or application containers.")
-    (license lgpl2.1+)))
+    (license license:lgpl2.1+)))
 
 (define-public libvirt
   (package
@@ -467,7 +466,7 @@ manage system or application containers.")
 capabilities of recent versions of Linux.  The library aims at providing long
 term stable C API initially for the Xen paravirtualization but should be able
 to integrate other virtualization mechanisms if needed.")
-    (license lgpl2.1+)))
+    (license license:lgpl2.1+)))
 
 (define-public libvirt-glib
   (package
@@ -515,7 +514,7 @@ three libraries:
 @item libvirt-gobject - GObjects for managing libvirt objects
 @end enumerate
 ")
-    (license lgpl2.1+)))
+    (license license:lgpl2.1+)))
 
 (define-public python-libvirt
   (package
@@ -550,7 +549,7 @@ three libraries:
     (synopsis "Python bindings to libvirt")
     (description "This package provides Python bindings to the libvirt
 virtualization library.")
-    (license lgpl2.1+)))
+    (license license:lgpl2.1+)))
 
 (define-public python2-libvirt
   (package-with-python2 python-libvirt))
@@ -649,7 +648,7 @@ virtualization library.")
 virtual machines through libvirt.  It primarily targets KVM VMs, but also
 manages Xen and LXC (Linux containers).  It presents a summary view of running
 domains, their live performance and resource utilization statistics.")
-    (license gpl2+)))
+    (license license:gpl2+)))
 
 (define-public criu
   (package
@@ -743,7 +742,7 @@ was frozen at.  The distinctive feature of the CRIU project is that it is
 mainly implemented in user space.")
     ;; The project is licensed under GPLv2; files in the lib/ directory are
     ;; LGPLv2.1.
-    (license (list gpl2 lgpl2.1))))
+    (license (list license:gpl2 license:lgpl2.1))))
 
 (define-public qmpbackup
   (package
@@ -765,7 +764,7 @@ mainly implemented in user space.")
     (description "qmpbackup is designed to create and restore full and
 incremental backups of running QEMU virtual machines via QMP, the QEMU
 Machine Protocol.")
-    (license gpl3+)))
+    (license license:gpl3+)))
 
 (define-public lookingglass
   (package
@@ -813,7 +812,7 @@ monitor, keyboard or mouse.  It displays the VM's rendered contents on your main
 monitor/GPU.")
    ;; This package requires SSE instructions.
    (supported-systems '("i686-linux" "x86_64-linux"))
-   (license gpl2+)))
+   (license license:gpl2+)))
 
 (define-public runc
   (package
@@ -870,7 +869,7 @@ packaged according to the
 @uref{https://github.com/opencontainers/runtime-spec/blob/master/spec.md, Open
 Container Initiative (OCI) format} and is a compliant implementation of the
 Open Container Initiative specification.")
-    (license asl2.0)))
+    (license license:asl2.0)))
 
 (define-public umoci
   (package
@@ -915,7 +914,7 @@ Open Container Initiative specification.")
     (description
      "@command{umoci} is a tool that allows for high-level modification of an
 Open Container Initiative (OCI) image layout and its tagged images.")
-    (license asl2.0)))
+    (license license:asl2.0)))
 
 (define-public skopeo
   (package
@@ -977,4 +976,4 @@ the image.
 @item Delete container images from a remote container registry.
 
 @end enumerate")
-    (license asl2.0)))
+    (license license:asl2.0)))
-- 
2.18.0

[bug#32263] [PATCH 5/8] gnu: virtualization.scm: Use license prefix.

[Ludovic Courtès]

Efraim Flashner <efraim@flashner.co.il> skribis:

> * gnu/packages/virtualization.scm: Replace all 'license' values with a
> 'license:' prefix.

OK!

[bug#32263] [PATCH 6/8] gnu: Add python-vagrant.

[Efraim Flashner]

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

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 05605a0bb..e4120de38 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com>
 ;;; Copyright © 2017 Andy Patterson <ajpatter@uwaterloo.ca>
@@ -977,3 +977,25 @@ the image.
 
 @end enumerate")
     (license license:asl2.0)))
+
+(define-public python-vagrant
+  (package
+    (name "python-vagrant")
+    (version "0.5.15")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "python-vagrant" version))
+        (sha256
+         (base32
+          "1ikrh6canhcxg5y7pzmkcnnydikppv7s6sm9prfx90nk0ac8m6mg"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:tests? #f)) ; tests involve running vagrant.
+    (home-page "https://github.com/todddeluca/python-vagrant")
+    (synopsis "Python bindings for Vagrant")
+    (description
+     "Python-vagrant is a Python module that provides a thin wrapper around the
+@code{vagrant} command line executable, allowing programmatic control of Vagrant
+virtual machines.")
+    (license license:expat)))
-- 
2.18.0

[bug#32263] [PATCH 6/8] gnu: Add python-vagrant.

[Ludovic Courtès]

Efraim Flashner <efraim@flashner.co.il> skribis:

> * gnu/packages/virtualization.scm (python-vagrant): New variable.

LGTM!

[bug#32263] [PATCH 7/8] gnu: python-docker-py: Update to 1.10.6.

[Efraim Flashner]

* gnu/packages/docker.scm (python-docker-py): Update to 1.10.6.
---
 gnu/packages/docker.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 07b5b1ea1..2a08446dd 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -32,14 +32,14 @@
 (define-public python-docker-py
   (package
     (name "python-docker-py")
-    (version "1.6.0")
+    (version "1.10.6")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "docker-py" version))
        (sha256
         (base32
-         "16ba4xyd46hkj9nkfpz15r8kskl7ljx1afjzchyrhdsrklvzgzim"))))
+         "05f49f6hnl7npmi7kigg0ibqk8s3fhzx1ivvz1kqvlv4ay3paajc"))))
     (build-system python-build-system)
     ;; TODO: Tests require a running Docker daemon.
     (arguments '(#:tests? #f))
-- 
2.18.0

[bug#32263] [PATCH 7/8] gnu: python-docker-py: Update to 1.10.6.

[Ludovic Courtès]

Efraim Flashner <efraim@flashner.co.il> skribis:

> * gnu/packages/docker.scm (python-docker-py): Update to 1.10.6.

LGTM!

[bug#32263] [PATCH 8/8] gnu: Add fdroidserver.

[Efraim Flashner]

* gnu/packages/android.scm (fdroidserver): New variable.
---
 gnu/packages/android.scm | 55 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 2b3db50e1..886a1855d 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -35,14 +35,18 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
+  #:use-module (gnu packages docker)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-crypto)
+  #:use-module (gnu packages python-web)
   #:use-module (gnu packages selinux)
+  #:use-module (gnu packages serialization)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
+  #:use-module (gnu packages virtualization)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages linux))
 
@@ -855,3 +859,54 @@ safest way, on a file image.")
      "Androguard is a full Python tool to play with Android files.  It is
 useful for reverse engineering, analysis of Android applications and more.")
     (license license:asl2.0)))
+
+(define-public fdroidserver
+  (package
+    (name "fdroidserver")
+    (version "1.0.9")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "fdroidserver" version))
+        (sha256
+         (base32
+          "0cwb1fmindw6v9jkiim9yn3496rk1pvnk94s1r0vz2hxgz16xp7n"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-versioning
+           (lambda _
+             (substitute* "setup.py"
+               (("0.2.1") ,(package-version python-pyasn1-modules)))
+             #t)))))
+    (propagated-inputs
+     `(("python-androguard" ,python-androguard)
+       ("python-apache-libcloud" ,python-apache-libcloud)
+       ("python-clint" ,python-clint)
+       ("python-docker-py" ,python-docker-py)
+       ("python-gitpython" ,python-gitpython)
+       ("python-mwclient" ,python-mwclient)
+       ("python-paramiko" ,python-paramiko)
+       ("python-pillow" ,python-pillow)
+       ("python-pyasn1" ,python-pyasn1)
+       ("python-pyasn1-modules" ,python-pyasn1-modules)
+       ("python-pyyaml" ,python-pyyaml)
+       ("python-qrcode" ,python-qrcode)
+       ("python-ruamel.yaml" ,python-ruamel.yaml)
+       ("python-requests" ,python-requests)
+       ("python-vagrant" ,python-vagrant)))
+    (native-inputs
+     `(("python-babel" ,python-babel)
+       ("python-bcrypt" ,python-bcrypt)
+       ("python-docker-pycreds" ,python-docker-pycreds)
+       ("python-pynacl" ,python-pynacl)
+       ("python-websocket-client" ,python-websocket-client)))
+    (home-page "https://f-droid.org")
+    (synopsis "F-Droid Server Tools")
+    (description
+     "The F-Droid server tools provide various scripts and tools that are used
+to maintain the main F-Droid application repository.  You can use these same
+tools to create your own additional or alternative repository for publishing, or
+to assist in creating, testing and submitting metadata to the main repository.")
+    (license license:agpl3+)))
-- 
2.18.0

[bug#32263] [PATCH 8/8] gnu: Add fdroidserver.

[Ludovic Courtès]

Efraim Flashner <efraim@flashner.co.il> skribis:

> * gnu/packages/android.scm (fdroidserver): New variable.

[...]

> +    (home-page "https://f-droid.org")
> +    (synopsis "F-Droid Server Tools")

“F-Droid server tools”

> +    (description
> +     "The F-Droid server tools provide various scripts and tools that are used
> +to maintain the main F-Droid application repository.
               ^-------------------------------------^
“F-Droid, the repository of free Android applications.”

Otherwise LGTM.

Thank you for this whole series!  Would be fun to have an F-Droid server
running on GuixSD.  :-)

Ludo’.

[bug#32263] [PATCH 1/8] gnu: Add python-docker-pycreds.

[Ludovic Courtès]

Efraim Flashner <efraim@flashner.co.il> skribis:

> * gnu/packages/docker.scm (python-docker-pycreds): New variable.

[...]

> +    (home-page "https://github.com/shin-/dockerpy-creds")
> +    (synopsis
> +     "Python bindings for the docker credentials store API")
> +    (description
> +     "Docker-Pycreds contains the Python bindings for the docker credentials
> +store API.")

s/docker/Docker/

Also it’d be nice to add a sentence like “It allows programmers to do X
and Y from Python.”.

Otherwise LGTM, thanks!

Ludo’.

bug#32263: fdroidserver merged

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 230 bytes --]

Patchset merged

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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