From unknown Thu Jun 19 12:34:01 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#26232 <26232@debbugs.gnu.org> To: bug#26232 <26232@debbugs.gnu.org> Subject: Status: [PATCH] gnu: rustc: Update to 1.16.0. gnu: cargo: Update to 0.17.0. Reply-To: bug#26232 <26232@debbugs.gnu.org> Date: Thu, 19 Jun 2025 19:34:01 +0000 retitle 26232 [PATCH] gnu: rustc: Update to 1.16.0. gnu: cargo: Update to 0= .17.0. reassign 26232 guix-patches submitter 26232 Danny Milosavljevic severity 26232 normal tag 26232 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 23 20:20:59 2017 Received: (at submit) by debbugs.gnu.org; 24 Mar 2017 00:20:59 +0000 Received: from localhost ([127.0.0.1]:41556 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1crCyR-0006Pw-4b for submit@debbugs.gnu.org; Thu, 23 Mar 2017 20:20:59 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48353) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1crCyP-0006Pk-Cl for submit@debbugs.gnu.org; Thu, 23 Mar 2017 20:20:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1crCyI-0005lT-BS for submit@debbugs.gnu.org; Thu, 23 Mar 2017 20:20:51 -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 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:43287) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1crCyI-0005lP-8e for submit@debbugs.gnu.org; Thu, 23 Mar 2017 20:20:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crCyG-0007RL-KN for guix-patches@gnu.org; Thu, 23 Mar 2017 20:20:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1crCyC-0005gb-Ht for guix-patches@gnu.org; Thu, 23 Mar 2017 20:20:48 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:48761) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1crCyC-0005c6-7m for guix-patches@gnu.org; Thu, 23 Mar 2017 20:20:44 -0400 Received: from dayas.3.home (77.118.236.109.wireless.dyn.drei.com [77.118.236.109]) by dd1012.kasserver.com (Postfix) with ESMTPSA id 08AD11CA0142; Fri, 24 Mar 2017 01:20:38 +0100 (CET) From: Danny Milosavljevic To: guix-patches@gnu.org Subject: [PATCH] gnu: rustc: Update to 1.16.0. gnu: cargo: Update to 0.17.0. Date: Fri, 24 Mar 2017 01:20:33 +0100 Message-Id: <20170324002033.24810-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.12.0 Tags: patch X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [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: -5.0 (-----) X-Debbugs-Envelope-To: submit Cc: Danny Milosavljevic 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: -5.0 (-----) * gnu/packages/rust.scm (rustc): Update to 1.16.0. (cargo): Update to 0.17.0. --- gnu/packages/rust.scm | 66 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 49 insertions(+), 17 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 9a56b1ffe..aa2617a04 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -44,7 +44,7 @@ #:use-module (srfi srfi-26)) ;; Should be one less than the current released version. -(define %rust-bootstrap-binaries-version "1.14.0") +(define %rust-bootstrap-binaries-version "1.15.0") (define %rust-bootstrap-binaries (origin @@ -55,7 +55,7 @@ "-i686-unknown-linux-gnu.tar.gz")) (sha256 (base32 - "0h384prpabcl08mxs1bilyb0dbk0knpdylcnz4b84ij4idr7ap4d")))) + "0wmkfx8pxmkkw021mrq9s3xhra8f0daqdl6j56pxyn4w39i0rzrw")))) (define (increment-rust-version rust-version major patch) (match (string-split rust-version #\.) @@ -205,13 +205,14 @@ rustc-bootstrap and cargo-bootstrap packages.") "rustc-" version "-src.tar.gz")) (sha256 (base32 - "0wvn8m1nfg664b95qrdpfh72q1a6ir09rqkrnlzbkay2r7xf8mgn")))) + "1d78jq7mc34n265by68amr9r4nzbiqrilfbwh7gx56ydn4gb6rpr")))) (build-system gnu-build-system) (native-inputs `(("cmake" ,cmake) ("git" ,git) ("python-2" ,python-2) ("rust-bootstrap" ,rust-bootstrap) + ("cargo-bootstrap" ,cargo-bootstrap) ("which" ,which))) (inputs `(("jemalloc" ,jemalloc) @@ -226,7 +227,16 @@ rustc-bootstrap and cargo-bootstrap packages.") (lambda _ (substitute* "configure" (("/usr/bin/env") (which "env")) ; Detect target CPU correctly. - (("probe_need CFG_CURL curl") "")) ; Avoid curl as a build dependency. + (("probe_need CFG_CURL curl") "") ; Avoid curl build dependency. + ;; See + (("-DLLVM_TARGETS_TO_BUILD='") + "-DLLVM_TARGETS_TO_BUILD='NVPTX;")) ; Make LLVM >= 3.8.1 work. + (substitute* "src/tools/compiletest/src/util.rs" + (("(\"amd64\", \"x86_64\"),") "(\"amd64\", \"x86_64\"), +(\"nvptx\", \"nvptx\"),")) ; Make LLVM >= 3.8.1 work. + (substitute* "mk/main.mk" + (("LLVM_OPTIONAL_COMPONENTS=") + "LLVM_OPTIONAL_COMPONENTS=nvptx ")) ; Make LLVM >= 3.8.1 work. #t)) (add-after 'unpack 'set-env (lambda _ @@ -264,7 +274,8 @@ rustc-bootstrap and cargo-bootstrap packages.") "--enable-rpath" "--enable-local-rust" "--disable-rustbuild" ; use Makefiles - "--disable-manage-submodules"))) + "--disable-manage-submodules" + "--enable-llvm-link-shared"))) ;; Rust uses a custom configure script (no autoconf). (zero? (apply system* "./configure" flags))))) (add-after 'install 'wrap-rustc @@ -297,7 +308,7 @@ safety and thread safety guarantees.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "194i06y9nql0p93gahh0vm4qwv6c1kpd9rprpf22w5gav9lpcyjz")))) + "1y0zy8gk1ly0wh57y78fisk7cdd92qk0x7z664f6l7lzl2krqs7w")))) (build-system cargo-build-system) (propagated-inputs `(("cmake" ,cmake) @@ -313,10 +324,10 @@ safety and thread safety guarantees.") `(("rust-openssl" ,(origin (method url-fetch) - (uri (crate-uri "openssl" "0.9.1")) + (uri (crate-uri "openssl" "0.9.6")) (sha256 (base32 - "1m2mhiar87qnw4gxci286q9g85ljafbc41salbj2hmcgh8aagchy")))) + "0g28g692gby6izp9qmnwnyxyhf9b0870yhd500p18j9l69lxl00c")))) ("rust-strsim" ,(origin (method url-fetch) @@ -411,17 +422,17 @@ safety and thread safety guarantees.") ("rust-libssh2-sys" ,(origin (method url-fetch) - (uri (crate-uri "libssh2-sys" "0.2.4")) + (uri (crate-uri "libssh2-sys" "0.2.5")) (sha256 (base32 - "1pmmh0hcx14856wg9bp740yf618qfl2765vhf67sfs5lmf39227d")))) + "0d2r36hrh9vc1821r0v4kywv30svpf37d31calwql69fbij3bqci")))) ("rust-libz-sys" ,(origin (method url-fetch) - (uri (crate-uri "libz-sys" "1.0.10")) + (uri (crate-uri "libz-sys" "1.0.13")) (sha256 (base32 - "1rl85x045sk5d345hgcahx99plpbdg2a3bx5vjfxig30qah74p4h")))) + "034pgvxzgsv37iafgs0lmvd1ifm0bg0zm1xcsn9x71nn8lm93vp5")))) ("rust-curl-sys" ,(origin (method url-fetch) @@ -429,13 +440,27 @@ safety and thread safety guarantees.") (sha256 (base32 "0fi8kjz3f8m8vfazycs3ddm0h6j3x78hw78gwbvybx71129192i1")))) + ("rust-error-chain" + ,(origin + (method url-fetch) + (uri (crate-uri "error-chain" "0.7.2")) + (sha256 + (base32 + "03qjh6l2a9fkiyg0428p7q3dcpi47cbmrqf9zmlymkg43v3v731i")))) + ("rust-metadeps" + ,(origin + (method url-fetch) + (uri (crate-uri "metadeps" "1.1.1")) + (sha256 + (base32 + "0l818461bslb7nrs7r1amkqv45n53fcp5sabyqipwx0xxbkzz7w2")))) ("rust-openssl-sys" ,(origin (method url-fetch) - (uri (crate-uri "openssl-sys" "0.9.1")) + (uri (crate-uri "openssl-sys" "0.9.6")) (sha256 (base32 - "1sdhgalfm2zdqf144xhdnxdha7ifjgsfbmlrqbx0j9f3mh4gpscm")))) + "1hzpyf9z8xg1yn5r9g17bl5j20nifd6s2zp10xh90v7m0sd2yj5i")))) ("rust-fs2" ,(origin (method url-fetch) @@ -635,10 +660,10 @@ safety and thread safety guarantees.") ("rust-libgit2-sys" ,(origin (method url-fetch) - (uri (crate-uri "libgit2-sys" "0.6.5")) + (uri (crate-uri "libgit2-sys" "0.6.6")) (sha256 (base32 - "0yl80n12ih4jh1halpbj3zqlqvw5zxdr6m6xdcvdz67svjy50bjh")))) + "074h9q4p60xh6canb0sj4vrc801wqv6p53l9lp0q724bkwzf7967")))) ("rust-env_logger" ,(origin (method url-fetch) @@ -785,7 +810,14 @@ safety and thread safety guarantees.") (uri (crate-uri "num-complex" "0.1.35")) (sha256 (base32 - "0bzrjfppnnzf9vmkpklhp2dw9sb1lqzydb8r6k83z76i9l2qxizh")))))) + "0bzrjfppnnzf9vmkpklhp2dw9sb1lqzydb8r6k83z76i9l2qxizh")))) + ("rust-shell-escape" + ,(origin + (method url-fetch) + (uri (crate-uri "shell-escape" "0.1.3")) + (sha256 + (base32 + "1y2fp2brv639icv4a0fdqs1zhlrxq8qbz27ygfa86ifmh5jcjp6x")))))) (arguments `(#:cargo ,cargo-bootstrap #:tests? #f ; FIXME From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 24 13:15:28 2017 Received: (at 26232) by debbugs.gnu.org; 24 Mar 2017 17:15:29 +0000 Received: from localhost ([127.0.0.1]:42712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1crSoC-0006ic-Hi for submit@debbugs.gnu.org; Fri, 24 Mar 2017 13:15:28 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:45690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1crSoA-0006iT-Ja for 26232@debbugs.gnu.org; Fri, 24 Mar 2017 13:15:27 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 836B920CD6; Fri, 24 Mar 2017 13:15:25 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Fri, 24 Mar 2017 13:15:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=fm1; bh=sR1pHXTd6cHjTv+jElhPMRVSKafbYAqcEaNzTGB1z /M=; b=lT0XAPP5uJaY8fwWDwcTRrIakQfWnjCxPy3e2EFvtWEt9DaYaiqNEtzC2 twaYGcnClUEZ6ZChLDiOPcIcgcF3wLRFI6PVRzKtrI7C8/F8cKHdFASIb0UV7YB4 8AgtItHe0dSm4+1B1ZwzLdsxgTdQmwj1Tly6HKFCbfzfBwLIvhbkIxvvd4oZ2l1J zkQeuqjHktBlmyv9956o1D/OpFsgXH4Fh0BEyhzLhHpZl+TBCy+Z0neoIlpMOURf XwqAnXbbYgVQ5ghEoAfOz5YfgnJjukRtEFg5B67BktfAASFUFGS+SLdpTKJSnbRS 9pT/9MdDpdUNoBv4EgY1yUmp8UzMQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=sR1pHXTd6cHjTv+jEl hPMRVSKafbYAqcEaNzTGB1z/M=; b=jZSVhJvP9tz8sdGI8G3SywtvdATa4gr3c9 2msO+fwQdm5VhKUi2DJOty3zKxj32cNwnbJWxAeejhIaL8ZaCDuxDuokH0+UtcKm LyqafoXkwYiUmyLecpjPgIzt09Eh15gEG6na6tqQUyq3fYrmPFAM0pg+YiYn+yVF QPhVVknMEB+06tKhnEdCm3bgfloisByysSCI2fq6jhYpoHGy91JyQo9AkQ5P7gnW qdSV8a7Z/gp6SEgrcwLuKjK0hbrATZrY4NG4CAcZEm5UdXCk5HlY/Ep7RFdaf4YP 3c7wtzzsl3s5dlxUVFBkQJFUz6FpUAZUItBV6sBfQiyZaGenz2DA== X-ME-Sender: X-Sasl-enc: 7RxfnrH7SEGScDXDlyf8NgTtGgQKA9GpIh7cKbP7DncZ 1490375725 Received: from localhost (unknown [188.113.81.93]) by mail.messagingengine.com (Postfix) with ESMTPA id 0B0F77E442; Fri, 24 Mar 2017 13:15:24 -0400 (EDT) From: Marius Bakke To: Danny Milosavljevic , 26232@debbugs.gnu.org Subject: Re: bug#26232: [PATCH] gnu: rustc: Update to 1.16.0. gnu: cargo: Update to 0.17.0. In-Reply-To: <20170324002033.24810-1-dannym@scratchpost.org> References: <20170324002033.24810-1-dannym@scratchpost.org> User-Agent: Notmuch/0.24 (https://notmuchmail.org) Emacs/25.1.1 (x86_64-unknown-linux-gnu) Date: Fri, 24 Mar 2017 18:15:23 +0100 Message-ID: <87d1d6y4t0.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26232 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.7 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Danny Milosavljevic writes: > * gnu/packages/rust.scm (rustc): Update to 1.16.0. > (cargo): Update to 0.17.0. Do these have to be updated together? I would prefer them as separate patches. Also, the changes to the various [arguments] and [native-inputs] should be mentioned here. > --- > gnu/packages/rust.scm | 66 ++++++++++++++++++++++++++++++++++++++-------= ------ > 1 file changed, 49 insertions(+), 17 deletions(-) > > diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm > index 9a56b1ffe..aa2617a04 100644 > --- a/gnu/packages/rust.scm > +++ b/gnu/packages/rust.scm > @@ -44,7 +44,7 @@ > #:use-module (srfi srfi-26)) >=20=20 > ;; Should be one less than the current released version. > -(define %rust-bootstrap-binaries-version "1.14.0") > +(define %rust-bootstrap-binaries-version "1.15.0") >=20=20 > (define %rust-bootstrap-binaries > (origin > @@ -55,7 +55,7 @@ > "-i686-unknown-linux-gnu.tar.gz")) > (sha256 > (base32 > - "0h384prpabcl08mxs1bilyb0dbk0knpdylcnz4b84ij4idr7ap4d")))) > + "0wmkfx8pxmkkw021mrq9s3xhra8f0daqdl6j56pxyn4w39i0rzrw")))) >=20=20 > (define (increment-rust-version rust-version major patch) > (match (string-split rust-version #\.) > @@ -205,13 +205,14 @@ rustc-bootstrap and cargo-bootstrap packages.") > "rustc-" version "-src.tar.gz")) > (sha256 > (base32 > - "0wvn8m1nfg664b95qrdpfh72q1a6ir09rqkrnlzbkay2r7xf8mgn"))= )) > + "1d78jq7mc34n265by68amr9r4nzbiqrilfbwh7gx56ydn4gb6rpr"))= )) > (build-system gnu-build-system) > (native-inputs > `(("cmake" ,cmake) > ("git" ,git) > ("python-2" ,python-2) > ("rust-bootstrap" ,rust-bootstrap) > + ("cargo-bootstrap" ,cargo-bootstrap) > ("which" ,which))) > (inputs > `(("jemalloc" ,jemalloc) > @@ -226,7 +227,16 @@ rustc-bootstrap and cargo-bootstrap packages.") > (lambda _ > (substitute* "configure" > (("/usr/bin/env") (which "env")) ; Detect target CPU corr= ectly. > - (("probe_need CFG_CURL curl") "")) ; Avoid curl as a buil= d dependency. > + (("probe_need CFG_CURL curl") "") ; Avoid curl build depe= ndency. > + ;; See > + (("-DLLVM_TARGETS_TO_BUILD=3D'") > + "-DLLVM_TARGETS_TO_BUILD=3D'NVPTX;")) ; Make LLVM >=3D 3= .8.1 work. > + (substitute* "src/tools/compiletest/src/util.rs" > + (("(\"amd64\", \"x86_64\"),") "(\"amd64\", \"x86_64\"), > +(\"nvptx\", \"nvptx\"),")) ; Make LLVM >=3D 3.8.1 work. > + (substitute* "mk/main.mk" > + (("LLVM_OPTIONAL_COMPONENTS=3D") > + "LLVM_OPTIONAL_COMPONENTS=3Dnvptx ")) ; Make LLVM >=3D 3= .8.1 work. Phew! I think a sentence or two above the github URL stating the problem and mentioning that the following three substitutions resolves a flob with the gnord would be nice here, since it's not obvious that the substitutions have anything to do with LLVM (even with the comments). Reading the github issue, it should probably also be mentioned that these workarounds will be obsolete in the next release. > #t)) > (add-after 'unpack 'set-env > (lambda _ > @@ -264,7 +274,8 @@ rustc-bootstrap and cargo-bootstrap packages.") > "--enable-rpath" > "--enable-local-rust" > "--disable-rustbuild" ; use Makefiles > - "--disable-manage-submodules"))) > + "--disable-manage-submodules" > + "--enable-llvm-link-shared"))) > ;; Rust uses a custom configure script (no autoconf). > (zero? (apply system* "./configure" flags))))) > (add-after 'install 'wrap-rustc > @@ -297,7 +308,7 @@ safety and thread safety guarantees.") > (file-name (string-append name "-" version ".tar.gz")) > (sha256 > (base32 > - "194i06y9nql0p93gahh0vm4qwv6c1kpd9rprpf22w5gav9lpcyjz"))= )) > + "1y0zy8gk1ly0wh57y78fisk7cdd92qk0x7z664f6l7lzl2krqs7w"))= )) > (build-system cargo-build-system) > (propagated-inputs > `(("cmake" ,cmake) > @@ -313,10 +324,10 @@ safety and thread safety guarantees.") > `(("rust-openssl" > ,(origin > (method url-fetch) > - (uri (crate-uri "openssl" "0.9.1")) > + (uri (crate-uri "openssl" "0.9.6")) > (sha256 > (base32 > - "1m2mhiar87qnw4gxci286q9g85ljafbc41salbj2hmcgh8aagchy")))) > + "0g28g692gby6izp9qmnwnyxyhf9b0870yhd500p18j9l69lxl00c")))) > ("rust-strsim" > ,(origin > (method url-fetch) > @@ -411,17 +422,17 @@ safety and thread safety guarantees.") > ("rust-libssh2-sys" > ,(origin > (method url-fetch) > - (uri (crate-uri "libssh2-sys" "0.2.4")) > + (uri (crate-uri "libssh2-sys" "0.2.5")) > (sha256 > (base32 > - "1pmmh0hcx14856wg9bp740yf618qfl2765vhf67sfs5lmf39227d")))) > + "0d2r36hrh9vc1821r0v4kywv30svpf37d31calwql69fbij3bqci")))) > ("rust-libz-sys" > ,(origin > (method url-fetch) > - (uri (crate-uri "libz-sys" "1.0.10")) > + (uri (crate-uri "libz-sys" "1.0.13")) > (sha256 > (base32 > - "1rl85x045sk5d345hgcahx99plpbdg2a3bx5vjfxig30qah74p4h")))) > + "034pgvxzgsv37iafgs0lmvd1ifm0bg0zm1xcsn9x71nn8lm93vp5")))) > ("rust-curl-sys" > ,(origin > (method url-fetch) > @@ -429,13 +440,27 @@ safety and thread safety guarantees.") > (sha256 > (base32 > "0fi8kjz3f8m8vfazycs3ddm0h6j3x78hw78gwbvybx71129192i1")))) > + ("rust-error-chain" > + ,(origin > + (method url-fetch) > + (uri (crate-uri "error-chain" "0.7.2")) > + (sha256 > + (base32 > + "03qjh6l2a9fkiyg0428p7q3dcpi47cbmrqf9zmlymkg43v3v731i")))) > + ("rust-metadeps" > + ,(origin > + (method url-fetch) > + (uri (crate-uri "metadeps" "1.1.1")) > + (sha256 > + (base32 > + "0l818461bslb7nrs7r1amkqv45n53fcp5sabyqipwx0xxbkzz7w2")))) > ("rust-openssl-sys" > ,(origin > (method url-fetch) > - (uri (crate-uri "openssl-sys" "0.9.1")) > + (uri (crate-uri "openssl-sys" "0.9.6")) > (sha256 > (base32 > - "1sdhgalfm2zdqf144xhdnxdha7ifjgsfbmlrqbx0j9f3mh4gpscm")))) > + "1hzpyf9z8xg1yn5r9g17bl5j20nifd6s2zp10xh90v7m0sd2yj5i")))) > ("rust-fs2" > ,(origin > (method url-fetch) > @@ -635,10 +660,10 @@ safety and thread safety guarantees.") > ("rust-libgit2-sys" > ,(origin > (method url-fetch) > - (uri (crate-uri "libgit2-sys" "0.6.5")) > + (uri (crate-uri "libgit2-sys" "0.6.6")) > (sha256 > (base32 > - "0yl80n12ih4jh1halpbj3zqlqvw5zxdr6m6xdcvdz67svjy50bjh")))) > + "074h9q4p60xh6canb0sj4vrc801wqv6p53l9lp0q724bkwzf7967")))) > ("rust-env_logger" > ,(origin > (method url-fetch) > @@ -785,7 +810,14 @@ safety and thread safety guarantees.") > (uri (crate-uri "num-complex" "0.1.35")) > (sha256 > (base32 > - "0bzrjfppnnzf9vmkpklhp2dw9sb1lqzydb8r6k83z76i9l2qxizh")))))) > + "0bzrjfppnnzf9vmkpklhp2dw9sb1lqzydb8r6k83z76i9l2qxizh")))) > + ("rust-shell-escape" > + ,(origin > + (method url-fetch) > + (uri (crate-uri "shell-escape" "0.1.3")) > + (sha256 > + (base32 > + "1y2fp2brv639icv4a0fdqs1zhlrxq8qbz27ygfa86ifmh5jcjp6x")))))) > (arguments > `(#:cargo ,cargo-bootstrap > #:tests? #f ; FIXME --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAljVVCsACgkQoqBt8qM6 VPo9qwf/TiRNUqjq8Se/FD8SCfii/YYE/nqvwrST3jJ2uY3D+OhzPt1peNEYekb1 cFe2CvLeqCe3aRdUoGk5jlQj96+WvXmqR2kXNcnEYkDJTj1HqbX7JWEG+2LwFbmc 1Qi1eYf1WdhIJg6EX7WI7KvZvEq0zQEY4kAWzaUfrXx/OnD9YqHIN93D8nA7ngNP EuedkJ3CvzCXdSI0trkRapri3YE9XG/67246mMHls5eePQEveiKoVhF06L2dazVJ GN3vxMZG+F/OJ/h3/7hdlwhemTUPTUPpgmCTMOlcG8Xzt8AP8QpVhXrkB+xionyQ 4HJQMhggwMSGCO0sldil4ckw+bdkJQ== =w2Cg -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 24 16:53:29 2017 Received: (at 26232) by debbugs.gnu.org; 24 Mar 2017 20:53:29 +0000 Received: from localhost ([127.0.0.1]:42853 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1crWDA-0000p3-Lk for submit@debbugs.gnu.org; Fri, 24 Mar 2017 16:53:28 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:57946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1crWD9-0000ou-L8 for 26232@debbugs.gnu.org; Fri, 24 Mar 2017 16:53:28 -0400 Received: from dayas.3.home (178.113.228.67.wireless.dyn.drei.com [178.113.228.67]) by dd1012.kasserver.com (Postfix) with ESMTPSA id 6A5631CA1056; Fri, 24 Mar 2017 21:53:21 +0100 (CET) From: Danny Milosavljevic To: 26232@debbugs.gnu.org Subject: [PATCH v2] gnu: rustc: Update to 1.16.0. gnu: cargo: Update to 0.17.0. Date: Fri, 24 Mar 2017 21:53:14 +0100 Message-Id: <20170324205314.6090-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.12.0 In-Reply-To: <87d1d6y4t0.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <87d1d6y4t0.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> Tags: patch X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26232 Cc: Danny Milosavljevic 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.7 (/) * gnu/packages/rust.scm (rustc): Update to 1.16.0. patch-configure: Patch LLVM references. (cargo): Update to 0.17.0. [native-inputs]: Update rust-openssl to 0.9.6. Update rust-libssh2-sys 0.2.5. Update rust-libz-sys 1.0.13. Add rust-error-chain 0.7.2. Add rust-metadeps 1.1.1. Update rust-openssl-sys 0.9.6. Update rust-libgit2-sys to 0.6.6. Add rust-shell-escape 0.1.3. --- gnu/packages/rust.scm | 70 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 17 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 9a56b1ffe..a9710ba4d 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -44,7 +44,7 @@ #:use-module (srfi srfi-26)) ;; Should be one less than the current released version. -(define %rust-bootstrap-binaries-version "1.14.0") +(define %rust-bootstrap-binaries-version "1.15.0") (define %rust-bootstrap-binaries (origin @@ -55,7 +55,7 @@ "-i686-unknown-linux-gnu.tar.gz")) (sha256 (base32 - "0h384prpabcl08mxs1bilyb0dbk0knpdylcnz4b84ij4idr7ap4d")))) + "0wmkfx8pxmkkw021mrq9s3xhra8f0daqdl6j56pxyn4w39i0rzrw")))) (define (increment-rust-version rust-version major patch) (match (string-split rust-version #\.) @@ -205,7 +205,7 @@ rustc-bootstrap and cargo-bootstrap packages.") "rustc-" version "-src.tar.gz")) (sha256 (base32 - "0wvn8m1nfg664b95qrdpfh72q1a6ir09rqkrnlzbkay2r7xf8mgn")))) + "1d78jq7mc34n265by68amr9r4nzbiqrilfbwh7gx56ydn4gb6rpr")))) (build-system gnu-build-system) (native-inputs `(("cmake" ,cmake) @@ -226,7 +226,22 @@ rustc-bootstrap and cargo-bootstrap packages.") (lambda _ (substitute* "configure" (("/usr/bin/env") (which "env")) ; Detect target CPU correctly. - (("probe_need CFG_CURL curl") "")) ; Avoid curl as a build dependency. + (("probe_need CFG_CURL curl") "") ; Avoid curl build dependency. + ;; Newer LLVM has a NVPTX (NVIDIA) backend which the Rust + ;; Makefiles don't know about, causing a linker failure + ;; if we don't intervene. + ;; Therefore, we add NVPTX here. + ;; See . + ;; For the next release, we will have to use rustbuild. + ;; Right now, rustbuild doesn't work yet. + (("-DLLVM_TARGETS_TO_BUILD='") + "-DLLVM_TARGETS_TO_BUILD='NVPTX;")) ; Make LLVM >= 3.8.1 work. + (substitute* "src/tools/compiletest/src/util.rs" + (("(\"amd64\", \"x86_64\"),") "(\"amd64\", \"x86_64\"), +(\"nvptx\", \"nvptx\"),")) ; Make LLVM >= 3.8.1 work. + (substitute* "mk/main.mk" + (("LLVM_OPTIONAL_COMPONENTS=") + "LLVM_OPTIONAL_COMPONENTS=nvptx ")) ; Make LLVM >= 3.8.1 work. #t)) (add-after 'unpack 'set-env (lambda _ @@ -263,7 +278,7 @@ rustc-bootstrap and cargo-bootstrap packages.") "--release-channel=stable" "--enable-rpath" "--enable-local-rust" - "--disable-rustbuild" ; use Makefiles + "--disable-rustbuild" ; rustbuild doesn't work yet. "--disable-manage-submodules"))) ;; Rust uses a custom configure script (no autoconf). (zero? (apply system* "./configure" flags))))) @@ -297,7 +312,7 @@ safety and thread safety guarantees.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "194i06y9nql0p93gahh0vm4qwv6c1kpd9rprpf22w5gav9lpcyjz")))) + "1y0zy8gk1ly0wh57y78fisk7cdd92qk0x7z664f6l7lzl2krqs7w")))) (build-system cargo-build-system) (propagated-inputs `(("cmake" ,cmake) @@ -313,10 +328,10 @@ safety and thread safety guarantees.") `(("rust-openssl" ,(origin (method url-fetch) - (uri (crate-uri "openssl" "0.9.1")) + (uri (crate-uri "openssl" "0.9.6")) (sha256 (base32 - "1m2mhiar87qnw4gxci286q9g85ljafbc41salbj2hmcgh8aagchy")))) + "0g28g692gby6izp9qmnwnyxyhf9b0870yhd500p18j9l69lxl00c")))) ("rust-strsim" ,(origin (method url-fetch) @@ -411,17 +426,17 @@ safety and thread safety guarantees.") ("rust-libssh2-sys" ,(origin (method url-fetch) - (uri (crate-uri "libssh2-sys" "0.2.4")) + (uri (crate-uri "libssh2-sys" "0.2.5")) (sha256 (base32 - "1pmmh0hcx14856wg9bp740yf618qfl2765vhf67sfs5lmf39227d")))) + "0d2r36hrh9vc1821r0v4kywv30svpf37d31calwql69fbij3bqci")))) ("rust-libz-sys" ,(origin (method url-fetch) - (uri (crate-uri "libz-sys" "1.0.10")) + (uri (crate-uri "libz-sys" "1.0.13")) (sha256 (base32 - "1rl85x045sk5d345hgcahx99plpbdg2a3bx5vjfxig30qah74p4h")))) + "034pgvxzgsv37iafgs0lmvd1ifm0bg0zm1xcsn9x71nn8lm93vp5")))) ("rust-curl-sys" ,(origin (method url-fetch) @@ -429,13 +444,27 @@ safety and thread safety guarantees.") (sha256 (base32 "0fi8kjz3f8m8vfazycs3ddm0h6j3x78hw78gwbvybx71129192i1")))) + ("rust-error-chain" + ,(origin + (method url-fetch) + (uri (crate-uri "error-chain" "0.7.2")) + (sha256 + (base32 + "03qjh6l2a9fkiyg0428p7q3dcpi47cbmrqf9zmlymkg43v3v731i")))) + ("rust-metadeps" + ,(origin + (method url-fetch) + (uri (crate-uri "metadeps" "1.1.1")) + (sha256 + (base32 + "0l818461bslb7nrs7r1amkqv45n53fcp5sabyqipwx0xxbkzz7w2")))) ("rust-openssl-sys" ,(origin (method url-fetch) - (uri (crate-uri "openssl-sys" "0.9.1")) + (uri (crate-uri "openssl-sys" "0.9.6")) (sha256 (base32 - "1sdhgalfm2zdqf144xhdnxdha7ifjgsfbmlrqbx0j9f3mh4gpscm")))) + "1hzpyf9z8xg1yn5r9g17bl5j20nifd6s2zp10xh90v7m0sd2yj5i")))) ("rust-fs2" ,(origin (method url-fetch) @@ -635,10 +664,10 @@ safety and thread safety guarantees.") ("rust-libgit2-sys" ,(origin (method url-fetch) - (uri (crate-uri "libgit2-sys" "0.6.5")) + (uri (crate-uri "libgit2-sys" "0.6.6")) (sha256 (base32 - "0yl80n12ih4jh1halpbj3zqlqvw5zxdr6m6xdcvdz67svjy50bjh")))) + "074h9q4p60xh6canb0sj4vrc801wqv6p53l9lp0q724bkwzf7967")))) ("rust-env_logger" ,(origin (method url-fetch) @@ -785,7 +814,14 @@ safety and thread safety guarantees.") (uri (crate-uri "num-complex" "0.1.35")) (sha256 (base32 - "0bzrjfppnnzf9vmkpklhp2dw9sb1lqzydb8r6k83z76i9l2qxizh")))))) + "0bzrjfppnnzf9vmkpklhp2dw9sb1lqzydb8r6k83z76i9l2qxizh")))) + ("rust-shell-escape" + ,(origin + (method url-fetch) + (uri (crate-uri "shell-escape" "0.1.3")) + (sha256 + (base32 + "1y2fp2brv639icv4a0fdqs1zhlrxq8qbz27ygfa86ifmh5jcjp6x")))))) (arguments `(#:cargo ,cargo-bootstrap #:tests? #f ; FIXME From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 24 16:57:26 2017 Received: (at 26232) by debbugs.gnu.org; 24 Mar 2017 20:57:26 +0000 Received: from localhost ([127.0.0.1]:42857 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1crWH0-0000uo-BN for submit@debbugs.gnu.org; Fri, 24 Mar 2017 16:57:26 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:58099) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1crWGz-0000uf-1V for 26232@debbugs.gnu.org; Fri, 24 Mar 2017 16:57:25 -0400 Received: from localhost (178.113.228.67.wireless.dyn.drei.com [178.113.228.67]) by dd1012.kasserver.com (Postfix) with ESMTPSA id E63DA1CA1056; Fri, 24 Mar 2017 21:57:23 +0100 (CET) Date: Fri, 24 Mar 2017 21:57:22 +0100 From: Danny Milosavljevic To: Marius Bakke Subject: Re: bug#26232: [PATCH] gnu: rustc: Update to 1.16.0. gnu: cargo: Update to 0.17.0. Message-ID: <20170324215722.3f47acc3@scratchpost.org> In-Reply-To: <87d1d6y4t0.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> References: <20170324002033.24810-1-dannym@scratchpost.org> <87d1d6y4t0.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26232 Cc: 26232@debbugs.gnu.org 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.7 (/) Hi Marius, On Fri, 24 Mar 2017 18:15:23 +0100 Marius Bakke wrote: > Do these have to be updated together? Right now yes. David chained them together using (cargo-version ...). Until I find out how to disentangle them I'd like to update them in tandem. A larger change will be necessary on the next Rust release anyway because of rustbuild. So I'd suggest to disentange it (slowly) then. >I would prefer them as separate patches. Yeah, it just doesn't work right now. I've posted a v2 now. From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 07 17:01:45 2017 Received: (at 26232) by debbugs.gnu.org; 7 Apr 2017 21:01:45 +0000 Received: from localhost ([127.0.0.1]:36835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cwb0q-0002xt-VZ for submit@debbugs.gnu.org; Fri, 07 Apr 2017 17:01:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33027) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cwb0p-0002xd-DG for 26232@debbugs.gnu.org; Fri, 07 Apr 2017 17:01:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cwb0f-0005Cy-Hp for 26232@debbugs.gnu.org; Fri, 07 Apr 2017 17:01:38 -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.0 required=5.0 tests=BAYES_20,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:57894) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cwb0f-0005Ct-EX; Fri, 07 Apr 2017 17:01:33 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:41094 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1cwb0e-0004GL-T1; Fri, 07 Apr 2017 17:01:33 -0400 From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: Danny Milosavljevic Subject: Re: bug#26232: [PATCH v2] gnu: rustc: Update to 1.16.0. gnu: cargo: Update to 0.17.0. References: <87d1d6y4t0.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170324205314.6090-1-dannym@scratchpost.org> Date: Fri, 07 Apr 2017 23:01:30 +0200 In-Reply-To: <20170324205314.6090-1-dannym@scratchpost.org> (Danny Milosavljevic's message of "Fri, 24 Mar 2017 21:53:14 +0100") Message-ID: <87k26wszit.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 26232 Cc: 26232@debbugs.gnu.org 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: -5.0 (-----) Danny Milosavljevic skribis: > * gnu/packages/rust.scm (rustc): Update to 1.16.0. > patch-configure: Patch LLVM references. > (cargo): Update to 0.17.0. > [native-inputs]: Update rust-openssl to 0.9.6. > Update rust-libssh2-sys 0.2.5. > Update rust-libz-sys 1.0.13. > Add rust-error-chain 0.7.2. > Add rust-metadeps 1.1.1. > Update rust-openssl-sys 0.9.6. > Update rust-libgit2-sys to 0.6.6. > Add rust-shell-escape 0.1.3. LGTM, thanks! Ludo'. From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 10 03:06:36 2017 Received: (at 26232-done) by debbugs.gnu.org; 10 Apr 2017 07:06:36 +0000 Received: from localhost ([127.0.0.1]:40466 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cxTPI-0005Or-3P for submit@debbugs.gnu.org; Mon, 10 Apr 2017 03:06:36 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:42476) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cxTPG-0005Oj-Vb for 26232-done@debbugs.gnu.org; Mon, 10 Apr 2017 03:06:35 -0400 Received: from localhost (77.118.220.155.wireless.dyn.drei.com [77.118.220.155]) by dd1012.kasserver.com (Postfix) with ESMTPSA id 995631CA02EC for <26232-done@debbugs.gnu.org>; Mon, 10 Apr 2017 09:06:32 +0200 (CEST) Date: Mon, 10 Apr 2017 09:06:30 +0200 From: Danny Milosavljevic To: 26232-done@debbugs.gnu.org Subject: Re: [PATCH v2] gnu: rustc: Update to 1.16.0. gnu: cargo: Update to 0.17.0. Message-ID: <20170410090631.2e131316@scratchpost.org> In-Reply-To: <20170324205314.6090-1-dannym@scratchpost.org> References: <87d1d6y4t0.fsf@kirby.i-did-not-set--mail-host-address--so-tickle-me> <20170324205314.6090-1-dannym@scratchpost.org> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26232-done 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.7 (/) Pushed the Rust update to master as 9ea0cdaf7f60823c861868e210add3d1b3af11fd. Closing bug report. From unknown Thu Jun 19 12:34:01 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 08 May 2017 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator