futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: IceCat, Icedove: Use the default 'rust'.

Browse Source 
* gnu/packages/gnuzilla.scm (rust-1.58-promise, rust-1.59-promise): Remove variables.
(icecat, icedove)[native-inputs]: Change from RUST-1.59-PROMISE to RUST.
This commit is contained in:
Marius Bakke 2022-09-29 21:03:45 +02:00
parent f66067febc
commit e0546a11f0
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gnu/packages/gnuzilla.scm
View File

@ -350,27 +350,6 @@ in C/C++.")
(inputs (inputs
(list icu4c readline zlib)))) (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 ;; Temporary packaging of rust-cbindgen-0.23 and its dependencies
;; follow, pending their inclusion into (gnu packages rust-apps) ;; follow, pending their inclusion into (gnu packages rust-apps)
@ -887,8 +866,8 @@ in C/C++.")
;; ("icecat-use-system-media-libs.patch" ;; ("icecat-use-system-media-libs.patch"
;; ,(search-patch "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. ;; TODO: Change the following lines to use 'rust' when it's >= 1.59.
(force rust-1.59-promise) rust
`(,(force rust-1.59-promise) "cargo") `(,rust "cargo")
(force rust-cbindgen-0.23-promise) (force rust-cbindgen-0.23-promise)
llvm llvm
clang clang
@ -1565,7 +1544,7 @@ standards of the IceCat project.")
(sha256 (sha256
(base32 (base32
"078jrxpzqj45l84i39a9fq023j71ngca5gs2ngpjsbily51bzx09"))))) "078jrxpzqj45l84i39a9fq023j71ngca5gs2ngpjsbily51bzx09")))))
("cargo" ,(force rust-1.59-promise) "cargo") ("cargo" ,rust "cargo")
("clang" ,clang) ("clang" ,clang)
("llvm" ,llvm) ("llvm" ,llvm)
("m4" ,m4) ("m4" ,m4)
@ -1574,7 +1553,7 @@ standards of the IceCat project.")
("perl" ,perl) ("perl" ,perl)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("python" ,python-wrapper) ("python" ,python-wrapper)
("rust" ,(force rust-1.59-promise)) ("rust" ,rust)
("rust-cbindgen" ,(force rust-cbindgen-0.23-promise)) ("rust-cbindgen" ,(force rust-cbindgen-0.23-promise))
("which" ,which) ("which" ,which)
("yasm" ,yasm))) ("yasm" ,yasm)))