[PATCH 2/3] guix: Do not use ‘specification->package’.

[Ludovic Courtès]

‘specification->package’ warns in case of ambiguous specs such as
“guile@2.2” and is less precise than referring to variables.

* .guix/skribilo-package.scm (S): Remove.
(with-guile-2.0, with-guile-2.2)
(skribilo/guile-2.2, skribilo/guile-2.0): Refer to Guile by its variable
name.
---
 .guix/skribilo-package.scm | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.guix/skribilo-package.scm b/.guix/skribilo-package.scm
index d12a40f..12bb2d1 100644
--- a/.guix/skribilo-package.scm
+++ b/.guix/skribilo-package.scm
@@ -19,7 +19,6 @@
 ;;; along with Skribilo.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (skribilo-package)
-  #:use-module (gnu packages)
   #:use-module ((gnu packages autotools) #:select (autoconf automake))
   #:use-module ((gnu packages gettext) #:select (gnu-gettext))
   #:use-module (gnu packages ghostscript)
@@ -36,8 +35,6 @@
   #:use-module (guix packages)
   #:use-module (guix utils))
 
-(define S specification->package)
-
 (define-public skribilo
   (package
     (inherit guix:skribilo)
@@ -59,11 +56,11 @@
     (propagated-inputs (list guile-reader guile-lib))))
 
 (define with-guile-2.0
-  (package-input-rewriting/spec `(("guile" . ,(const (S "guile@2.0"))))
+  (package-input-rewriting/spec `(("guile" . ,(const guile-2.0)))
                                 #:deep? #f))
 
 (define with-guile-2.2
-  (package-input-rewriting/spec `(("guile" . ,(const (S "guile@2.2"))))
+  (package-input-rewriting/spec `(("guile" . ,(const guile-2.2)))
                                 #:deep? #f))
 
 (define-public skribilo/guile-2.2
@@ -73,7 +70,7 @@
     ;; Arrange to not trigger a rebuild of Automake & co.
     (inputs
      (modify-inputs (package-inputs skribilo)
-       (replace "guile" (S "guile@2.2"))))
+       (replace "guile" guile-2.2)))
     (native-inputs
      (package-native-inputs skribilo))))
 
@@ -83,7 +80,7 @@
     (name "guile2.0-skribilo")
     (inputs
      (modify-inputs (package-inputs skribilo)
-       (replace "guile" (S "guile@2.0"))))
+       (replace "guile" guile-2.0)))
     (native-inputs
      (package-native-inputs skribilo))))
 
-- 
2.41.0