From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mGJdIKXvomGVVwAAgWs5BA (envelope-from ) for ; Sun, 28 Nov 2021 03:55:33 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id CH8MHKXvomHCVQAA1q6Kng (envelope-from ) for ; Sun, 28 Nov 2021 02:55:33 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 24D022AD5 for ; Sun, 28 Nov 2021 03:55:33 +0100 (CET) Received: from localhost ([::1]:45994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrALk-0008Kj-8A for larch@yhetil.org; Sat, 27 Nov 2021 21:55:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrALG-0008Ic-Ut for guix-patches@gnu.org; Sat, 27 Nov 2021 21:55:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51466) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mrALG-0006g6-ME for guix-patches@gnu.org; Sat, 27 Nov 2021 21:55:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mrALG-0000pm-Lc for guix-patches@gnu.org; Sat, 27 Nov 2021 21:55:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52153] [PATCH v2] Fix mistakes, and update cargo Resent-From: "(unmatched-parenthesis" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Nov 2021 02:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52153 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52153@debbugs.gnu.org Cc: "\(unmatched-parenthesis" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16380680793156 (code B ref -1); Sun, 28 Nov 2021 02:55:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Nov 2021 02:54:39 +0000 Received: from localhost ([127.0.0.1]:34775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mrAKs-0000om-7A for submit@debbugs.gnu.org; Sat, 27 Nov 2021 21:54:39 -0500 Received: from lists.gnu.org ([209.51.188.17]:51880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mr6V9-0002FN-Me for submit@debbugs.gnu.org; Sat, 27 Nov 2021 17:49:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mr6V9-0000y8-GQ for guix-patches@gnu.org; Sat, 27 Nov 2021 17:48:59 -0500 Received: from knopi.disroot.org ([178.21.23.139]:54662) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mr6V6-0005VB-Oh for guix-patches@gnu.org; Sat, 27 Nov 2021 17:48:59 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7DC8A7BA3A; Sat, 27 Nov 2021 23:48:51 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OQTA1EX2wjH1; Sat, 27 Nov 2021 23:48:50 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1638053328; bh=CH+fUPK69ArQTNav7wzBXuSQ5/zyiVhZ+ye8ane4On4=; h=From:To:Cc:Subject:Date; b=ToeG0BsqsHA8zKWwP+Z0qKOPcpMtuATLwaAmA0KrWqPkFlA876fFNzJqai0SnmP+N m/P6mNtHoKd6xM25brkUbqsr4SyrxYa6n1DrQW4is/OB2P2sRy/jXJDK85wNw1y8Gd rYX3thwVFNPdWU5BbjxFYPUImeXC89LJ/rE1x+GWZPgjLUN6c7s1WF2DbMzpmfWW/g 5zxWabCtsmDYXQTLv+e0IiFoVgEI2CGIDBc2p++hNvYL2xGmhESBCHqEKA8bkyVZLJ Misqcn8blOarhr8dqOlSEfy3xt4qgm/GQqYuydTr5vrQvZirxcw9xBS+rLIK6Knix5 KFEdm7QT+WjCg== Date: Sat, 27 Nov 2021 22:48:41 +0000 Message-Id: <20211127224841.32146-1-paren@disroot.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=paren@disroot.org; helo=knopi.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 27 Nov 2021 21:54:37 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: "\(unmatched-parenthesis" X-ACL-Warn: , "\(unmatched-parenthesis via Guix-patches" From: "\(unmatched-parenthesis via Guix-patches" via X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1638068133; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=GeiI5yV96wBguwkIP0QSvyJvwnsKAAywMSreDBCUxqI=; b=IVUFCU3LsvsTybUYay6U+UcjgwaVfHIQ+P+6XotAPqmnEIRfL+PxGOOOYTZi9KJw6d69hO ftRTc55T79ALd2Jw6tOL7J+z/LwBMuL/cBxAui97IiZPIRCzHKY4jgwtPBdCREkOpJ5zje idpdNqPUlewv7Y2ZzD6Czn/c75u96fpIHO6i2OaICbZlX0qIxzb9smAjPqsiwPiP1M8LRk UfbO3pOWYug9S5TsSMoKbrp7l/9dWA4jNYDgqfgHgYgY/DM0M1Pab5MZTFUdHXLRgAoB+s wBRR/3DcdCrQoYuG/uCADaXV9bJ35gT5b0SZl1feW4pQem3DevAiHCMkx8FINQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1638068133; a=rsa-sha256; cv=none; b=j1i8yqfI3KTYKnLn/W+jqB9zmt1u2for/wgh1Hmln6R7Fz6rEMkqx6D5fvWrpTxfDPMLUq LNwCzqMIytQBcSC0lc+r4sSnXzG34XCX9dmoNkz4CdfuG8K3vDh4oZiZruk5eypC/DbQzK m2slpH+xb7aSRpDENG6oeR/zIEeBeLAg8ildfBCLQSQUWKpufDLr9KjFpwHbZxh4YUW2FU hqbH/zypuCDaGDNjNo8l2GjgdQMJ1jsU9M5Af7pU6AUNYtbQbJFVgIV5mGweIwazPwJfu0 gUuX+RWsJJJB+H0/620QFRmxhTW0JWhyl6WK7csWcs1zCH91pEE5TtT3doXKlg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=ToeG0Bsq; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.10 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=ToeG0Bsq; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 24D022AD5 X-Spam-Score: -3.10 X-Migadu-Scanner: scn0.migadu.com X-TUID: /1dxaFB2TZh7 Please disregard the original patch. This one updates cargo along with rustc. --- gnu/packages/crates-io.scm | 89 ++++++++++++++++++++++++++++++++++++++ gnu/packages/rust.scm | 11 ++++- 2 files changed, 99 insertions(+), 1 deletion(-) mode change 100644 => 100755 gnu/packages/rust.scm diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b8c4c7bd39..d8c457182c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8134,6 +8134,95 @@ (define-public rust-caps-0.3 ("rust-error-chain" ,rust-error-chain-0.12) ("rust-libc" ,rust-libc-0.2)))))) +(define-public rust-cargo-0.57 + (package + (name "rust-cargo") + (version "0.57.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cargo" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "12ns9v4dd8vnvsaqgd897h2zc19w00i5ii3slda653zbhfzm6zna")))) + (build-system cargo-build-system) + (arguments + `(;; The test suite is disabled as the internal 'cargo-test-macro' and + ;; 'cargo-test-support' crates are not included in the release. + #:tests? #f + #:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-atty" ,rust-atty-0.2) + ("rust-bytesize" ,rust-bytesize-1) + ("rust-cargo-platform" ,rust-cargo-platform-0.1) + ("rust-clap" ,rust-clap-2) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-crates-io" ,rust-crates-io-0.33) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) + ("rust-crypto-hash" ,rust-crypto-hash-0.3) + ("rust-curl" ,rust-curl-0.4) + ("rust-curl-sys" ,rust-curl-sys-0.4) + ("rust-env-logger" ,rust-env-logger-0.8) + ("rust-filetime" ,rust-filetime-0.2) + ("rust-flate2" ,rust-flate2-1) + ("rust-flate2" ,rust-flate2-1) + ("rust-fwdansi" ,rust-fwdansi-1) + ("rust-git2" ,rust-git2-0.13) + ("rust-git2-curl" ,rust-git2-curl-0.14) + ("rust-glob" ,rust-glob-0.3) + ("rust-hex" ,rust-hex-0.4) + ("rust-home" ,rust-home-0.5) + ("rust-humantime" ,rust-humantime-2) + ("rust-ignore" ,rust-ignore-0.4) + ("rust-im-rc" ,rust-im-rc-15) + ("rust-jobserver" ,rust-jobserver-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-lazycell" ,rust-lazycell-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-libgit2-sys" ,rust-libgit2-sys-0.12) + ("rust-log" ,rust-log-0.4) + ("rust-memchr" ,rust-memchr-2) + ("rust-miow" ,rust-miow-0.3) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-opener" ,rust-opener-0.4) + ("rust-openssl" ,rust-openssl-0.10) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4) + ("rust-rand" ,rust-rand-0.8) + ("rust-rustc-workspace-hack" ,rust-rustc-workspace-hack-1) + ("rust-rustfix" ,rust-rustfix-0.5) + ("rust-same-file" ,rust-same-file-1) + ("rust-semver" ,rust-semver-0.10) + ("rust-serde" ,rust-serde-1) + ("rust-serde-ignored" ,rust-serde-ignored-0.1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-shell-escape" ,rust-shell-escape-0.1) + ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1) + ("rust-tar" ,rust-tar-0.4) + ("rust-tar" ,rust-tar-0.4) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-termcolor" ,rust-termcolor-1) + ("rust-toml" ,rust-toml-0.5) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-unicode-xid" ,rust-unicode-xid-0.2) + ("rust-url" ,rust-url-2) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-winapi" ,rust-winapi-0.3)))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("curl" ,curl) + ("libssh2" ,libssh2) + ("openssl" ,openssl) + ("zlib" ,zlib))) + (home-page "https://crates.io") + (synopsis "Package manager for Rust") + (description "Cargo, a package manager for Rust. This package provides +the library crate of Cargo.") + (license (list license:expat license:asl2.0)))) + (define-public rust-cargo-0.53 (package (name "rust-cargo") diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm old mode 100644 new mode 100755 index f7f05851f1..a1f3d757cd --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020 Pierre Langlois ;;; Copyright © 2020 Matthew James Kraai ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 (unmatched parenthesis ;;; ;;; This file is part of GNU Guix. ;;; @@ -769,8 +770,16 @@ (define rust-1.54 `("procps" ,procps) (package-native-inputs base-rust)))))) +(define rust-1.55 + (rust-bootstrapped-package + rust-1.54 "1.55.0" "07l28f7grdmi65naq71pbmvdd61hwcpi40ry7kp7dy7m233rldxj")) + +(define rust-1.56 + (rust-bootstrapped-package + rust-1.55 "1.56.1" "04cmqx7nn63hzz7z27b2b0dj2qx18rck9ifvip43s6dampx8v2f3")) + ;;; Note: Only the latest versions of Rust are supported and tested. The ;;; intermediate rusts are built for bootstrapping purposes and should not ;;; be relied upon. This is to ease maintenance and reduce the time ;;; required to build the full Rust bootstrap chain. -(define-public rust rust-1.54) +(define-public rust rust-1.56) -- 2.34.0