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.
This commit is contained in:
		
							parent
							
								
									94f3831e5b
								
							
						
					
					
						commit
						ce22a756d0
					
				
					 6 changed files with 14 additions and 12 deletions
				
			
		| 
						 | 
					@ -389,7 +389,7 @@ interface and is based on GNU Guile.")
 | 
				
			||||||
                       ;; single-board computers.
 | 
					                       ;; single-board computers.
 | 
				
			||||||
                       (if (target-arm?)
 | 
					                       (if (target-arm?)
 | 
				
			||||||
                           guile-fibers-1.1
 | 
					                           guile-fibers-1.1
 | 
				
			||||||
                           guile-fibers-1.3))))
 | 
					                           guile-fibers))))
 | 
				
			||||||
    (inputs (modify-inputs (package-inputs shepherd-0.9)
 | 
					    (inputs (modify-inputs (package-inputs shepherd-0.9)
 | 
				
			||||||
              (replace "guile-fibers"
 | 
					              (replace "guile-fibers"
 | 
				
			||||||
                (this-package-native-input "guile-fibers"))))))
 | 
					                (this-package-native-input "guile-fibers"))))))
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -142,7 +142,7 @@
 | 
				
			||||||
      (inputs
 | 
					      (inputs
 | 
				
			||||||
       (list guile-3.0-latest
 | 
					       (list guile-3.0-latest
 | 
				
			||||||
             guile-avahi
 | 
					             guile-avahi
 | 
				
			||||||
             guile-fibers-1.3
 | 
					             guile-fibers
 | 
				
			||||||
             guile-gcrypt
 | 
					             guile-gcrypt
 | 
				
			||||||
             guile-json-4
 | 
					             guile-json-4
 | 
				
			||||||
             guile-simple-zmq
 | 
					             guile-simple-zmq
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -409,14 +409,14 @@ services.")
 | 
				
			||||||
                      "faketime -m -f '1970-01-01 00:00:00' $(TEXMACS_CONVERT)")))))))
 | 
					                      "faketime -m -f '1970-01-01 00:00:00' $(TEXMACS_CONVERT)")))))))
 | 
				
			||||||
    (inputs (list guile-3.0)) ;for pkg-config
 | 
					    (inputs (list guile-3.0)) ;for pkg-config
 | 
				
			||||||
    (propagated-inputs (list guile-bytestructures guile-gcrypt guile-pfds
 | 
					    (propagated-inputs (list guile-bytestructures guile-gcrypt guile-pfds
 | 
				
			||||||
                             guile-fibers-1.3))
 | 
					                             guile-fibers))
 | 
				
			||||||
    (native-inputs (list guile-3.0 ;as a compiler
 | 
					    (native-inputs (list guile-3.0 ;as a compiler
 | 
				
			||||||
                         ;; for cross-compilation, the guile inputs need to be
 | 
					                         ;; for cross-compilation, the guile inputs need to be
 | 
				
			||||||
                         ;; native-inputs as well.
 | 
					                         ;; native-inputs as well.
 | 
				
			||||||
                         guile-bytestructures
 | 
					                         guile-bytestructures
 | 
				
			||||||
                         guile-gcrypt
 | 
					                         guile-gcrypt
 | 
				
			||||||
                         guile-pfds
 | 
					                         guile-pfds
 | 
				
			||||||
                         guile-fibers-1.3
 | 
					                         guile-fibers
 | 
				
			||||||
                         libfaketime
 | 
					                         libfaketime
 | 
				
			||||||
                         automake
 | 
					                         automake
 | 
				
			||||||
                         autoconf
 | 
					                         autoconf
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -799,7 +799,7 @@ tables.")
 | 
				
			||||||
                         (replace "guile-lib" guile2.2-lib)
 | 
					                         (replace "guile-lib" guile2.2-lib)
 | 
				
			||||||
                         (replace "guile-smc" guile2.2-smc)))))
 | 
					                         (replace "guile-smc" guile2.2-smc)))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public guile-fibers-1.3
 | 
					(define-public guile-fibers
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "guile-fibers")
 | 
					    (name "guile-fibers")
 | 
				
			||||||
    (version "1.3.1")
 | 
					    (version "1.3.1")
 | 
				
			||||||
