From unknown Sun Jun 22 17:18:06 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31040] [PATCH] gnu: rust: Add rust 1.25.0 release and enable cargo tests Resent-From: Nikolai Merinov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 03 Apr 2018 11:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 31040 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 31040@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.152275328312376 (code B ref -1); Tue, 03 Apr 2018 11:02:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Apr 2018 11:01:23 +0000 Received: from localhost ([127.0.0.1]:35912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f3Jgj-0003DU-Bc for submit@debbugs.gnu.org; Tue, 03 Apr 2018 07:01:23 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50413) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f3Jgh-0003DE-PX for submit@debbugs.gnu.org; Tue, 03 Apr 2018 07:01:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3JgS-0000V2-SE for submit@debbugs.gnu.org; Tue, 03 Apr 2018 07:01:10 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:42407) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f3JgS-0000Us-Pb for submit@debbugs.gnu.org; Tue, 03 Apr 2018 07:01:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3JgJ-0001is-Sr for guix-patches@gnu.org; Tue, 03 Apr 2018 07:01:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3JgF-0000PR-Uv for guix-patches@gnu.org; Tue, 03 Apr 2018 07:00:51 -0400 Received: from mail-wr0-f172.google.com ([209.85.128.172]:33502) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f3JgF-0000PA-Os for guix-patches@gnu.org; Tue, 03 Apr 2018 07:00:47 -0400 Received: by mail-wr0-f172.google.com with SMTP id z73so18314386wrb.0 for ; Tue, 03 Apr 2018 04:00:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=ZkgXlJs8aAjtZtJ3Yh3R+K0P8S53ZzauVKHAeuNtd60=; b=MtC3MT5kfgmbJzRqqOdiPGWLQd8LOquWPyxstxq1/2fdR3bbpn7vLP8E7NilzJPAuC kjfCaQ68u53J8nOjiTbFcH3MLXc+mMs96i5+bb7OQ+GwoZ1djCkBksa6JUkRCm/jKRqn H8gk3+NJ0gGoEmEJyY+oWT26XCENQzn39WTwsugBc4H5v6Kn3hchY+hEJlyCS81yFD/O ERozyLs0/GpDWUu748cnANa1lQ4lR9q5rEmV8L8m33tT7fIVlGYaVjvk4O6G9oAZkZ8h ETh9fJnmOMu7I0Y47qeZ1+itdw0dt3HNUCZWdxCFfNwJGvuD43OWTdU1xYd9RoBecHIN LXlQ== X-Gm-Message-State: ALQs6tDYSoMMcWFebIl5M/hhBmWM0yh0wm1rWzoe7JWm4YhYld/Cz9AR 48t/9zjlF+TpZggupNkG2w/FKQ== X-Google-Smtp-Source: AIpwx4/1vvCD3EZqIvRkGBnYrKfueIFXD/XKHErENil63zFJXUs9mhZwGE6PvYvVz+JJ7lMTfOLAdA== X-Received: by 2002:a19:a705:: with SMTP id q5-v6mr7761320lfe.2.1522753245945; Tue, 03 Apr 2018 04:00:45 -0700 (PDT) Received: from libremnd (97.9-157-90.telenet.ru. [90.157.9.97]) by smtp.gmail.com with ESMTPSA id p1sm423566lje.56.2018.04.03.04.00.44 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Apr 2018 04:00:45 -0700 (PDT) From: Nikolai Merinov Date: Sat, 31 Mar 2018 00:40:40 +0500 Message-ID: <87a7ukh7vq.fsf@member.fsf.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -3.5 (---) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/rust.scm (rust-1.23): Add "patch-cargo-tests" stage to disable tests that incompatible with guix build environemnt; start tests for "cargo" on "check" stage. (rust-1.24): Rename "rust" to "rust-1.24". (rust): Add "rust" package for "1.25.0" release. Disable new cargo test that required network access --- gnu/packages/rust.scm | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) [...] Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [208.118.235.92 listed in wl.mailspike.net] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (nikolay.d.merinov[at]gmail.com) 1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail) 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders * gnu/packages/rust.scm (rust-1.23): Add "patch-cargo-tests" stage to disable tests that incompatible with guix build environemnt; start tests for "cargo" on "check" stage. (rust-1.24): Rename "rust" to "rust-1.24". (rust): Add "rust" package for "1.25.0" release. Disable new cargo test that required network access --- gnu/packages/rust.scm | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 70140579b..cbca2dc7e 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -179,9 +179,12 @@ in turn be used to build the final Rust.") #:phases (modify-phases %standard-phases (add-after 'unpack 'set-env - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) + ;; Disable test for cross compilation support + (setenv "CFG_DISABLE_CROSS_TESTS" "1") (setenv "SHELL" (which "sh")) (setenv "CONFIG_SHELL" (which "sh")) + (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) ;; guix llvm-3.9.1 package installs only shared libraries (setenv "LLVM_LINK_SHARED" "1") #t)) @@ -204,7 +207,16 @@ in turn be used to build the final Rust.") ;; (delete-file-recursively "src/test/run-make/linker-output-non-utf8") #t))) - (add-after 'patch-tests 'fix-mtime-bug + (add-after 'patch-tests 'patch-cargo-tests + (lambda* _ + (substitute* "src/tools/cargo/tests/build.rs" + (("/usr/bin/env") (which "env")) + ;; Guix llvm compiled without asmjs-unknown-emscripten at all + (("fn wasm32_final_outputs") "#[ignore]\nfn wasm32_final_outputs")) + (substitute* "src/tools/cargo/tests/death.rs" + ;; Stuck when built in container + (("fn ctrl_c_kills_everyone") "#[ignore]\nfn ctrl_c_kills_everyone")))) + (add-after 'patch-cargo-tests 'fix-mtime-bug (lambda* _ (substitute* "src/build_helper/lib.rs" ;; Bug in Rust code. @@ -289,7 +301,8 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (invoke "./x.py" "build" "src/tools/cargo"))) (replace 'check (lambda* _ - (invoke "./x.py" "test"))) + (invoke "./x.py" "test") + (invoke "./x.py" "test" "src/tools/cargo"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (invoke "./x.py" "install") @@ -318,7 +331,7 @@ safety and thread safety guarantees.") ;; Dual licensed. (license (list license:asl2.0 license:expat)))) -(define-public rust +(define-public rust-1.24 (let ((base-rust rust-1.23)) (package (inherit base-rust) @@ -334,3 +347,25 @@ safety and thread safety guarantees.") (substitute-keyword-arguments (package-arguments base-rust) ((#:phases phases) `(modify-phases ,phases (delete 'fix-mtime-bug)))))))) + +(define-public rust + (let ((base-rust rust-1.24)) + (package + (inherit base-rust) + (version "1.25.0") + (source + (rust-source version + "0baxjr99311lvwdq0s38bipbnj72pn6fgbk6lcq7j555xq53mxpf")) + (native-inputs + (alist-replace "cargo-bootstrap" (list base-rust "cargo") + (alist-replace "rustc-bootstrap" (list base-rust) + (package-native-inputs base-rust)))) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'patch-cargo-tests 'patch-cargo-index-update + (lambda* _ + (substitute* "src/tools/cargo/tests/generate-lockfile.rs" + ;; This test want to update crate index + (("fn no_index_update") "#[ignore]\nfn no_index_update"))))))))))) -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 15 04:15:03 2018 Received: (at control) by debbugs.gnu.org; 15 Apr 2018 08:15:03 +0000 Received: from localhost ([127.0.0.1]:53015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f7coQ-0004wg-VV for submit@debbugs.gnu.org; Sun, 15 Apr 2018 04:15:03 -0400 Received: from dd26836.kasserver.com ([85.13.145.193]:52814) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f7coP-0004vz-Am for control@debbugs.gnu.org; Sun, 15 Apr 2018 04:15:01 -0400 Received: from localhost (77.118.179.77.wireless.dyn.drei.com [77.118.179.77]) by dd26836.kasserver.com (Postfix) with ESMTPSA id 01F8F33616B7 for ; Sun, 15 Apr 2018 10:14:59 +0200 (CEST) Date: Sun, 15 Apr 2018 10:14:56 +0200 From: Danny Milosavljevic To: Message-ID: <20180415101456.19a162b2@scratchpost.org> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/32Ffwz6vtjioWwEb.NTa4UA"; protocol="application/pgp-signature" X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: close 31024 close 31040 [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [85.13.145.193 listed in list.dnswl.org] 1.8 MISSING_SUBJECT Missing Subject: header 0.2 NO_SUBJECT Extra score for no subject X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) --Sig_/32Ffwz6vtjioWwEb.NTa4UA Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable close 31024 close 31040 --Sig_/32Ffwz6vtjioWwEb.NTa4UA Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAlrTCgAACgkQ5xo1VCww uqVLDQf/fncc9zR2n253f48QR/9FxTirlAEuxEjooP8k2gJHLIBrKRajdnFsEpy0 zax4MB0oUMTMPBxV2oSOyukF6a8vRAsaJO7wMgcVMviV7x1F6vnrLNFZcv5Xo4Rx XlABg6hfVXOS96yGCnc0J9g6mx7hFTmy2ZQDHQ2FEfxpBkoWnXndcQHZOhkVHc/q xzIKKq6kLgh4rEO93SRtSm4WOfmnHoTdHOohMMF1U/H4F8aHk7PshLTNzAgnKX3S 1A2QPSjsjbTdnIVP57MEGVKzNhIcMWS3DKy6NjY2abcH5i1zVmk5q/zAq1Q2L49C p85KbS44bUZtGkM4DC7GUH5m39Uhww== =KSX0 -----END PGP SIGNATURE----- --Sig_/32Ffwz6vtjioWwEb.NTa4UA--