summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2023-09-12 07:58:16 +0100
committerChristopher Baines <mail@cbaines.net>2023-09-25 11:30:01 +0100
commitce22a756d066f3e329b183893d48ac3a5b627a6a (patch)
treecf3b6cd1986b5f2eb2030b3e929701bdc39c3b11
parent94f3831e5bb1e04eeb3a0e7d31a0675208ce6f4c (diff)
gnu: guile-fibers: Remove version from latest package.
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.
-rw-r--r--gnu/packages/admin.scm2
-rw-r--r--gnu/packages/ci.scm2
-rw-r--r--gnu/packages/gnunet.scm4
-rw-r--r--gnu/packages/guile-xyz.scm8
-rw-r--r--gnu/packages/package-management.scm8
-rw-r--r--gnu/packages/web.scm2
6 files changed, 14 insertions, 12 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 4ddd03fecf..ae5c6943cc 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -389,7 +389,7 @@ interface and is based on GNU Guile.")
;; 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 @@
(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 @@ services.")
"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 01dbe9b3ad..3042244a1f 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -799,7 +799,7 @@ tables.")
(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 @@ is not available for Guile 2.0.")
(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 @@ is not available for Guile 2.0.")
;; <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 cbda40f78b..b85c82b1ed 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -1592,7 +1592,7 @@ environments.")
guile-gcrypt
guix
guile-prometheus
- guile-fibers-1.3
+ guile-fibers
guile-lib
(first (assoc-ref (package-native-inputs guix) "guile"))))
(inputs
@@ -1610,7 +1610,7 @@ environments.")
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
@@ -1826,7 +1826,7 @@ in an isolated environment, in separate namespaces.")
guile-json-4
guile-gcrypt
guix
- guile-fibers-1.3
+ guile-fibers
guile-prometheus
guile-lib
guile-lzlib
@@ -1839,7 +1839,7 @@ in an isolated environment, in separate namespaces.")
(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 38982d9c39..4b43e1549f 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -5010,7 +5010,7 @@ Cloud.")
bash-minimal))
(propagated-inputs
(list guix
- guile-fibers-1.3
+ guile-fibers
guile-json-4
guile-email
guile-prometheus