From b62c88aba03eb80ef7df80d6c27696aec6e73c00 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Wed, 22 Mar 2023 17:06:00 -0300
Subject: src/bin/paku: Improve name of package variants

---
 src/bin/paku                 |  5 +++--
 src/org/euandre/packages.scm | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/bin/paku b/src/bin/paku
index 1e7753e..67d92f3 100755
--- a/src/bin/paku
+++ b/src/bin/paku
@@ -258,6 +258,7 @@ sub emit_guix() {
 	for my $pkg (@{$json->{packages}}) {
 		my $long = $pkg->{'long-description'};
 		$long =~ s/^(.)/          $1/gm;
+		my $ver = $pkg->{version} =~ s/^v//r;
 
 		my $name = $pkg->{name} . (
 			$pkg->{label} eq 'latest' ? '' : "-$pkg->{label}"
@@ -266,8 +267,8 @@ sub emit_guix() {
 		print <<~EOF;
 		(define-public $name
 		  (package
-		    (name "$name")
-		    (version "$pkg->{version}")
+		    (name "$pkg->{name}")
+		    (version "$ver")
 		    (source
 		      (origin
 		        (method url-fetch)
diff --git a/src/org/euandre/packages.scm b/src/org/euandre/packages.scm
index 19b9b23..8c97e57 100644
--- a/src/org/euandre/packages.scm
+++ b/src/org/euandre/packages.scm
@@ -9,8 +9,8 @@
 
 (define-public git-permalink-0-1-0
   (package
-    (name "git-permalink-0-1-0")
-    (version "v0.1.0")
+    (name "git-permalink")
+    (version "0.1.0")
     (source
       (origin
         (method url-fetch)
@@ -38,8 +38,8 @@ config.")
 
 (define-public git-permalink-0-2-0
   (package
-    (name "git-permalink-0-2-0")
-    (version "v0.2.0")
+    (name "git-permalink")
+    (version "0.2.0")
     (source
       (origin
         (method url-fetch)
@@ -67,8 +67,8 @@ config.")
 
 (define-public remembering-0-1-2
   (package
-    (name "remembering-0-1-2")
-    (version "v0.1.2")
+    (name "remembering")
+    (version "0.1.2")
     (source
       (origin
         (method url-fetch)
-- 
cgit v1.2.3