2 files changed, 28 insertions, 40 deletions
diff --git a/src/xyz/euandreh/docs.scm b/src/xyz/euandreh/pending.scm
index 82b74d9..3b83085 100644
--- a/src/xyz/euandreh/docs.scm
+++ b/src/xyz/euandreh/pending.scm
@@ -1,15 +1,11 @@
-(define-module (xyz euandreh docs)
-  #:use-module (gnu packages base)
-  #:use-module (gnu packages compression)
+(define-module (xyz euandreh pending)
+  #:use-module ((guix licenses) #:prefix licenses:)
   #:use-module (gnu packages markup)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages perl-check)
-  #:use-module (guix licenses)
   #:use-module (guix download)
   #:use-module (guix packages)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix build-system perl)
-  #:use-module (guix build-system trivial))
+  #:use-module (guix build-system perl))
 
 ;; Remove once https://issues.guix.gnu.org/58588 is applied
 (define-public perl-commonmark
@@ -38,7 +34,30 @@
     (synopsis "Interface to the CommonMark C library")
     (description "This module is a wrapper around the official
 CommonMark C library libcmark. It closely follows the original API.")
-    (license perl-license)))
+    (license licenses:perl-license)))
+
+;; Remove once https://issues.guix.gnu.org/58593 is applied
+(define-public perl-regexp-grammars
+  (package
+    (name "perl-regexp-grammars")
+    (version "1.057")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-"
+               version
+               ".tar.gz"))
+        (sha256
+          (base32 "0hbh2yn39mg6ljg8srcgpz2fsqxlzpgljz5mmq0xf72632cc2lxg"))))
+    (build-system perl-build-system)
+    (native-inputs
+      (list perl-module-build))
+    (home-page "https://metacpan.org/release/Regexp-Grammars")
+    (synopsis "Add grammatical parsing features to Perl 5.10 regexes")
+    (description "")
+    (license licenses:perl-license)))
 
 (list
- perl-commonmark)
+ perl-commonmark
+ perl-regexp-grammars)
diff --git a/src/xyz/euandreh/rg.scm b/src/xyz/euandreh/rg.scm
deleted file mode 100644
index e695407..0000000
--- a/src/xyz/euandreh/rg.scm
+++ /dev/null
@@ -1,31 +0,0 @@
-(define-module (xyz euandreh rg)
-  #:use-module (gnu packages perl)
-  #:use-module (guix build-system perl)
-  #:use-module (guix download)
-  #:use-module (guix licenses)
-  #:use-module (guix packages))
-
-;; Remove once https://issues.guix.gnu.org/58593 is applied
-(define-public perl-regexp-grammars
-  (package
-    (name "perl-regexp-grammars")
-    (version "1.057")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-"
-               version
-               ".tar.gz"))
-        (sha256
-          (base32 "0hbh2yn39mg6ljg8srcgpz2fsqxlzpgljz5mmq0xf72632cc2lxg"))))
-    (build-system perl-build-system)
-    (native-inputs
-      (list perl-module-build))
-    (home-page "https://metacpan.org/release/Regexp-Grammars")
-    (synopsis "Add grammatical parsing features to Perl 5.10 regexes")
-    (description "")
-    (license perl-license)))
-
-(list
- perl-regexp-grammars)