[bug#65887] [PATCH] gnu: guile-fibers: Remove version from latest package.

[bug#65887] [PATCH] gnu: guile-fibers: Remove version from latest package.

[Christopher Baines]

As I think this makes more sense, the version is only specified when you need
a specific previous release.

* gnu/packages/guile-xyz.scm (guile-fibers): Rename to guile-fibers-1.0.
(guile-fibers-1.3): Rename to guile-fibers.
(guile-fibers-1.1): Inherit from guile-fibers.
* gnu/packages/admin.scm (shepherd-0.10)[native-inputs]: Replace
guile-fibers-1.3 with guile-fibers.
* gnu/packages/ci.scm (cuirass)[inputs]: Likewise.
* gnu/packages/gnunet.scm (gnunet-scheme)[propagated-inputs,native-inputs]:
Likewise.
* gnu/packages/package-management.scm (guix-build-coordinator)
[inputs,propagated-inputs]: Likewise.
* gnu/packages/package-management.scm (nar-herder)[inputs,propagated-inputs]:
Likewise.
* gnu/packages/web.scm (guix-data-service)[propagated-inputs]: Likewise.
---
 gnu/packages/admin.scm              | 2 +-
 gnu/packages/ci.scm                 | 2 +-
 gnu/packages/gnunet.scm             | 4 ++--
 gnu/packages/guile-xyz.scm          | 8 +++++---
 gnu/packages/package-management.scm | 8 ++++----
 gnu/packages/web.scm                | 2 +-
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 5d586e6f36..6fc16d8af6 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -393,7 +393,7 @@ (define-public shepherd-0.10
                        ;; single-board computers.
                        (if (target-arm?)
                            guile-fibers-1.1
-                           guile-fibers-1.3))))
+                           guile-fibers))))
     (inputs (modify-inputs (package-inputs shepherd-0.9)
               (replace "guile-fibers"
                 (this-package-native-input "guile-fibers"))))))
diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm
index f38dd4383d..848e008b3b 100644
--- a/gnu/packages/ci.scm
+++ b/gnu/packages/ci.scm
@@ -142,7 +142,7 @@ (define-public cuirass
       (inputs
        (list guile-3.0-latest
              guile-avahi
-             guile-fibers-1.3
+             guile-fibers
              guile-gcrypt
              guile-json-4
              guile-simple-zmq
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index f16a223d10..d1ac228639 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -409,14 +409,14 @@ (define-public gnunet-scheme
                       "faketime -m -f '1970-01-01 00:00:00' $(TEXMACS_CONVERT)")))))))
     (inputs (list guile-3.0)) ;for pkg-config
     (propagated-inputs (list guile-bytestructures guile-gcrypt guile-pfds
-                             guile-fibers-1.3))
+                             guile-fibers))
     (native-inputs (list guile-3.0 ;as a compiler
                          ;; for cross-compilation, the guile inputs need to be
                          ;; native-inputs as well.
                          guile-bytestructures
                          guile-gcrypt
                          guile-pfds
-                         guile-fibers-1.3
+                         guile-fibers
                          libfaketime
                          automake
                          autoconf
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index b40079c383..83634c8e8c 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -799,7 +799,7 @@ (define-public guile2.2-dsv
                          (replace "guile-lib" guile2.2-lib)
                          (replace "guile-smc" guile2.2-smc)))))
 
-(define-public guile-fibers-1.3
+(define-public guile-fibers
   (package
     (name "guile-fibers")
     (version "1.3.1")
@@ -856,9 +856,11 @@ (define-public guile-fibers-1.3
     (properties '((upstream-name . "fibers")))
     (license license:lgpl3+)))
 
+(define-public guile-fibers-1.3 guile-fibers)
+
 (define-public guile-fibers-1.1
   (package
-    (inherit guile-fibers-1.3)
+    (inherit guile-fibers)
     (version "1.1.1")
     (source (origin
               (method git-fetch)
@@ -886,7 +888,7 @@ (define-public guile-fibers-1.1
      ;; <https://github.com/wingo/fibers/pull/53>.
      (filter (cut string-suffix? "-linux" <>) %supported-systems))))
 
-(define-public guile-fibers
+(define-public guile-fibers-1.0
   (package
     (inherit guile-fibers-1.1)
     (version "1.0.0")
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index aa24798071..fe4dc2d462 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1541,7 +1541,7 @@ (define-public guix-build-coordinator
              guile-gcrypt
              guix
              guile-prometheus
-             guile-fibers-1.3
+             guile-fibers
              guile-lib
              (first (assoc-ref (package-native-inputs guix) "guile"))))
       (inputs
@@ -1559,7 +1559,7 @@ (define-public guix-build-coordinator
              guile-sqlite3
              guix
              guile-gnutls
-             guile-fibers-1.3))
+             guile-fibers))
       (home-page "https://git.cbaines.net/guix/build-coordinator/")
       (synopsis "Tool to help build derivations")
       (description
@@ -1775,7 +1775,7 @@ (define-public nar-herder
              guile-json-4
              guile-gcrypt
              guix
-             guile-fibers-1.3
+             guile-fibers
              guile-prometheus
              guile-lib
              guile-lzlib
@@ -1788,7 +1788,7 @@ (define-public nar-herder
        (list guile-json-4
              guile-gcrypt
              guix
-             guile-fibers-1.3
+             guile-fibers
              guile-prometheus
              guile-lib
              guile-lzlib
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 1b4eafeab8..159de69977 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -4916,7 +4916,7 @@ (define-public guix-data-service
              bash-minimal))
       (propagated-inputs
        (list guix
-             guile-fibers-1.3
+             guile-fibers
              guile-json-4
              guile-email
              guile-prometheus

base-commit: daeeaa221605726d8853b00261619ba039bd6db7
-- 
2.41.0

[bug#65887] [PATCH] gnu: guile-fibers: Remove version from latest package.

[Liliana Marie Prikler]

Am Dienstag, dem 12.09.2023 um 07:58 +0100 schrieb Christopher Baines:
> As I think this makes more sense, the version is only specified when
> you need a specific previous release.
> 
> * gnu/packages/guile-xyz.scm (guile-fibers): Rename to guile-fibers-
> 1.0.
> (guile-fibers-1.3): Rename to guile-fibers.
> (guile-fibers-1.1): Inherit from guile-fibers.
I think we could follow the scheme we use for GCC or linux-libre where
we use versioned names for everything and then have a version-less name
pointing at a specific "stable" version.  WDYT?

bug#65887: [PATCH] gnu: guile-fibers: Remove version from latest package.

[Christopher Baines]

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


Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Am Dienstag, dem 12.09.2023 um 07:58 +0100 schrieb Christopher Baines:
>> As I think this makes more sense, the version is only specified when
>> you need a specific previous release.
>>
>> * gnu/packages/guile-xyz.scm (guile-fibers): Rename to guile-fibers-
>> 1.0.
>> (guile-fibers-1.3): Rename to guile-fibers.
>> (guile-fibers-1.1): Inherit from guile-fibers.
>
> I think we could follow the scheme we use for GCC or linux-libre where
> we use versioned names for everything and then have a version-less name
> pointing at a specific "stable" version.  WDYT?

I think that works when you have a procedure for creating the packages,
but I'm not sure that's necessary for fibers yet. Hopefully we can get
to the point where everything is just using the latest version. These
changes do move in that direction though.

I've gone ahead and pushed this now as
ce22a756d066f3e329b183893d48ac3a5b627a6a.

Thanks,

Chris

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