From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gCTr4-0001vd-Qw for guix-patches@gnu.org; Tue, 16 Oct 2018 14:14:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gCTr0-00063W-OK for guix-patches@gnu.org; Tue, 16 Oct 2018 14:14:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:49658) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gCTr0-00063C-Ir for guix-patches@gnu.org; Tue, 16 Oct 2018 14:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gCTr0-0006Od-Cq for guix-patches@gnu.org; Tue, 16 Oct 2018 14:14:02 -0400 Subject: [bug#33066] [PATCH 2/2] gnu: rust: add rust 1.28 and rust 1.29 packages References: <877eihu5hx.fsf@member.fsf.org> In-Reply-To: <877eihu5hx.fsf@member.fsf.org> Resent-Message-ID: From: Nikolai Merinov Date: Tue, 16 Oct 2018 02:37:41 +0500 Message-ID: <874ldlu5dm.fsf@member.fsf.org> MIME-Version: 1.0 Content-Type: text/plain List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33066@debbugs.gnu.org * gnu/packages/rust.scm (rust-1.27): rename "rust" to "rust-1.27" (rust-1.28): Use llvm-6.0 finally. Disable test that broken on x86_64 machines without "avx". Disable test that required network support. (rust): Package for rust 1.29.1. --- gnu/packages/rust.scm | 44 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index cbfbdccf1..d61b431e8 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -773,7 +773,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (("fn no_index_update") "#[ignore]\nfn no_index_update")) #t))))))))) -(define-public rust +(define-public rust-1.27 (let ((base-rust (rust-bootstrapped-package rust-1.26 "1.27.2" "0pg1s37bhx9zqbynxyydq5j6q7kij9vxkcv8maz0m25prm88r0cs" @@ -795,3 +795,45 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (mkdir-p (assoc-ref outputs "out")) (mkdir-p (assoc-ref outputs "cargo")) #t))))))))) + +(define-public rust-1.28 + (let ((base-rust + (rust-bootstrapped-package rust-1.27 "1.28.0" + "11k4rn77bca2rikykkk9fmprrgjswd4x4kaq7fia08vgkir82nhx" + #:patches + '("rust-coresimd-doctest.patch" + "rust-bootstrap-stage0-test.patch" + "rust-1.25-accept-more-detailed-gdb-lines.patch" + "rust-mdbook-Support-reproducible-builds-by-forcing-window.search.patch")))) + (package + (inherit base-rust) + (inputs + ;; Use LLVM 6.0 + (alist-replace "llvm" (list llvm) + (package-inputs base-rust))) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'configure 'enable-codegen-tests + ;; codegen tests should work fine with llvm 6 + (lambda* _ + (substitute* "config.toml" + (("codegen-tests = false") "")) + #t)) + (add-after 'patch-tests 'disable-amd64-avx-test + ;; This test will fail on x86_64 machines without avx + (lambda* _ + (substitute* "src/test/run-pass/issue-44056.rs" + (("only-x86_64") "ignore-test"))))))))))) + + +(define-public rust + (let ((base-rust + (rust-bootstrapped-package rust-1.28 "1.29.1" + "0jd3c57x3yndizns4pb68nh25si47agfmrdvf9nwwsyfcs5p5c7i" + #:patches + '("rust-1.25-accept-more-detailed-gdb-lines.patch" + "rust-mdbook-Support-reproducible-builds-by-forcing-window.search.patch")))) + (package + (inherit base-rust)))) -- 2.19.0