Rename package name to rust-toolchain

declantsien · Jun 30, 2024 · 34e702c · 34e702c
1 parent 190a3e4
commit 34e702c
Show file tree

Hide file tree

Showing 2 changed files with 184 additions and 48 deletions.
diff --git a/guix/rustup/build/toolchain.scm b/guix/rustup/build/toolchain.scm
@@ -304,13 +304,13 @@
                          #:components components
                          #:targets targets
                          #:profile profile)))))
-    (make-rust-bin (apply toolchain->new args))))
+    (make-rust-toolchain (apply toolchain->new args))))
 
-(define* (make-rust-bin aggregated)
+(define* (make-rust-toolchain aggregated)
   (let ((version (car aggregated))
 	(sources (cdr aggregated)))
     (package
-      (name "rust-bin")
+      (name "rust-toolchain")
       (version version)
       (source #f)
       (build-system binary-build-system)

diff --git a/guix/rustup/packages/rust.scm b/guix/rustup/packages/rust.scm
@@ -1,4 +1,5 @@
 (define-module (rustup packages rust)
+  #:use-module (guix packages)
   #:use-module (rustup build toolchain))
 
 ;; (define-public rust-bin-1.1.0
@@ -199,136 +200,271 @@
 ;; (define-public rust-bin-1.47.0
 ;;   (rustup "1.47.0"))
 
-(define-public rust-bin-1.48.0
+(define-public rust-toolchain-1.48.0
   (rustup "1.48.0"))
 
-(define-public rust-bin-1.49.0
+(define-public rust-bin-1.48.0
+  (deprecated-package "rust-bin" rust-toolchain-1.48.0))
+
+(define-public rust-toolchain-1.49.0
   (rustup "1.49.0"))
 
-(define-public rust-bin-1.50.0
+(define-public rust-bin-1.49.0
+  (deprecated-package "rust-bin" rust-toolchain-1.49.0))
+
+(define-public rust-toolchain-1.50.0
   (rustup "1.50.0"))
 
-(define-public rust-bin-1.51.0
+(define-public rust-bin-1.50.0
+  (deprecated-package "rust-bin" rust-toolchain-1.50.0))
+
+(define-public rust-toolchain-1.51.0
   (rustup "1.51.0"))
 
-(define-public rust-bin-1.52.0
+(define-public rust-bin-1.51.0
+  (deprecated-package "rust-bin" rust-toolchain-1.51.0))
+
+(define-public rust-toolchain-1.52.0
   (rustup "1.52.0"))
 
-(define-public rust-bin-1.52.1
+(define-public rust-bin-1.52.0
+  (deprecated-package "rust-bin" rust-toolchain-1.52.0))
+
+(define-public rust-toolchain-1.52.1
   (rustup "1.52.1"))
 
-(define-public rust-bin-1.53.0
+(define-public rust-bin-1.52.1
+  (deprecated-package "rust-bin" rust-toolchain-1.52.1))
+
+(define-public rust-toolchain-1.53.0
   (rustup "1.53.0"))
 
-(define-public rust-bin-1.54.0
+(define-public rust-bin-1.53.0
+  (deprecated-package "rust-bin" rust-toolchain-1.53.0))
+
+(define-public rust-toolchain-1.54.0
   (rustup "1.54.0"))
 
-(define-public rust-bin-1.55.0
+(define-public rust-bin-1.54.0
+  (deprecated-package "rust-bin" rust-toolchain-1.54.0))
+
+(define-public rust-toolchain-1.55.0
   (rustup "1.55.0"))
 
-(define-public rust-bin-1.56.0
+(define-public rust-bin-1.55.0
+  (deprecated-package "rust-bin" rust-toolchain-1.55.0))
+
+(define-public rust-toolchain-1.56.0
   (rustup "1.56.0"))
 
-(define-public rust-bin-1.56.1
+(define-public rust-bin-1.56.0
+  (deprecated-package "rust-bin" rust-toolchain-1.56.0))
+
+(define-public rust-toolchain-1.56.1
   (rustup "1.56.1"))
 
-(define-public rust-bin-1.57.0
+(define-public rust-bin-1.56.1
+  (deprecated-package "rust-bin" rust-toolchain-1.56.1))
+
+(define-public rust-toolchain-1.57.0
   (rustup "1.57.0"))
 
-(define-public rust-bin-1.58.0
+(define-public rust-bin-1.57.0
+  (deprecated-package "rust-bin" rust-toolchain-1.57.0))
+
+(define-public rust-toolchain-1.58.0
   (rustup "1.58.0"))
 
-(define-public rust-bin-1.58.1
+(define-public rust-bin-1.58.0
+  (deprecated-package "rust-bin" rust-toolchain-1.58.0))
+
+(define-public rust-toolchain-1.58.1
   (rustup "1.58.1"))
 
-(define-public rust-bin-1.59.0
+(define-public rust-bin-1.58.1
+  (deprecated-package "rust-bin" rust-toolchain-1.58.1))
+
+(define-public rust-toolchain-1.59.0
   (rustup "1.59.0"))
 
-(define-public rust-bin-1.60.0
+(define-public rust-bin-1.59.0
+  (deprecated-package "rust-bin" rust-toolchain-1.59.0))
+
+(define-public rust-toolchain-1.60.0
   (rustup "1.60.0"))
 
-(define-public rust-bin-1.61.0
+(define-public rust-bin-1.60.0
+  (deprecated-package "rust-bin" rust-toolchain-1.60.0))
+
+(define-public rust-toolchain-1.61.0
   (rustup "1.61.0"))
 
-(define-public rust-bin-1.62.0
+(define-public rust-bin-1.61.0
+  (deprecated-package "rust-bin" rust-toolchain-1.61.0))
+
+(define-public rust-toolchain-1.62.0
   (rustup "1.62.0"))
 
-(define-public rust-bin-1.62.1
+(define-public rust-bin-1.62.0
+  (deprecated-package "rust-bin" rust-toolchain-1.62.0))
+
+(define-public rust-toolchain-1.62.1
   (rustup "1.62.1"))
 
-(define-public rust-bin-1.63.0
+(define-public rust-bin-1.62.1
+  (deprecated-package "rust-bin" rust-toolchain-1.62.1))
+
+(define-public rust-toolchain-1.63.0
   (rustup "1.63.0"))
 
-(define-public rust-bin-1.64.0
+(define-public rust-bin-1.63.0
+  (deprecated-package "rust-bin" rust-toolchain-1.63.0))
+
+(define-public rust-toolchain-1.64.0
   (rustup "1.64.0"))
 
-(define-public rust-bin-1.65.0
+(define-public rust-bin-1.64.0
+  (deprecated-package "rust-bin" rust-toolchain-1.64.0))
+
+(define-public rust-toolchain-1.65.0
   (rustup "1.65.0"))
 
-(define-public rust-bin-1.66.0
+(define-public rust-bin-1.65.0
+  (deprecated-package "rust-bin" rust-toolchain-1.65.0))
+
+(define-public rust-toolchain-1.66.0
   (rustup "1.66.0"))
 
-(define-public rust-bin-1.66.1
+(define-public rust-bin-1.66.0
+  (deprecated-package "rust-bin" rust-toolchain-1.66.0))
+
+(define-public rust-toolchain-1.66.1
   (rustup "1.66.1"))
 
-(define-public rust-bin-1.67.0
+(define-public rust-bin-1.66.1
+  (deprecated-package "rust-bin" rust-toolchain-1.66.1))
+
+(define-public rust-toolchain-1.67.0
   (rustup "1.67.0"))
 
-(define-public rust-bin-1.67.1
+(define-public rust-bin-1.67.0
+  (deprecated-package "rust-bin" rust-toolchain-1.67.0))
+
+(define-public rust-toolchain-1.67.1
   (rustup "1.67.1"))
 
-(define-public rust-bin-1.68.0
+(define-public rust-bin-1.67.1
+  (deprecated-package "rust-bin" rust-toolchain-1.67.1))
+
+(define-public rust-toolchain-1.68.0
   (rustup "1.68.0"))
 
-(define-public rust-bin-1.68.1
+(define-public rust-bin-1.68.0
+  (deprecated-package "rust-bin" rust-toolchain-1.68.0))
+
+(define-public rust-toolchain-1.68.1
   (rustup "1.68.1"))
 
-(define-public rust-bin-1.68.2
+(define-public rust-bin-1.68.1
+  (deprecated-package "rust-bin" rust-toolchain-1.68.1))
+
+(define-public rust-toolchain-1.68.2
   (rustup "1.68.2"))
 
-(define-public rust-bin-1.69.0
+(define-public rust-bin-1.68.2
+  (deprecated-package "rust-bin" rust-toolchain-1.68.2))
+
+(define-public rust-toolchain-1.69.0
   (rustup "1.69.0"))
 
-(define-public rust-bin-1.70.0
+(define-public rust-bin-1.69.0
+  (deprecated-package "rust-bin" rust-toolchain-1.69.0))
+
+(define-public rust-toolchain-1.70.0
   (rustup "1.70.0"))
 
-(define-public rust-bin-1.71.0
+(define-public rust-bin-1.70.0
+  (deprecated-package "rust-bin" rust-toolchain-1.70.0))
+
+(define-public rust-toolchain-1.71.0
   (rustup "1.71.0"))
 
-(define-public rust-bin-1.71.1
+(define-public rust-bin-1.71.0
+  (deprecated-package "rust-bin" rust-toolchain-1.71.0))
+
+(define-public rust-toolchain-1.71.1
   (rustup "1.71.1"))
 
-(define-public rust-bin-1.72.0
+(define-public rust-bin-1.71.1
+  (deprecated-package "rust-bin" rust-toolchain-1.71.1))
+
+(define-public rust-toolchain-1.72.0
   (rustup "1.72.0"))
 
-(define-public rust-bin-1.72.1
+(define-public rust-bin-1.72.0
+  (deprecated-package "rust-bin" rust-toolchain-1.72.0))
+
+(define-public rust-toolchain-1.72.1
   (rustup "1.72.1"))
 
-(define-public rust-bin-1.73.0
+(define-public rust-bin-1.72.1
+  (deprecated-package "rust-bin" rust-toolchain-1.72.1))
+
+(define-public rust-toolchain-1.73.0
   (rustup "1.73.0"))
 
-(define-public rust-bin-1.74.0
+(define-public rust-bin-1.73.0
+  (deprecated-package "rust-bin" rust-toolchain-1.73.0))
+
+(define-public rust-toolchain-1.74.0
   (rustup "1.74.0"))
 
-(define-public rust-bin-1.74.1
+(define-public rust-bin-1.74.0
+  (deprecated-package "rust-bin" rust-toolchain-1.74.0))
+
+(define-public rust-toolchain-1.74.1
   (rustup "1.74.1"))
 
-(define-public rust-bin-1.75.0
+(define-public rust-bin-1.74.1
+  (deprecated-package "rust-bin" rust-toolchain-1.74.1))
+
+(define-public rust-toolchain-1.75.0
   (rustup "1.75.0"))
 
-(define-public rust-bin-1.76.0
+(define-public rust-bin-1.75.0
+  (deprecated-package "rust-bin" rust-toolchain-1.75.0))
+
+(define-public rust-toolchain-1.76.0
   (rustup "1.76.0"))
 
-(define-public rust-bin-1.77.0
+(define-public rust-bin-1.76.0
+  (deprecated-package "rust-bin" rust-toolchain-1.76.0))
+
+(define-public rust-toolchain-1.77.0
   (rustup "1.77.0"))
 
-(define-public rust-bin-1.77.1
+(define-public rust-bin-1.77.0
+  (deprecated-package "rust-bin" rust-toolchain-1.77.0))
+
+(define-public rust-toolchain-1.77.1
   (rustup "1.77.1"))
 
-(define-public rust-bin-1.77.2
+(define-public rust-bin-1.77.1
+  (deprecated-package "rust-bin" rust-toolchain-1.77.1))
+
+(define-public rust-toolchain-1.77.2
   (rustup "1.77.2"))
 
-(define-public rust-bin-1.78.0
+(define-public rust-bin-1.77.2
+  (deprecated-package "rust-bin" rust-toolchain-1.77.2))
+
+(define-public rust-toolchain-1.78.0
   (rustup "1.78.0"))
 
-(define-public rust-bin rust-bin-1.78.0)
+(define-public rust-bin-1.78.0
+  (deprecated-package "rust-bin" rust-toolchain-1.78.0))
+
+(define-public rust-toolchain rust-toolchain-1.78.0)
+
+(define-public rust-bin
+  (deprecated-package "rust-bin" rust-toolchain))