gnu: wireservice: New wireservice-package macro.

Replace the parent 'base-package' variable with a 'wireservice-package' macro
that includes all common package fields.

* gnu/packages/wireservice.scm (base-package): Delete.
(wireservice-package): New macro.
(python-leather, python-agate, python-agate-sql, python-agate-dbf,
python-agate-excel): Use wireservice-package.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>

gnu/packages/wireservice.scm

@@ -30,21 +30,10 @@ (define-module (gnu packages wireservice)
   #:use-module (gnu packages sphinx)
   #:use-module (gnu packages time))
 
-;; Base package definition for packages from https://github.com/wireservice.
-;; This is done so we can share how to run tests and build documentation.
-(define base-package
+;; Common package definition for packages from https://github.com/wireservice.
+(define-syntax-rule (wireservice-package extra-fields ...)
   (package
-    (name #f)
-    (version #f)
-    (source #f)
-    (home-page #f)
-    (synopsis #f)
-    (description #f)
     (build-system python-build-system)
-    (native-inputs
-     `(("python-nose" ,python-nose)
-       ("python-sphinx" ,python-sphinx)
-       ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -66,11 +55,11 @@ (define base-package
                                       (string-append doc "/" target)))
                   '("html" "dirhtml" "singlehtml" "text")))
                #t))))))
-    (license license:expat)))
+    (license license:expat)
+    extra-fields ...))
 
 (define-public python-leather
-  (package
-    (inherit base-package)
+  (wireservice-package
    (name "python-leather")
    (version "0.3.3")
    (source (origin
@@ -83,9 +72,11 @@ (define-public python-leather
               (base32
                "1ck3dplni99sv4s117cbm07ydwwjsrxkhdy19rnk0iglia1d4s5i"))))
    (native-inputs
-     `(("python-cssselect" ,python-cssselect)
-       ("python-lxml" ,python-lxml)
-       ,@(package-native-inputs base-package)))
+    `(("python-nose" ,python-nose)
+      ("python-sphinx" ,python-sphinx)
+      ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
+      ("python-csselect" ,python-cssselect)
+      ("python-lxml" ,python-lxml)))
    (propagated-inputs
     `(("python-six" ,python-six)))
    (home-page "https://leather.rtfd.org")
@@ -94,8 +85,7 @@ (define-public python-leather
 charts now and don't care if they're perfect.")))
 
 (define-public python-agate
-  (package
-    (inherit base-package)
+  (wireservice-package
    (name "python-agate")
    (version "1.6.1")
    (source (origin
@@ -108,9 +98,11 @@ (define-public python-agate
               (base32
                "077zj8xad8hsa3nqywvf7ircirmx3krxdipl8wr3dynv3l3khcpl"))))
    (native-inputs
-     `(("python-cssselect" ,python-cssselect)
-       ("python-lxml" ,python-lxml)
-       ,@(package-native-inputs base-package)))
+    `(("python-nose" ,python-nose)
+      ("python-sphinx" ,python-sphinx)
+      ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)
+      ("python-csselect" ,python-cssselect)
+      ("python-lxml" ,python-lxml)))
    (propagated-inputs
     `(("python-babel" ,python-babel)
       ("python-isodate" ,python-isodate)
@@ -126,8 +118,7 @@ (define-public python-agate
 code.  Agate was previously known as journalism.")))
 
 (define-public python-agate-sql
-  (package
-    (inherit base-package)
+  (wireservice-package
    (name "python-agate-sql")
    (version "0.5.4")
    (source (origin
@@ -139,6 +130,10 @@ (define-public python-agate-sql
              (sha256
               (base32
                "16q0b211n5b1qmhzkfl2jr56lda0rvyh5j1wzw26h2n4pm4wxlx2"))))
+   (native-inputs
+    `(("python-nose" ,python-nose)
+      ("python-sphinx" ,python-sphinx)
+      ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)))
    (propagated-inputs
     `(("python-agate" ,python-agate)
       ("python-crate" ,python-crate)
@@ -149,8 +144,7 @@ (define-public python-agate-sql
 support to all @code{agate.Table} instances.")))
 
 (define-public python-agate-dbf
-  (package
-    (inherit base-package)
+  (wireservice-package
    (name "python-agate-dbf")
    (version "0.2.1")
    (source (origin
@@ -162,6 +156,10 @@ (define-public python-agate-dbf
              (sha256
               (base32
                "1y49fi6pmm7gzhajvqmfpcca2sqnwj24fqnsvzwk7r1hg2iaa2gi"))))
+   (native-inputs
+    `(("python-nose" ,python-nose)
+      ("python-sphinx" ,python-sphinx)
+      ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)))
    (propagated-inputs
     `(("python-agate" ,python-agate)
       ("python-dbfread" ,python-dbfread)))
@@ -171,8 +169,7 @@ (define-public python-agate-dbf
 for dbf files support to all @code{agate.Table} instances.")))
 
 (define-public python-agate-excel
-  (package
-    (inherit base-package)
+  (wireservice-package
    (name "python-agate-excel")
    (version "0.2.3")
    (source (origin
@@ -184,6 +181,10 @@ (define-public python-agate-excel
              (sha256
               (base32
                "1k5lv21k19s7kgbj5srd1xgrkqvxqqs49qwj33zncs9l7851afy7"))))
+   (native-inputs
+    `(("python-nose" ,python-nose)
+      ("python-sphinx" ,python-sphinx)
+      ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)))
    (propagated-inputs
     `(("python-agate" ,python-agate)
       ("python-openpyxl" ,python-openpyxl)