| 
						 | 
					@ -856,9 +856,11 @@ is not available for Guile 2.0.")
 | 
				
			||||||
    (properties '((upstream-name . "fibers")))
 | 
					    (properties '((upstream-name . "fibers")))
 | 
				
			||||||
    (license license:lgpl3+)))
 | 
					    (license license:lgpl3+)))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					(define-public guile-fibers-1.3 guile-fibers)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public guile-fibers-1.1
 | 
					(define-public guile-fibers-1.1
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (inherit guile-fibers-1.3)
 | 
					    (inherit guile-fibers)
 | 
				
			||||||
    (version "1.1.1")
 | 
					    (version "1.1.1")
 | 
				
			||||||
    (source (origin
 | 
					    (source (origin
 | 
				
			||||||
              (method git-fetch)
 | 
					              (method git-fetch)
 | 
				
			||||||
| 
						 | 
					@ -886,7 +888,7 @@ is not available for Guile 2.0.")
 | 
				
			||||||
     ;; <https://github.com/wingo/fibers/pull/53>.
 | 
					     ;; <https://github.com/wingo/fibers/pull/53>.
 | 
				
			||||||
     (filter (cut string-suffix? "-linux" <>) %supported-systems))))
 | 
					     (filter (cut string-suffix? "-linux" <>) %supported-systems))))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
(define-public guile-fibers
 | 
					(define-public guile-fibers-1.0
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (inherit guile-fibers-1.1)
 | 
					    (inherit guile-fibers-1.1)
 | 
				
			||||||
    (version "1.0.0")
 | 
					    (version "1.0.0")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1592,7 +1592,7 @@ environments.")
 | 
				
			||||||
             guile-gcrypt
 | 
					             guile-gcrypt
 | 
				
			||||||
             guix
 | 
					             guix
 | 
				
			||||||
             guile-prometheus
 | 
					             guile-prometheus
 | 
				
			||||||
             guile-fibers-1.3
 | 
					             guile-fibers
 | 
				
			||||||
             guile-lib
 | 
					             guile-lib
 | 
				
			||||||
             (first (assoc-ref (package-native-inputs guix) "guile"))))
 | 
					             (first (assoc-ref (package-native-inputs guix) "guile"))))
 | 
				
			||||||
      (inputs
 | 
					      (inputs
 | 
				
			||||||
| 
						 | 
					@ -1610,7 +1610,7 @@ environments.")
 | 
				
			||||||
             guile-sqlite3
 | 
					             guile-sqlite3
 | 
				
			||||||
             guix
 | 
					             guix
 | 
				
			||||||
             guile-gnutls
 | 
					             guile-gnutls
 | 
				
			||||||
             guile-fibers-1.3))
 | 
					             guile-fibers))
 | 
				
			||||||
      (home-page "https://git.cbaines.net/guix/build-coordinator/")
 | 
					      (home-page "https://git.cbaines.net/guix/build-coordinator/")
 | 
				
			||||||
      (synopsis "Tool to help build derivations")
 | 
					      (synopsis "Tool to help build derivations")
 | 
				
			||||||
      (description
 | 
					      (description
 | 
				
			||||||
| 
						 | 
					@ -1826,7 +1826,7 @@ in an isolated environment, in separate namespaces.")
 | 
				
			||||||
             guile-json-4
 | 
					             guile-json-4
 | 
				
			||||||
             guile-gcrypt
 | 
					             guile-gcrypt
 | 
				
			||||||
             guix
 | 
					             guix
 | 
				
			||||||
             guile-fibers-1.3
 | 
					             guile-fibers
 | 
				
			||||||
             guile-prometheus
 | 
					             guile-prometheus
 | 
				
			||||||
             guile-lib
 | 
					             guile-lib
 | 
				
			||||||
             guile-lzlib
 | 
					             guile-lzlib
 | 
				
			||||||
| 
						 | 
					@ -1839,7 +1839,7 @@ in an isolated environment, in separate namespaces.")
 | 
				
			||||||
       (list guile-json-4
 | 
					       (list guile-json-4
 | 
				
			||||||
             guile-gcrypt
 | 
					             guile-gcrypt
 | 
				
			||||||
             guix
 | 
					             guix
 | 
				
			||||||
             guile-fibers-1.3
 | 
					             guile-fibers
 | 
				
			||||||
             guile-prometheus
 | 
					             guile-prometheus
 | 
				
			||||||
             guile-lib
 | 
					             guile-lib
 | 
				
			||||||
             guile-lzlib
 | 
					             guile-lzlib
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5010,7 +5010,7 @@ Cloud.")
 | 
				
			||||||
             bash-minimal))
 | 
					             bash-minimal))
 | 
				
			||||||
      (propagated-inputs
 | 
					      (propagated-inputs
 | 
				
			||||||
       (list guix
 | 
					       (list guix
 | 
				
			||||||
             guile-fibers-1.3
 | 
					             guile-fibers
 | 
				
			||||||
             guile-json-4
 | 
					             guile-json-4
 | 
				
			||||||
             guile-email
 | 
					             guile-email
 | 
				
			||||||
             guile-prometheus
 | 
					             guile-prometheus
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Reference in a new issue