From unknown Tue Jun 24 14:00:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25938: [PATCH] gnu: rust: Update to 1.15.0. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2017 21:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 25938 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 25938@debbugs.gnu.org Cc: Danny Milosavljevic X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.14884888537248 (code B ref -1); Thu, 02 Mar 2017 21:08:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Mar 2017 21:07:33 +0000 Received: from localhost ([127.0.0.1]:36998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjXwi-0001sq-U0 for submit@debbugs.gnu.org; Thu, 02 Mar 2017 16:07:33 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjXwi-0001sb-38 for submit@debbugs.gnu.org; Thu, 02 Mar 2017 16:07:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cjXwb-0006uq-Uy for submit@debbugs.gnu.org; Thu, 02 Mar 2017 16:07:26 -0500 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]:55918) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cjXwb-0006um-SA for submit@debbugs.gnu.org; Thu, 02 Mar 2017 16:07:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjXwa-0001gP-O0 for guix-patches@gnu.org; Thu, 02 Mar 2017 16:07:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cjXwX-0006t2-Iq for guix-patches@gnu.org; Thu, 02 Mar 2017 16:07:24 -0500 Received: from dd1012.kasserver.com ([85.13.128.8]:60888) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cjXwX-0006rW-CN for guix-patches@gnu.org; Thu, 02 Mar 2017 16:07:21 -0500 Received: from dayas.3.home (77.118.108.204.wireless.dyn.drei.com [77.118.108.204]) by dd1012.kasserver.com (Postfix) with ESMTPSA id F37C81CA111E; Thu, 2 Mar 2017 22:07:14 +0100 (CET) From: Danny Milosavljevic Date: Thu, 2 Mar 2017 22:07:10 +0100 Message-Id: <20170302210710.30212-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-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 (%rust-bootstrap-binaries-version): Update to 1.14.0. (%rust-bootstrap-binaries): Update to 1.14.0. (rustc): Update to 1.15.0. [arguments]: Pass "--disable-rustbuild" to configure. --- gnu/packages/rust.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index fb284102d..557a9c854 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.13.0") +(define %rust-bootstrap-binaries-version "1.14.0") (define %rust-bootstrap-binaries (origin @@ -55,7 +55,7 @@ "-i686-unknown-linux-gnu.tar.gz")) (sha256 (base32 - "0fcl7xgm2m21sjv1f27i3v692aa91lk8r867hl8d6l377w8k95r3")))) + "0h384prpabcl08mxs1bilyb0dbk0knpdylcnz4b84ij4idr7ap4d")))) (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 - "0srvmhhdbbcl21nzg9m9zni7k10h88lsy8k1ljz03g8mx79fv467")))) + "0wvn8m1nfg664b95qrdpfh72q1a6ir09rqkrnlzbkay2r7xf8mgn")))) (build-system gnu-build-system) (native-inputs `(("cmake" ,cmake) @@ -260,7 +260,7 @@ rustc-bootstrap and cargo-bootstrap packages.") "--release-channel=stable" "--enable-rpath" "--enable-local-rust" - ;;"--enable-rustbuild" + "--disable-rustbuild" "--disable-manage-submodules"))) ;; Rust uses a custom configure script (no autoconf). (zero? (apply system* "./configure" flags))))) From unknown Tue Jun 24 14:00:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25938: [PATCH] gnu: rust: Update to 1.15.0. Resent-From: ng0 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2017 21:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25938 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Danny Milosavljevic Cc: 25938@debbugs.gnu.org Received: via spool by 25938-submit@debbugs.gnu.org id=B25938.148849086510489 (code B ref 25938); Thu, 02 Mar 2017 21:42:02 +0000 Received: (at 25938) by debbugs.gnu.org; 2 Mar 2017 21:41:05 +0000 Received: from localhost ([127.0.0.1]:37020 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjYTB-0002j6-G8 for submit@debbugs.gnu.org; Thu, 02 Mar 2017 16:41:05 -0500 Received: from fragranza.investici.org ([178.175.144.26]:53048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjYT9-0002iy-8W for 25938@debbugs.gnu.org; Thu, 02 Mar 2017 16:41:03 -0500 Received: from [178.175.144.26] (fragranza [178.175.144.26]) (Authenticated sender: niasterisk@grrlz.net) by localhost (Postfix) with ESMTPSA id CE53A2C00FE; Thu, 2 Mar 2017 21:41:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cryptolab.net; s=stigmate; t=1488490862; bh=yLC9+pfK3adGGXbUS5EIB3W2EZPo7nKFJ59m4lOYPhA=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=jk9AM8CCsLhOgNj0JEFxfdJowh5gq6uQJ6VE3xCRyfXFLr1ERwHOWlh0qRV7B3rlo Ey8qE9wsaajsLJcgNsR0ighCYC2tgqQ+3h+PELhwFbxh+vy75unPV5R9ByIhSsqnDl NKU86l//48JGAlDHO1SncmvvoeGsfXJiTEsT/+Rc= Date: Thu, 2 Mar 2017 21:40:58 +0000 From: ng0 Message-ID: <20170302214058.fcnffgzp5oo7p7dt@abyayala> Mail-Followup-To: Danny Milosavljevic , 25938@debbugs.gnu.org References: <20170302210710.30212-1-dannym@scratchpost.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20170302210710.30212-1-dannym@scratchpost.org> X-Spam-Score: 0.0 (/) 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.0 (/) On 17-03-02 22:07:10, Danny Milosavljevic wrote: > * gnu/packages/rust.scm (%rust-bootstrap-binaries-version): Update to 1.14.0. > (%rust-bootstrap-binaries): Update to 1.14.0. > (rustc): Update to 1.15.0. > [arguments]: Pass "--disable-rustbuild" to configure. I'm just curious, why was this option disabled? > --- > gnu/packages/rust.scm | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm > index fb284102d..557a9c854 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.13.0") > +(define %rust-bootstrap-binaries-version "1.14.0") > > (define %rust-bootstrap-binaries > (origin > @@ -55,7 +55,7 @@ > "-i686-unknown-linux-gnu.tar.gz")) > (sha256 > (base32 > - "0fcl7xgm2m21sjv1f27i3v692aa91lk8r867hl8d6l377w8k95r3")))) > + "0h384prpabcl08mxs1bilyb0dbk0knpdylcnz4b84ij4idr7ap4d")))) > > (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 > - "0srvmhhdbbcl21nzg9m9zni7k10h88lsy8k1ljz03g8mx79fv467")))) > + "0wvn8m1nfg664b95qrdpfh72q1a6ir09rqkrnlzbkay2r7xf8mgn")))) > (build-system gnu-build-system) > (native-inputs > `(("cmake" ,cmake) > @@ -260,7 +260,7 @@ rustc-bootstrap and cargo-bootstrap packages.") > "--release-channel=stable" > "--enable-rpath" > "--enable-local-rust" > - ;;"--enable-rustbuild" > + "--disable-rustbuild" > "--disable-manage-submodules"))) > ;; Rust uses a custom configure script (no autoconf). > (zero? (apply system* "./configure" flags))))) > > > From unknown Tue Jun 24 14:00:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25938: [PATCH] gnu: rust: Update to 1.15.0. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2017 22:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25938 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: ng0 Cc: 25938@debbugs.gnu.org Received: via spool by 25938-submit@debbugs.gnu.org id=B25938.148849344414559 (code B ref 25938); Thu, 02 Mar 2017 22:25:01 +0000 Received: (at 25938) by debbugs.gnu.org; 2 Mar 2017 22:24:04 +0000 Received: from localhost ([127.0.0.1]:37056 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjZ8m-0003ml-Fh for submit@debbugs.gnu.org; Thu, 02 Mar 2017 17:24:04 -0500 Received: from dd1012.kasserver.com ([85.13.128.8]:49498) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjZ8l-0003md-2p for 25938@debbugs.gnu.org; Thu, 02 Mar 2017 17:24:03 -0500 Received: from localhost (77.118.108.204.wireless.dyn.drei.com [77.118.108.204]) by dd1012.kasserver.com (Postfix) with ESMTPSA id 348881CA0A55; Thu, 2 Mar 2017 23:24:01 +0100 (CET) Date: Thu, 2 Mar 2017 23:23:59 +0100 From: Danny Milosavljevic Message-ID: <20170302232359.13407f4d@scratchpost.org> In-Reply-To: <20170302214058.fcnffgzp5oo7p7dt@abyayala> References: <20170302210710.30212-1-dannym@scratchpost.org> <20170302214058.fcnffgzp5oo7p7dt@abyayala> 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-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 (/) > I'm just curious, why was this option disabled? No idea. It also had been disabled before. Now the default changed to enabled and so I just disable it again. From unknown Tue Jun 24 14:00:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25938: [PATCH] gnu: rust: Update to 1.15.0. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Mar 2017 22:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25938 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Danny Milosavljevic Cc: 25938@debbugs.gnu.org Received: via spool by 25938-submit@debbugs.gnu.org id=B25938.148849348614614 (code B ref 25938); Thu, 02 Mar 2017 22:25:02 +0000 Received: (at 25938) by debbugs.gnu.org; 2 Mar 2017 22:24:46 +0000 Received: from localhost ([127.0.0.1]:37059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjZ9Q-0003nd-O0 for submit@debbugs.gnu.org; Thu, 02 Mar 2017 17:24:46 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:60887) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjZ9Q-0003nX-3G for 25938@debbugs.gnu.org; Thu, 02 Mar 2017 17:24:44 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 02FC620934; Thu, 2 Mar 2017 17:24:44 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Thu, 02 Mar 2017 17:24:44 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=famulari.name; h= cc: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=mesmtp; bh=lhqZs18CEa8HMzPbKuaRU/gjf1U=; b=1qzIY+ f0o7xqWWwFx9VewFpVhD86PpqKzhLNelbL0DMTUZGIbx5SuylbnZGp0mb2AJc9S7 CAw+KZqpjIN2bZtT9Lq/6uI7aZrJBSfCnx5igfNMQdrArzzqEQDqmGVIJX3A738M 9QhFa8wGh3b0ESMqMmUO3fJRXz8jMDke7MBqM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc: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=smtpout; bh=lhqZs18CEa8HMz PbKuaRU/gjf1U=; b=ZfVaHH6CfqVu4ILndBm14PSsrrj5etq/7IO7laXXAOJGtX kdUMGm5bW2vz1RbioMjm8qvX51ba/gVbd8/JCbg0uIa3ZbMvGAeRKEQ4OIppd1h8 h/cM53wojjqG0k0usv6TZnG5ySK9hmBjvxxUo0lyM47K6YmGsU9q9d15qeLgo= X-ME-Sender: X-Sasl-enc: P5j9UwnMOPGG6jwM5uz/SCn9TTrvKR45WJzNBqRiM8un 1488493483 Received: from localhost (unknown [172.56.28.9]) by mail.messagingengine.com (Postfix) with ESMTPA id ABB6024242; Thu, 2 Mar 2017 17:24:43 -0500 (EST) Date: Thu, 2 Mar 2017 17:24:42 -0500 From: Leo Famulari Message-ID: <20170302222442.GB14266@jasmine> References: <20170302210710.30212-1-dannym@scratchpost.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170302210710.30212-1-dannym@scratchpost.org> User-Agent: Mutt/1.8.0 (2017-02-23) X-Spam-Score: -0.7 (/) 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 (/) On Thu, Mar 02, 2017 at 10:07:10PM +0100, Danny Milosavljevic wrote: > * gnu/packages/rust.scm (%rust-bootstrap-binaries-version): Update to 1.14.0. > (%rust-bootstrap-binaries): Update to 1.14.0. > (rustc): Update to 1.15.0. > [arguments]: Pass "--disable-rustbuild" to configure. Overall LGTM > "--release-channel=stable" > "--enable-rpath" > "--enable-local-rust" > - ;;"--enable-rustbuild" > + "--disable-rustbuild" > "--disable-manage-submodules"))) Same question as ng0 about what this does. It doesn't hurt to leave a brief comment for non-obvious configuration options. From unknown Tue Jun 24 14:00:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25938: [PATCH v2 0/2] Update rust to 1.15.0. References: <20170302210710.30212-1-dannym@scratchpost.org> In-Reply-To: <20170302210710.30212-1-dannym@scratchpost.org> Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Mar 2017 00:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25938 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 25938@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 25938-submit@debbugs.gnu.org id=B25938.1488501127650 (code B ref 25938); Fri, 03 Mar 2017 00:33:01 +0000 Received: (at 25938) by debbugs.gnu.org; 3 Mar 2017 00:32:07 +0000 Received: from localhost ([127.0.0.1]:37166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjb8g-0000AK-QI for submit@debbugs.gnu.org; Thu, 02 Mar 2017 19:32:07 -0500 Received: from dd1012.kasserver.com ([85.13.128.8]:54794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjb8f-0000AA-S8 for 25938@debbugs.gnu.org; Thu, 02 Mar 2017 19:32:06 -0500 Received: from dayas.3.home (77.118.108.204.wireless.dyn.drei.com [77.118.108.204]) by dd1012.kasserver.com (Postfix) with ESMTPSA id 4BF5A1CA05AA; Fri, 3 Mar 2017 01:32:04 +0100 (CET) From: Danny Milosavljevic Date: Fri, 3 Mar 2017 01:29:11 +0100 Message-Id: <20170303002913.9261-1-dannym@scratchpost.org> X-Mailer: git-send-email 2.12.0 X-Spam-Score: -0.7 (/) 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 (/) Danny Milosavljevic (2): gnu: rust: Update to 1.15.0. gnu: cargo: Use upstream cargo. gnu/packages/rust.scm | 523 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 513 insertions(+), 10 deletions(-) From unknown Tue Jun 24 14:00:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25938: [PATCH v2 1/2] gnu: rust: Update to 1.15.0. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Mar 2017 00:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25938 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 25938@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 25938-submit@debbugs.gnu.org id=B25938.1488501128661 (code B ref 25938); Fri, 03 Mar 2017 00:33:02 +0000 Received: (at 25938) by debbugs.gnu.org; 3 Mar 2017 00:32:08 +0000 Received: from localhost ([127.0.0.1]:37168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjb8i-0000AZ-2T for submit@debbugs.gnu.org; Thu, 02 Mar 2017 19:32:08 -0500 Received: from dd1012.kasserver.com ([85.13.128.8]:54799) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjb8g-0000AE-I2 for 25938@debbugs.gnu.org; Thu, 02 Mar 2017 19:32:06 -0500 Received: from dayas.3.home (77.118.108.204.wireless.dyn.drei.com [77.118.108.204]) by dd1012.kasserver.com (Postfix) with ESMTPSA id 877911CA1061; Fri, 3 Mar 2017 01:32:05 +0100 (CET) From: Danny Milosavljevic Date: Fri, 3 Mar 2017 01:29:12 +0100 Message-Id: <20170303002913.9261-2-dannym@scratchpost.org> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170303002913.9261-1-dannym@scratchpost.org> References: <20170303002913.9261-1-dannym@scratchpost.org> Tags: patch X-Spam-Score: -0.7 (/) 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 (%rust-bootstrap-binaries-version): Update to 1.14.0. (%rust-bootstrap-binaries): Update to 1.14.0. (rustc): Update to 1.15.0. [arguments]: Pass "--disable-rustbuild" to configure. --- gnu/packages/rust.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index fb284102d..96d7d7e94 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.13.0") +(define %rust-bootstrap-binaries-version "1.14.0") (define %rust-bootstrap-binaries (origin @@ -55,7 +55,7 @@ "-i686-unknown-linux-gnu.tar.gz")) (sha256 (base32 - "0fcl7xgm2m21sjv1f27i3v692aa91lk8r867hl8d6l377w8k95r3")))) + "0h384prpabcl08mxs1bilyb0dbk0knpdylcnz4b84ij4idr7ap4d")))) (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 - "0srvmhhdbbcl21nzg9m9zni7k10h88lsy8k1ljz03g8mx79fv467")))) + "0wvn8m1nfg664b95qrdpfh72q1a6ir09rqkrnlzbkay2r7xf8mgn")))) (build-system gnu-build-system) (native-inputs `(("cmake" ,cmake) @@ -260,7 +260,7 @@ rustc-bootstrap and cargo-bootstrap packages.") "--release-channel=stable" "--enable-rpath" "--enable-local-rust" - ;;"--enable-rustbuild" + "--disable-rustbuild" ; use Makefiles "--disable-manage-submodules"))) ;; Rust uses a custom configure script (no autoconf). (zero? (apply system* "./configure" flags))))) From unknown Tue Jun 24 14:00:20 2025 X-Loop: help-debbugs@gnu.org Subject: bug#25938: [PATCH v2 2/2] gnu: cargo: Use upstream cargo. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Mar 2017 00:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25938 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 25938@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 25938-submit@debbugs.gnu.org id=B25938.1488501130675 (code B ref 25938); Fri, 03 Mar 2017 00:33:02 +0000 Received: (at 25938) by debbugs.gnu.org; 3 Mar 2017 00:32:10 +0000 Received: from localhost ([127.0.0.1]:37171 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjb8k-0000Ao-9F for submit@debbugs.gnu.org; Thu, 02 Mar 2017 19:32:10 -0500 Received: from dd1012.kasserver.com ([85.13.128.8]:54803) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjb8i-0000Ab-GB for 25938@debbugs.gnu.org; Thu, 02 Mar 2017 19:32:09 -0500 Received: from dayas.3.home (77.118.108.204.wireless.dyn.drei.com [77.118.108.204]) by dd1012.kasserver.com (Postfix) with ESMTPSA id 586B01CA19B5; Fri, 3 Mar 2017 01:32:07 +0100 (CET) From: Danny Milosavljevic Date: Fri, 3 Mar 2017 01:29:13 +0100 Message-Id: <20170303002913.9261-3-dannym@scratchpost.org> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170303002913.9261-1-dannym@scratchpost.org> References: <20170303002913.9261-1-dannym@scratchpost.org> Tags: patch X-Spam-Score: -0.7 (/) 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 (cargo): Use upstream cargo. --- gnu/packages/rust.scm | 515 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 509 insertions(+), 6 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 96d7d7e94..efac79c51 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -288,15 +288,12 @@ safety and thread safety guarantees.") (version (cargo-version (rustc-version %rust-bootstrap-binaries-version))) (source (origin (method url-fetch) - ;; Use a cargo tarball with vendored dependencies and a cargo - ;; config file. - (uri (string-append - "https://github.com/dvc94ch/cargo" - "/archive/" version "-cargo-vendor.tar.gz")) + (uri (string-append "https://github.com/rust-lang/cargo/archive/" + version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0hpix5hwz10pm1wh65gimhsy9nxjvy7yikgbpw8afwglqr3bl856")))) + "194i06y9nql0p93gahh0vm4qwv6c1kpd9rprpf22w5gav9lpcyjz")))) (build-system cargo-build-system) (propagated-inputs `(("cmake" ,cmake) @@ -308,6 +305,483 @@ safety and thread safety guarantees.") ("openssl" ,openssl) ("python-2" ,python-2) ("zlib" ,zlib))) + (native-inputs + `(("rust-openssl" + ,(origin + (method url-fetch) + (uri (crate-uri "openssl" "0.9.1")) + (sha256 + (base32 + "1m2mhiar87qnw4gxci286q9g85ljafbc41salbj2hmcgh8aagchy")))) + ("rust-strsim" + ,(origin + (method url-fetch) + (uri (crate-uri "strsim" "0.5.1")) + (sha256 + (base32 + "0bj4fsm1l2yqbfpspyvjf9m3m50pskapcddzm0ji9c74jbgnkh2h")))) + ("rust-libc" + ,(origin + (method url-fetch) + (uri (crate-uri "libc" "0.2.18")) + (sha256 + (base32 + "0w5cghr0wx3hi2sclk8r9iyzlbxsakil87ada40q2ykyhky24655")))) + ("rust-bitflags" + ,(origin + (method url-fetch) + (uri (crate-uri "bitflags" "0.7.0")) + (sha256 + (base32 + "0v8hh6wdkpk9my8z8442g4hqrqf05h0qj53dsay6mv18lqvqklda")))) + ("rust-unicode-normalization" + ,(origin + (method url-fetch) + (uri (crate-uri "unicode-normalization" "0.1.2")) + (sha256 + (base32 + "0whi4xxqcjfsz6ywyrfd5lhgk1a44c86qwgvfqcmzidshcpklr16")))) + ("rust-rand" + ,(origin + (method url-fetch) + (uri (crate-uri "rand" "0.3.14")) + (sha256 + (base32 + "1984zvj8572ig28fz6idc4r96fx39h4lzmr07yf7kb7gdn6di497")))) + ("rust-gcc" + ,(origin + (method url-fetch) + (uri (crate-uri "gcc" "0.3.39")) + (sha256 + (base32 + "1q0idjvmhp6shkb9hqabh51rgfr8dqpi1xfmyzq7q8vgzybll7kp")))) + ("rust-tempdir" + ,(origin + (method url-fetch) + (uri (crate-uri "tempdir" "0.3.5")) + (sha256 + (base32 + "1mij45kgzflkja0h8q9avrik76h5a0b60m9hfd6k9yqxbiplm5w7")))) + ("rust-memchr" + ,(origin + (method url-fetch) + (uri (crate-uri "memchr" "0.1.11")) + (sha256 + (base32 + "084d85hjfa3xf5kwdms2mhbkh78m1gl2254cp5swcxj3a7xjkdnq")))) + ("rust-rustc-serialize" + ,(origin + (method url-fetch) + (uri (crate-uri "rustc-serialize" "0.3.21")) + (sha256 + (base32 + "064qmyr2508qf78dwcpiv25rfjp9h9vd0wrj4mmwgppjg4fgrydz")))) + ("rust-cmake" + ,(origin + (method url-fetch) + (uri (crate-uri "cmake" "0.1.19")) + (sha256 + (base32 + "0am8c8ns1h6b1a5x9z2r1m3rszvya5nccl2pzszzjv5aiiaydgcf")))) + ("rust-matches" + ,(origin + (method url-fetch) + (uri (crate-uri "matches" "0.1.4")) + (sha256 + (base32 + "1c8190j84hbicy8jwscw5icfam12j6lcxi02lvmadq9260p65mzg")))) + ("rust-winapi" + ,(origin + (method url-fetch) + (uri (crate-uri "winapi" "0.2.8")) + (sha256 + (base32 + "0yh816lh6lf56dpsgxy189c2ai1z3j8mw9si6izqb6wsjkbcjz8n")))) + ("rust-pkg-config" + ,(origin + (method url-fetch) + (uri (crate-uri "pkg-config" "0.3.8")) + (sha256 + (base32 + "1ypj4nj2z9z27qg06v3g40jyhw685i3l2wi098d21bvyri781vlc")))) + ("rust-libssh2-sys" + ,(origin + (method url-fetch) + (uri (crate-uri "libssh2-sys" "0.2.4")) + (sha256 + (base32 + "1pmmh0hcx14856wg9bp740yf618qfl2765vhf67sfs5lmf39227d")))) + ("rust-libz-sys" + ,(origin + (method url-fetch) + (uri (crate-uri "libz-sys" "1.0.10")) + (sha256 + (base32 + "1rl85x045sk5d345hgcahx99plpbdg2a3bx5vjfxig30qah74p4h")))) + ("rust-curl-sys" + ,(origin + (method url-fetch) + (uri (crate-uri "curl-sys" "0.3.6")) + (sha256 + (base32 + "0fi8kjz3f8m8vfazycs3ddm0h6j3x78hw78gwbvybx71129192i1")))) + ("rust-openssl-sys" + ,(origin + (method url-fetch) + (uri (crate-uri "openssl-sys" "0.9.1")) + (sha256 + (base32 + "1sdhgalfm2zdqf144xhdnxdha7ifjgsfbmlrqbx0j9f3mh4gpscm")))) + ("rust-fs2" + ,(origin + (method url-fetch) + (uri (crate-uri "fs2" "0.3.0")) + (sha256 + (base32 + "0lg57mgcm1r0m8jm4nqpcrl6lmxg8lj854k2h0r7qp46pphh2034")))) + ("rust-log" + ,(origin + (method url-fetch) + (uri (crate-uri "log" "0.3.6")) + (sha256 + (base32 + "0m40hgs3cg57dd5kk1mabfk6gk8z6l1cihar8akx4kmzz1xlk0xb")))) + ("rust-filetime" + ,(origin + (method url-fetch) + (uri (crate-uri "filetime" "0.1.10")) + (sha256 + (base32 + "08p9scgv30i1141cnp5xi4pqlnkfci455nrpca55df1r867anqsk")))) + ("rust-tar" + ,(origin + (method url-fetch) + (uri (crate-uri "tar" "0.4.9")) + (sha256 + (base32 + "1vi3nl8s3jjf5l20ni47gmh1p4bdjfh7q50fbg7izzqrf7i4i40c")))) + ("rust-glob" + ,(origin + (method url-fetch) + (uri (crate-uri "glob" "0.2.11")) + (sha256 + (base32 + "1ysvi72slkw784fcsymgj4308c3y03gwjjzqxp80xdjnkbh8vqcb")))) + ("rust-cfg-if" + ,(origin + (method url-fetch) + (uri (crate-uri "cfg-if" "0.1.0")) + (sha256 + (base32 + "137qikjcal4h75frzcn6mknygqk8vy5bva7w851aydb5gc6pc7ny")))) + ("rust-winapi-build" + ,(origin + (method url-fetch) + (uri (crate-uri "winapi-build" "0.1.1")) + (sha256 + (base32 + "1g4rqsgjky0a7530qajn2bbfcrl2v0zb39idgdws9b1l7gp5wc9d")))) + ("rust-advapi32-sys" + ,(origin + (method url-fetch) + (uri (crate-uri "advapi32-sys" "0.2.0")) + (sha256 + (base32 + "16largvlrd1800vvdchml0ngnszjlnpqm01rcz5hm7di1h48hrg0")))) + ("rust-gdi32-sys" + ,(origin + (method url-fetch) + (uri (crate-uri "gdi32-sys" "0.2.0")) + (sha256 + (base32 + "0605d4ngjsspghwjv4jicajich1gnl0aik9f880ajjzjixd524h9")))) + ("rust-ws2_32-sys" + ,(origin + (method url-fetch) + (uri (crate-uri "ws2_32-sys" "0.2.1")) + (sha256 + (base32 + "0ppscg5qfqaw0gzwv2a4nhn5bn01ff9iwn6ysqnzm4n8s3myz76m")))) + ("rust-user32-sys" + ,(origin + (method url-fetch) + (uri (crate-uri "user32-sys" "0.2.0")) + (sha256 + (base32 + "0ivxc7hmsxax9crdhxdd1nqwik4s9lhb2x59lc8b88bv20fp3x2f")))) + ("rust-unicode-bidi" + ,(origin + (method url-fetch) + (uri (crate-uri "unicode-bidi" "0.2.3")) + (sha256 + (base32 + "0gqbyf6slkgzr14nf6v8dw8a19l5snh6bpms8bpfvzpxdawwxxy1")))) + ("rust-net2" + ,(origin + (method url-fetch) + (uri (crate-uri "net2" "0.2.26")) + (sha256 + (base32 + "1qp3q6xynb481rsp3ig1nmqb6qlxfba3shfrmqij88cppsv9rpsy")))) + ("rust-utf8-ranges" + ,(origin + (method url-fetch) + (uri (crate-uri "utf8-ranges" "0.1.3")) + (sha256 + (base32 + "03xf604b2v51ag3jgzw92l97xnb10kw9zv948bhc7ja1ik017jm1")))) + ("rust-crossbeam" + ,(origin + (method url-fetch) + (uri (crate-uri "crossbeam" "0.2.10")) + (sha256 + (base32 + "15wga0kvk3iqf3l077957j931brf1pl3p74xibd698jccqas4phc")))) + ("rust-toml" + ,(origin + (method url-fetch) + (uri (crate-uri "toml" "0.2.1")) + (sha256 + (base32 + "1d1cz43bxrx4fd6j2p6myckf81f72bp47akg36y3flxjkhj60svk")))) + ("rust-aho-corasick" + ,(origin + (method url-fetch) + (uri (crate-uri "aho-corasick" "0.5.3")) + (sha256 + (base32 + "0rnvdmlajikq0i4zdy1p3pv699q6apvsxfc7av7byhppllp2r5ya")))) + ("rust-psapi-sys" + ,(origin + (method url-fetch) + (uri (crate-uri "psapi-sys" "0.1.0")) + (sha256 + (base32 + "0y14g8qshsfnmb7nk2gs1rpbrs1wrggajmzp4yby4q6k0wd5vkdb")))) + ("rust-idna" + ,(origin + (method url-fetch) + (uri (crate-uri "idna" "0.1.0")) + (sha256 + (base32 + "049c2rmlydrrrgrxdaq2v21adx9vkfh6k9x4xj56ckyf01p26lqh")))) + ("rust-url" + ,(origin + (method url-fetch) + (uri (crate-uri "url" "1.2.3")) + (sha256 + (base32 + "1myr1i8djbl2bhvvrm6n3h7bj7sl6kh5dmaaz2f7c6x8hyyzgk28")))) + ("rust-regex-syntax" + ,(origin + (method url-fetch) + (uri (crate-uri "regex-syntax" "0.3.9")) + (sha256 + (base32 + "0ms9hgdhhsxw9w920i7gipydvagf100bb56jbs192rz86ln01v7r")))) + ("rust-kernel32-sys" + ,(origin + (method url-fetch) + (uri (crate-uri "kernel32-sys" "0.2.2")) + (sha256 + (base32 + "1389av0601a9yz8dvx5zha9vmkd6ik7ax0idpb032d28555n41vm")))) + ("rust-term" + ,(origin + (method url-fetch) + (uri (crate-uri "term" "0.4.4")) + (sha256 + (base32 + "0jpr7jb1xidadh0arklwr99r8w1k1dfc4an3ginpsq5nnfigivrx")))) + ("rust-thread-id" + ,(origin + (method url-fetch) + (uri (crate-uri "thread-id" "2.0.0")) + (sha256 + (base32 + "00zzs2bx1xw8aqm5plqqgr7bc2zz6zkqrdxq8vpiqb8hc2srslx9")))) + ("rust-thread_local" + ,(origin + (method url-fetch) + (uri (crate-uri "thread_local" "0.2.7")) + (sha256 + (base32 + "1mgxikqvhpsic6xk7pan95lvgsky1sdxzw2w5m2l35pgrazxnxl5")))) + ("rust-miow" + ,(origin + (method url-fetch) + (uri (crate-uri "miow" "0.1.3")) + (sha256 + (base32 + "16jvfjsp6fr4mbd2sw5hcdmi4dsa0m0aa45gjz78mb1h4mwcdgym")))) + ("rust-regex" + ,(origin + (method url-fetch) + (uri (crate-uri "regex" "0.1.80")) + (sha256 + (base32 + "0bs036h3vzc6pj5jj4vc909s9rppq7b808ic99qn0y6gm3karm2g")))) + ("rust-num_cpus" + ,(origin + (method url-fetch) + (uri (crate-uri "num_cpus" "1.1.0")) + (sha256 + (base32 + "1bfwcn3yhwa31rinjw9yr7b6gvn6c06hnwnjz06pvm938w4fd448")))) + ("rust-libgit2-sys" + ,(origin + (method url-fetch) + (uri (crate-uri "libgit2-sys" "0.6.5")) + (sha256 + (base32 + "0yl80n12ih4jh1halpbj3zqlqvw5zxdr6m6xdcvdz67svjy50bjh")))) + ("rust-env_logger" + ,(origin + (method url-fetch) + (uri (crate-uri "env_logger" "0.3.5")) + (sha256 + (base32 + "0bvcjgkw4s3k1rd7glpflgc8s9a393zjd6jfdgvs8gjvwj0dgaqm")))) + ("rust-openssl-probe" + ,(origin + (method url-fetch) + (uri (crate-uri "openssl-probe" "0.1.0")) + (sha256 + (base32 + "0689h6rhzy6dypqr90lsxnf108nsnh952wsx7ggs70s48b44jvbm")))) + ("rust-lazy_static" + ,(origin + (method url-fetch) + (uri (crate-uri "lazy_static" "0.2.2")) + (sha256 + (base32 + "16z1h7w702sxnscak38jykxlhxq0b5ip4mndlb46pkaqwzi0xgka")))) + ("rust-semver-parser" + ,(origin + (method url-fetch) + (uri (crate-uri "semver-parser" "0.6.1")) + (sha256 + (base32 + "1s8s7a7yg8xhgci17y0xhyyncg229byivhpr0wbs3ljdlyjl73p8")))) + ("rust-semver" + ,(origin + (method url-fetch) + (uri (crate-uri "semver" "0.5.1")) + (sha256 + (base32 + "1xbiv8l72rmngb3lgbmk3vd4lalcbzxcnrn085c2b75irl7gcbxf")))) + ("rust-docopt" + ,(origin + (method url-fetch) + (uri (crate-uri "docopt" "0.6.86")) + (sha256 + (base32 + "1nf4f4zf5yk0d0l4kl7hkii4na22fhn0l2hgfb46yzv08l2g6zja")))) + ("rust-miniz-sys" + ,(origin + (method url-fetch) + (uri (crate-uri "miniz-sys" "0.1.7")) + (sha256 + (base32 + "0m7dlggsxash0k5jkx576p556g9r8vnhyl9244gjxhq1g8rls7wx")))) + ("rust-curl" + ,(origin + (method url-fetch) + (uri (crate-uri "curl" "0.4.1")) + (sha256 + (base32 + "1b0y27b6vpqffgzm2kxc1s2i6bgdzxk3wn65g2asbcdxrvys3mcg")))) + ("rust-flate2" + ,(origin + (method url-fetch) + (uri (crate-uri "flate2" "0.2.14")) + (sha256 + (base32 + "1fx3zsls5bb1zfx87s5sxkgk853z4nhjsbvq5s6if13kjlg4isry")))) + ("rust-git2" + ,(origin + (method url-fetch) + (uri (crate-uri "git2" "0.6.3")) + (sha256 + (base32 + "06b1bw3pwszs8617xn8js6h0j983qjgfwsychw33lshccj3cld05")))) + ("rust-crates-io" + ,(origin + (method url-fetch) + (uri (crate-uri "crates-io" "0.4.0")) + (sha256 + (base32 + "0kk6abp1qbpv44hkq1yjp7xgpzjzafs83i1l26ycr0aph1gbwig9")))) + ("rust-git2-curl" + ,(origin + (method url-fetch) + (uri (crate-uri "git2-curl" "0.7.0")) + (sha256 + (base32 + "13mzqp4rd81zp78261rlq23iw9aaysdr56484y1yy2xzhk3nnrv8")))) + ("rust-bufstream" + ,(origin + (method url-fetch) + (uri (crate-uri "bufstream" "0.1.2")) + (sha256 + (base32 + "0x6h27md1fwabbhbycfldj0wklrpjr520z9p0cpzm60fzzidnj3v")))) + ("rust-hamcrest" + ,(origin + (method url-fetch) + (uri (crate-uri "hamcrest" "0.1.1")) + (sha256 + (base32 + "1m49rf7bnkx0qxja56slrjh44zi4z5bjz5x4pblqjw265828y25z")))) + ("rust-num" + ,(origin + (method url-fetch) + (uri (crate-uri "num" "0.1.36")) + (sha256 + (base32 + "081i1r3mdz6jasqd7qwraqqfqa3sdpvdvxl1xq0s7ip714xw1rxx")))) + ("rust-num-traits" + ,(origin + (method url-fetch) + (uri (crate-uri "num-traits" "0.1.36")) + (sha256 + (base32 + "07688sp4z40p14lh5ywvrpm4zq8kcxzhjks8sg33jsr5da2l4sm1")))) + ("rust-num-integer" + ,(origin + (method url-fetch) + (uri (crate-uri "num-integer" "0.1.32")) + (sha256 + (base32 + "14pvaaawl0pgdcgh4dfdd67lz58yxlfl95bry86h28pjnfzxj97v")))) + ("rust-num-bigint" + ,(origin + (method url-fetch) + (uri (crate-uri "num-bigint" "0.1.35")) + (sha256 + (base32 + "0jayfkdm33p4zvcahlv46zdfhlzg053mpw32abf2lz0z8xw47cc8")))) + ("rust-num-rational" + ,(origin + (method url-fetch) + (uri (crate-uri "num-rational" "0.1.35")) + (sha256 + (base32 + "1bwaygv64qg7i78yqg0v4d0amfhamj598rpy4yxjz9rlhcxn1zsl")))) + ("rust-num-iter" + ,(origin + (method url-fetch) + (uri (crate-uri "num-iter" "0.1.32")) + (sha256 + (base32 + "0p74nj5c1mc33h9lx4wpmlmggmn5lnkhxv1225g0aix8d6ciqyi8")))) + ("rust-num-complex" + ,(origin + (method url-fetch) + (uri (crate-uri "num-complex" "0.1.35")) + (sha256 + (base32 + "0bzrjfppnnzf9vmkpklhp2dw9sb1lqzydb8r6k83z76i9l2qxizh")))))) (arguments `(#:cargo ,cargo-bootstrap #:tests? #f ; FIXME @@ -317,12 +791,41 @@ safety and thread safety guarantees.") (delete 'patch-source-shebangs) (delete 'patch-generated-file-shebangs) (delete 'patch-usr-bin-file) + (add-after 'unpack 'unpack-submodule-sources + (lambda* (#:key inputs #:allow-other-keys) + (let ((unpack (lambda (source target) + (mkdir-p target) + (with-directory-excursion target + (zero? (system* "tar" "xf" + source + "--strip-components=1")))))) + (mkdir "vendor") + (for-each (lambda (p) + (let ((name (car p))) + (if (string-prefix? "rust-" name) + (let ((rsrc (string-append "vendor/" + (string-drop name + (string-length "rust-"))))) + (unpack (assoc-ref inputs name) rsrc) + (system* "touch" (string-append rsrc "/.cargo-ok")) + (generate-checksums rsrc (assoc-ref inputs name)))))) inputs)))) ;; Set CARGO_HOME to use the vendored dependencies. (add-after 'unpack 'set-cargo-home (lambda* (#:key inputs #:allow-other-keys) (let* ((gcc (assoc-ref inputs "gcc")) (cc (string-append gcc "/bin/gcc"))) + (mkdir "cargohome") (setenv "CARGO_HOME" (string-append (getcwd) "/cargohome")) + (call-with-output-file "cargohome/config" + (lambda (p) + (format p " +[source.crates-io] +registry = 'https://github.com/rust-lang/crates.io-index' +replace-with = 'vendored-sources' + +[source.vendored-sources] +directory = 'vendor' +"))) (setenv "CMAKE_C_COMPILER" cc) (setenv "CC" cc)) #t))))) From unknown Tue Jun 24 14:00:20 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Danny Milosavljevic Subject: bug#25938: closed (rust update to 1.15.0 pushed to master as 19f8e6e3ed6c41e2469f2b7320eae5d1fefdbf54) Message-ID: References: <20170317164817.40260cee@scratchpost.org> <20170302210710.30212-1-dannym@scratchpost.org> X-Gnu-PR-Message: they-closed 25938 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 25938@debbugs.gnu.org Date: Fri, 17 Mar 2017 15:49:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1489765742-8317-1" This is a multi-part message in MIME format... ------------=_1489765742-8317-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #25938: [PATCH] gnu: rust: Update to 1.15.0. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 25938@debbugs.gnu.org. --=20 25938: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D25938 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1489765742-8317-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 25938-done) by debbugs.gnu.org; 17 Mar 2017 15:48:22 +0000 Received: from localhost ([127.0.0.1]:32785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cou74-00028i-2m for submit@debbugs.gnu.org; Fri, 17 Mar 2017 11:48:22 -0400 Received: from dd1012.kasserver.com ([85.13.128.8]:45741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cou72-00028Z-09 for 25938-done@debbugs.gnu.org; Fri, 17 Mar 2017 11:48:20 -0400 Received: from localhost (178.113.165.41.wireless.dyn.drei.com [178.113.165.41]) by dd1012.kasserver.com (Postfix) with ESMTPSA id 447261CA003A for <25938-done@debbugs.gnu.org>; Fri, 17 Mar 2017 16:48:18 +0100 (CET) Date: Fri, 17 Mar 2017 16:48:17 +0100 From: Danny Milosavljevic To: 25938-done@debbugs.gnu.org Subject: rust update to 1.15.0 pushed to master as 19f8e6e3ed6c41e2469f2b7320eae5d1fefdbf54 Message-ID: <20170317164817.40260cee@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: 25938-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 (/) rust update to 1.15.0 pushed to master as 19f8e6e3ed6c41e2469f2b7320eae5d1fefdbf54. Closing bugreport. ------------=_1489765742-8317-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 2 Mar 2017 21:07:33 +0000 Received: from localhost ([127.0.0.1]:36998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjXwi-0001sq-U0 for submit@debbugs.gnu.org; Thu, 02 Mar 2017 16:07:33 -0500 Received: from eggs.gnu.org ([208.118.235.92]:33458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cjXwi-0001sb-38 for submit@debbugs.gnu.org; Thu, 02 Mar 2017 16:07:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cjXwb-0006uq-Uy for submit@debbugs.gnu.org; Thu, 02 Mar 2017 16:07:26 -0500 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]:55918) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cjXwb-0006um-SA for submit@debbugs.gnu.org; Thu, 02 Mar 2017 16:07:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjXwa-0001gP-O0 for guix-patches@gnu.org; Thu, 02 Mar 2017 16:07:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cjXwX-0006t2-Iq for guix-patches@gnu.org; Thu, 02 Mar 2017 16:07:24 -0500 Received: from dd1012.kasserver.com ([85.13.128.8]:60888) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cjXwX-0006rW-CN for guix-patches@gnu.org; Thu, 02 Mar 2017 16:07:21 -0500 Received: from dayas.3.home (77.118.108.204.wireless.dyn.drei.com [77.118.108.204]) by dd1012.kasserver.com (Postfix) with ESMTPSA id F37C81CA111E; Thu, 2 Mar 2017 22:07:14 +0100 (CET) From: Danny Milosavljevic To: guix-patches@gnu.org Subject: [PATCH] gnu: rust: Update to 1.15.0. Date: Thu, 2 Mar 2017 22:07:10 +0100 Message-Id: <20170302210710.30212-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 (%rust-bootstrap-binaries-version): Update to 1.14.0. (%rust-bootstrap-binaries): Update to 1.14.0. (rustc): Update to 1.15.0. [arguments]: Pass "--disable-rustbuild" to configure. --- gnu/packages/rust.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index fb284102d..557a9c854 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.13.0") +(define %rust-bootstrap-binaries-version "1.14.0") (define %rust-bootstrap-binaries (origin @@ -55,7 +55,7 @@ "-i686-unknown-linux-gnu.tar.gz")) (sha256 (base32 - "0fcl7xgm2m21sjv1f27i3v692aa91lk8r867hl8d6l377w8k95r3")))) + "0h384prpabcl08mxs1bilyb0dbk0knpdylcnz4b84ij4idr7ap4d")))) (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 - "0srvmhhdbbcl21nzg9m9zni7k10h88lsy8k1ljz03g8mx79fv467")))) + "0wvn8m1nfg664b95qrdpfh72q1a6ir09rqkrnlzbkay2r7xf8mgn")))) (build-system gnu-build-system) (native-inputs `(("cmake" ,cmake) @@ -260,7 +260,7 @@ rustc-bootstrap and cargo-bootstrap packages.") "--release-channel=stable" "--enable-rpath" "--enable-local-rust" - ;;"--enable-rustbuild" + "--disable-rustbuild" "--disable-manage-submodules"))) ;; Rust uses a custom configure script (no autoconf). (zero? (apply system* "./configure" flags))))) ------------=_1489765742-8317-1--