diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-09-02 23:05:14 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-11-11 12:18:10 -0500 |
commit | 9635119a61a9ab1b023558727fcdf1816fdc7fc6 (patch) | |
tree | 84f60d8a3bee53bd6725b3510e258fe35086874f /gnu | |
parent | bc4149818dbdc5490ec99e154fa1798ea39577f1 (diff) | |
download | guix-9635119a61a9ab1b023558727fcdf1816fdc7fc6.tar.gz |
gnu: Build all Rust packages using the latest rustc.
The older Rusts are made private variables; they shouldn't be used by users as they are not tested and are only built at stage 1, which makes them unsuitable to compile Rust applications. * gnu/packages/crates-io.scm (rust-cargo-0.53)[arguments]: Remove #:rust argument. (rust-cxx-1, rust-cxx-build-1, rust-cxx-gen-0.7): Likewise. * gnu/packages/crates-io.scm (rust-cxx-gen-0.7, rust-cxxbridge-macro-1, rust-postgres-0.19): Likewise. (rust-rust-decimal-1, rust-sized-chunks-0.6, rust-socket2-0.4): Likewise. (rust-tokio-postgres-0.7, rust-im-rc-15): Likewise. * gnu/packages/gnome.scm (librsvg): Likewise. * gnu/packages/gnuzilla.scm (mozjs-78): Likewise. * gnu/packages/rust-apps.scm (hyperfine, tectonic rust-analyzer, rust-cargo-c): Likewise. * gnu/packages/shells.scm (nushell): Likewise. * gnu/packages/syndication.scm (newsboat): Likewise. * gnu/packages/rust.scm: (rust-1.39, rust-1.40, rust-1.41, rust-1.42) (rust-1.43, rust-1.44, rust-1.45, rust-1.46, rust-1.47, rust-1.48, rust-1.49) (rust-1.50, rust-1.51, rust-1.52, rust-1.53, rust-1.54): Make variables private.
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/packages/crates-io.scm | 7 | ||||
-rw-r--r-- | gnu/packages/gnuzilla.scm | 4 | ||||
-rw-r--r-- | gnu/packages/rust-apps.scm | 9 | ||||
-rw-r--r-- | gnu/packages/rust.scm | 30 | ||||
-rw-r--r-- | gnu/packages/shells.scm | 3 |
5 files changed, 23 insertions, 30 deletions
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c96bc65e14..3615352f5d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7724,7 +7724,6 @@ capabilities.") `(;; The test suite is disabled as the internal 'cargo-test-macro' and ;; 'cargo-test-support' crates are not included in the release. #:tests? #f - #:rust ,rust-1.52 ;transitively inherited from rust-sized-chunks #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-atty" ,rust-atty-0.2) @@ -47325,8 +47324,7 @@ variants in pure Rust.") "07ix5fsdnpf2xsb0k5rbiwlmsicm2237fcx7blirp9p7pljr5mhn")))) (build-system cargo-build-system) (arguments - `(#:rust ,rust-1.52 ;requires the "if in const fn" feature - #:cargo-inputs + `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) ("rust-array-ops" ,rust-array-ops-0.1) ("rust-bitmaps" ,rust-bitmaps-2) @@ -60924,8 +60922,7 @@ file into an in-memory tree structure.") "0gsgcs1nn38r40973l6zr1v4d85f4s9qyl32n5f20jphf5z9ba1w")))) (build-system cargo-build-system) (arguments - `(#:rust ,rust-1.52 ;for rust-sized-chunks - #:cargo-inputs + `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-0.4) ("rust-bitmaps" ,rust-bitmaps-2) ("rust-proptest" ,rust-proptest-0.9) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 88ba14b01f..b96f59409e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -574,8 +574,8 @@ in C/C++.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-3) - ("rust" ,rust-1.41) - ("cargo" ,rust-1.41 "cargo"))) + ("rust" ,rust) + ("cargo" ,rust "cargo"))) (inputs `(("icu4c" ,icu4c) ("readline" ,readline) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 6d95b496c3..568b67a1b2 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -790,8 +790,7 @@ of the project is to be runnable on untrusted networks without crashing.") (base32 "0hzyqpjxya6g1ifb3hvjvj0zl2aigx898pz7h5pl46z50jp2pdc8")))) (build-system cargo-build-system) (arguments - `(#:rust ,rust-1.52 - #:cargo-build-flags '("--release" "--features" "external-harfbuzz") + `(#:cargo-build-flags '("--release" "--features" "external-harfbuzz") #:cargo-inputs (("rust-atty" ,rust-atty-0.2) ("rust-byte-unit" ,rust-byte-unit-4) @@ -969,8 +968,7 @@ runs a command whenever it detects modifications.") "06bc3s5kjwpyr2cq79p0306a9bqp3xp928d750ybby9npq2dvj3z")))) (build-system cargo-build-system) (arguments - `(#:rust ,rust-1.52 - #:install-source? #f ; virtual manifest + `(#:install-source? #f ; virtual manifest #:cargo-test-flags '("--release" "--" "--skip=tests::test_version_check" ;; It need rustc's version @@ -1097,8 +1095,7 @@ support for Rust.") "0fwdxhdj2963xr6xfqr56i7hikhsdv562vgxq2dj3h2mi3dil1k6")))) (build-system cargo-build-system) (arguments - `(#:rust ,rust-1.52 ;inherited from rust-cargo - #:cargo-inputs + `(#:cargo-inputs (("rust-cbindgen" ,rust-cbindgen-0.19) ("rust-cargo" ,rust-cargo-0.53) ; ("rust-anyhow" ,rust-anyhow-1) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 0cff15b98e..f7f05851f1 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -321,7 +321,7 @@ safety and thread safety guarantees.") ;; Dual licensed. (license (list license:asl2.0 license:expat)))) -(define-public rust-1.40 +(define rust-1.40 (package (name "rust") (version "1.40.0") @@ -512,7 +512,7 @@ safety and thread safety guarantees.") ;; Dual licensed. (license (list license:asl2.0 license:expat)))) -(define-public rust-1.41 +(define rust-1.41 (let ((base-rust (rust-bootstrapped-package rust-1.40 "1.41.1" "0ws5x0fxv57fyllsa6025h3q6j9v3m8nb3syl4x0hgkddq0kvj9q"))) @@ -532,21 +532,21 @@ safety and thread safety guarantees.") (string-append name "\"" ,%cargo-reference-hash "\""))) (generate-all-checksums "vendor")))))))))) -(define-public rust-1.42 +(define rust-1.42 (rust-bootstrapped-package rust-1.41 "1.42.0" "0x9lxs82may6c0iln0b908cxyn1cv7h03n5cmbx3j1bas4qzks6j")) -(define-public rust-1.43 +(define rust-1.43 (rust-bootstrapped-package rust-1.42 "1.43.0" "18akhk0wz1my6y9vhardriy2ysc482z0fnjdcgs9gy59kmnarxkm")) ;; This version requires llvm <= 11. -(define-public rust-1.44 +(define rust-1.44 (rust-bootstrapped-package rust-1.43 "1.44.1" "0ww4z2v3gxgn3zddqzwqya1gln04p91ykbrflnpdbmcd575n8bky")) -(define-public rust-1.45 +(define rust-1.45 (let ((base-rust (rust-bootstrapped-package rust-1.44 "1.45.2" "0273a1g3f59plyi1n0azf21qjzwml1yqdnj5z472crz37qggr8xp"))) @@ -562,11 +562,11 @@ safety and thread safety guarantees.") (("linker.env\\(\"LC_ALL\", \"C\"\\);") "linker.env(\"LC_ALL\", \"en_US.UTF-8\");"))))))))))) -(define-public rust-1.46 +(define rust-1.46 (rust-bootstrapped-package rust-1.45 "1.46.0" "0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid")) -(define-public rust-1.47 +(define rust-1.47 (let ((base-rust (rust-bootstrapped-package rust-1.46 "1.47.0" "07fqd2vp7cf1ka3hr207dnnz93ymxml4935vp74g4is79h3dz19i"))) @@ -586,25 +586,25 @@ safety and thread safety guarantees.") "library/std" "src/tools/cargo"))))))))))) -(define-public rust-1.48 +(define rust-1.48 (rust-bootstrapped-package rust-1.47 "1.48.0" "0fz4gbb5hp5qalrl9lcl8yw4kk7ai7wx511jb28nypbxninkwxhf")) -(define-public rust-1.49 +(define rust-1.49 (rust-bootstrapped-package rust-1.48 "1.49.0" "0yf7kll517398dgqsr7m3gldzj0iwsp3ggzxrayckpqzvylfy2mm")) -(define-public rust-1.50 +(define rust-1.50 (rust-bootstrapped-package rust-1.49 "1.50.0" "0pjs7j62maiyvkmhp9zrxl528g2n0fphp4rq6ap7aqdv0a6qz5wm")) -(define-public rust-1.51 +(define rust-1.51 (rust-bootstrapped-package rust-1.50 "1.51.0" "0ixqkqglv3isxbvl4ldr4byrkx692wghsz3fasy1pn5kr2prnsvs")) ;;; The LLVM requiriment has been bumped to version 10 in Rust 1.52. Use the ;;; latest available. -(define-public rust-1.52 +(define rust-1.52 (let ((base-rust (rust-bootstrapped-package rust-1.51 "1.52.1" "165zs3xzp9dravybwslqs1qhn35agp6wacmzpymqg3qfdni26vrs"))) @@ -613,11 +613,11 @@ safety and thread safety guarantees.") (inputs (alist-replace "llvm" (list llvm-12) (package-inputs base-rust)))))) -(define-public rust-1.53 +(define rust-1.53 (rust-bootstrapped-package rust-1.52 "1.53.0" "1f95p259dfp5ca118bg107rj3rqwlswy65dxn3hg8sqgl4wwmxsw")) -(define-public rust-1.54 +(define rust-1.54 (let ((base-rust (rust-bootstrapped-package rust-1.53 "1.54.0" diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 7b3f463945..729269e5e5 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -969,8 +969,7 @@ files and text.") (base32 "1db521jrs0yxwmvkkl8wssa8qyi0m62n69l7xxl2gpyz1v8nvw76")))) (build-system cargo-build-system) (arguments - `(#:rust ,rust-1.52 - #:tests? #false ;missing files + `(#:tests? #false ;missing files #:features '("extra") #:cargo-inputs (("rust-ctrlc" ,rust-ctrlc-3) |