aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/gnuzilla.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
-rw-r--r--gnu/packages/gnuzilla.scm29
1 files changed, 4 insertions, 25 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index f54210b412..aee9a16576 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -351,27 +351,6 @@ in C/C++.")
(list icu4c readline zlib))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Temporary packaging of rust-1.59, pending inclusion in (gnu packages rust)
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(define rust-1.58-promise
- (delay
- (let ((rust-bootstrapped-package
- (@@ (gnu packages rust)
- rust-bootstrapped-package)))
- (rust-bootstrapped-package
- rust "1.58.1" "1iq7kj16qfpkx8gvw50d8rf7glbm6s0pj2y1qkrz7mi56vfsyfd8"))))
-
-(define rust-1.59-promise
- (delay
- (let ((rust-bootstrapped-package
- (@@ (gnu packages rust)
- rust-bootstrapped-package)))
- (rust-bootstrapped-package
- (force rust-1.58-promise)
- "1.59.0" "1yc5bwcbmbwyvpfq7zvra78l0r8y3lbv60kbr62fzz2vx2pfxj57"))))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Temporary packaging of rust-cbindgen-0.23 and its dependencies
;; follow, pending their inclusion into (gnu packages rust-apps)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -887,8 +866,8 @@ in C/C++.")
;; ("icecat-use-system-media-libs.patch"
;; ,(search-patch "icecat-use-system-media-libs.patch"))
;; TODO: Change the following lines to use 'rust' when it's >= 1.59.
- (force rust-1.59-promise)
- `(,(force rust-1.59-promise) "cargo")
+ rust
+ `(,rust "cargo")
(force rust-cbindgen-0.23-promise)
llvm
clang
@@ -1565,7 +1544,7 @@ standards of the IceCat project.")
(sha256
(base32
"078jrxpzqj45l84i39a9fq023j71ngca5gs2ngpjsbily51bzx09")))))
- ("cargo" ,(force rust-1.59-promise) "cargo")
+ ("cargo" ,rust "cargo")
("clang" ,clang)
("llvm" ,llvm)
("m4" ,m4)
@@ -1574,7 +1553,7 @@ standards of the IceCat project.")
("perl" ,perl)
("pkg-config" ,pkg-config)
("python" ,python-wrapper)
- ("rust" ,(force rust-1.59-promise))
+ ("rust" ,rust)
("rust-cbindgen" ,(force rust-cbindgen-0.23-promise))
("which" ,which)
("yasm" ,yasm)))