From patchwork Mon Mar 21 20:59:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Alesius X-Patchwork-Id: 37988 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EEF4327BBEB; Mon, 21 Mar 2022 21:01:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1502F27BBEA for ; Mon, 21 Mar 2022 21:01:14 +0000 (GMT) Received: from localhost ([::1]:52528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nWP9N-0000Jr-6C for patchwork@mira.cbaines.net; Mon, 21 Mar 2022 17:01:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nWP9C-0000Ja-QL for guix-patches@gnu.org; Mon, 21 Mar 2022 17:01:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44652) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nWP9C-00059e-3h for guix-patches@gnu.org; Mon, 21 Mar 2022 17:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nWP9C-0001x5-2X for guix-patches@gnu.org; Mon, 21 Mar 2022 17:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54509] rust-cargo: Update to 0.60.0 to support Edition2021 projects Resent-From: Paul Alesius Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Mar 2022 21:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54509 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Maxime Devos , 54509@debbugs.gnu.org Received: via spool by 54509-submit@debbugs.gnu.org id=B54509.16478964167434 (code B ref 54509); Mon, 21 Mar 2022 21:01:02 +0000 Received: (at 54509) by debbugs.gnu.org; 21 Mar 2022 21:00:16 +0000 Received: from localhost ([127.0.0.1]:38549 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWP8R-0001vo-3Q for submit@debbugs.gnu.org; Mon, 21 Mar 2022 17:00:16 -0400 Received: from mail-yb1-f179.google.com ([209.85.219.179]:36450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nWP8O-0001uR-Pu for 54509@debbugs.gnu.org; Mon, 21 Mar 2022 17:00:13 -0400 Received: by mail-yb1-f179.google.com with SMTP id f38so30340342ybi.3 for <54509@debbugs.gnu.org>; Mon, 21 Mar 2022 14:00:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unnservice-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=a5188BA35BAPWUUnOZVfA+PIBvPcSqOnYOw7SKZg1xM=; b=KTdgaaGa1IB3fj4R5CMw9x+GkPvvWzmRyulzJ/nCzW7+xy5HGQ5ISXAVNhpWlaseXE P4S0ppU0jvoB3UlkEqjeOLOjM8sSGNjRP4r2rpoAYDI3bWGgWXLInCqQ+dDyVjQqvR5z tT7/ASu+O/zVHrQzKtIgnzPelqJZsBzEahtu83xOHb4kAN5ZwzN6+zdiqHjupzoHVoA9 35F3de/4/6BBoUapzhBWBGL7wysIbOY8dl5k1x9gnfBjIwN20GwERfl49j34O3dHWgFt ptXx+Ke++PaVqZEc4kUDY+LCSiZK49VaI76Oaor1hJU/4bVl7lr1GPJq50zzV9PduZMj Lh4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=a5188BA35BAPWUUnOZVfA+PIBvPcSqOnYOw7SKZg1xM=; b=g34K6l1n9g7BSwj1QKWM62ZHkGMJaXdEY8EhB1pEFnPGIfSXLn81mItTl7KYIOkV9L jPTdKuPOyvFIYVJfBeIAo48kqCu7tvQgQbRUNctspXViGSQFbpAskZWRGJ0MZT8O02Ix GxeWzdEEKHDw6Ilo/728E7WDsoxymnXz0I5Pfa4q+zbxog9ykLeNl09ydJYgcYLzW58V 2naL3bE+4Xh5jdJCWS1hKRgeZbksP6GnG0QnUnNIAqIKVemv1KMvqBenty6eIzSHg5BE GSeaQYX2y+IlFGQrlvrvboZJmA/tVK5iH+5JtStbYtCsRjCeUXu22fSLqc/2pQ/LElnQ KjFg== X-Gm-Message-State: AOAM531Cg8pdFlW0J5nGq1Vs7dRFee4IcE3JUyWVdWulwHCYzihGBqHw S2FoHFXbmOXUsOYcrDl6BvwC3S8yyK7/BOHWgTwG X-Google-Smtp-Source: ABdhPJw1kQLwxqzMP17aPrEng0Zrw6tCZl8cRJO+i/xQsfhkwxqiBtASn0voe6dz5WGAQ2CdqLnfGyZCk8qvHC4kLKQ= X-Received: by 2002:a25:83c7:0:b0:633:b8e6:a120 with SMTP id v7-20020a2583c7000000b00633b8e6a120mr16914895ybm.158.1647896406878; Mon, 21 Mar 2022 14:00:06 -0700 (PDT) MIME-Version: 1.0 References: <7645a04d4bbd9261ef32be711a9302085481d44c.camel@telenet.be> In-Reply-To: <7645a04d4bbd9261ef32be711a9302085481d44c.camel@telenet.be> From: Paul Alesius Date: Mon, 21 Mar 2022 21:59:30 +0100 Message-ID: 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Updated patch. On Mon, 21 Mar 2022 at 19:46, Maxime Devos wrote: > > Paul Alesius schreef op ma 21-03-2022 om 18:46 [+0100]: > > +(define-public rust-rustfix-0.6 > > + (package > > + (name "rust-rustfix") > > rustfix is already packaged in Guix. > > Greetings, > Maxime. diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 90c95b6368..294cb2aae1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9763,10 +9763,10 @@ (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.53 +(define-public rust-cargo-0.60 (package (name "rust-cargo") - (version "0.53.0") + (version "0.60.0") (source (origin (method url-fetch) @@ -9775,7 +9775,7 @@ (define-public rust-cargo-0.53 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "12ns9v4dd8vnvsaqgd897h2zc19w00i5ii3slda653zbhfzm6zna")))) + "0xws4y7h4mmq8flnzsgf6fph2hx3rjgypyll4wzp15035ymly6dw")))) (build-system cargo-build-system) (arguments `(;; The test suite is disabled as the internal 'cargo-test-macro' and @@ -9786,6 +9786,7 @@ (define-public rust-cargo-0.53 ("rust-atty" ,rust-atty-0.2) ("rust-bytesize" ,rust-bytesize-1) ("rust-cargo-platform" ,rust-cargo-platform-0.1) + ("rust-cargo-util" ,rust-cargo-util-0.1) ("rust-clap" ,rust-clap-2) ("rust-core-foundation" ,rust-core-foundation-0.9) ("rust-crates-io" ,rust-crates-io-0.33) @@ -9793,7 +9794,7 @@ (define-public rust-cargo-0.53 ("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-env-logger" ,rust-env-logger-0.9) ("rust-filetime" ,rust-filetime-0.2) ("rust-flate2" ,rust-flate2-1) ("rust-flate2" ,rust-flate2-1) @@ -9815,22 +9816,23 @@ (define-public rust-cargo-0.53 ("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-opener" ,rust-opener-0.5) ("rust-openssl" ,rust-openssl-0.10) + ("rust-os-info" ,rust-os-info-3) ("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-rustfix" ,rust-rustfix-0.6) ("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-socket2" ,rust-socket2-0.4) ("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) @@ -10094,7 +10096,7 @@ (define-public rust-cargo-lock-7 (define-public rust-cargo-platform-0.1 (package (name "rust-cargo-platform") - (version "0.1.1") + (version "0.1.2") (source (origin (method url-fetch) @@ -10103,7 +10105,7 @@ (define-public rust-cargo-platform-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1mzi60pf0z83qkzqp7jwd61xnqz2b5ydsj7rnnikbgyicd5989h2")))) + "09zsf76b9yr02jh17xq925xp1w824w2bwvb78fd0gpx5m1fq5nyb")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -10114,6 +10116,25 @@ (define-public rust-cargo-platform-0.1 supported by Cargo.") (license (list license:expat license:asl2.0)))) +(define-public rust-cargo-util-0.1 + (package + (name "rust-cargo-util") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "cargo-util" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1sz0gzcyp9ycb4zwj69qs9gd8kn9hv9nh2dq42c59x5xccqph755")))) + (build-system cargo-build-system) + (home-page "https://github.com/rust-lang/cargo") + (synopsis "Utils for Cargo") + (description "Miscellaneous support code used by Cargo.") + (license (list license:expat license:asl2.0)))) + (define-public rust-cargon-0.0 (package (name "rust-cargon") @@ -13801,7 +13822,7 @@ (define-public rust-crates-index-0.5 (define-public rust-crates-io-0.33 (package (name "rust-crates-io") - (version "0.33.0") + (version "0.33.1") (source (origin (method url-fetch) @@ -13810,7 +13831,7 @@ (define-public rust-crates-io-0.33 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "147mggf85fz77vsrzsvsxxwid4f4fg30zwfyirx7sl1k7y33hw91")))) + "0nmpzr697a6v12ljwpmjrhqpmkf784nsm8m1g6jwadmkq96p3mxj")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -15585,14 +15606,14 @@ (define-public rust-cty-0.2 (define-public rust-curl-0.4 (package (name "rust-curl") - (version "0.4.34") + (version "0.4.43") (source (origin (method url-fetch) (uri (crate-uri "curl" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0vkm6fyizf8m9yxpv3n5pm9ag3bwlyqa6nz2ga8qkzm5y4m1cs72")))) + (base32 "07v5s3qafyl9gnnlzbddgg5fzy41gncy00ahbbv46nr0xyp5bn1p")))) (build-system cargo-build-system) (arguments `(#:tests? #false ;require internet access @@ -15622,7 +15643,7 @@ (define-public rust-curl-0.4 (define-public rust-curl-sys-0.4 (package (name "rust-curl-sys") - (version "0.4.39+curl-7.74.0") + (version "0.4.53+curl-7.82.0") (source (origin (method url-fetch) @@ -15630,7 +15651,7 @@ (define-public rust-curl-sys-0.4 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0x7qhq7c3b1vmp3740yiigzm09qvkzpdf578jjrs0s3v3s3cxa07")) + "0lh398vd34c55afyw5csbxqmnp7caxgpgci3y89c60lmb9d914l0")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "curl") #t)))) @@ -30137,7 +30158,7 @@ (define-public rust-jni-sys-0.3 (define-public rust-jobserver-0.1 (package (name "rust-jobserver") - (version "0.1.22") + (version "0.1.24") (source (origin (method url-fetch) @@ -30146,7 +30167,7 @@ (define-public rust-jobserver-0.1 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1zg7p4khibisbvd8b1lqvvni6lr00g49d4bq2zj6m76bs7jmlbwp")))) + "1yn1vxbbqv7dqir6qbfcj8h8ddjf89m5mhvm36h13xx7k5raf9dg")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -39195,10 +39216,10 @@ (define-public rust-open-1 (("rust-pathdiff" ,rust-pathdiff-0.2) ("rust-winapi" ,rust-winapi-0.3)))))) -(define-public rust-opener-0.4 +(define-public rust-opener-0.5 (package (name "rust-opener") - (version "0.4.1") + (version "0.5.0") (source (origin (method url-fetch) @@ -39207,7 +39228,7 @@ (define-public rust-opener-0.4 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1bpknqvhqkalhmq8n2m97apc0r3y194ppybl1qxay34xr83p848k")))) + "0lkrn4fv1h4m8gmp7ll6x7vjvb6kls2ngwa5cgsh2ix5fb6yp8sf")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -39569,14 +39590,14 @@ (define-public rust-ordermap-0.3 (define-public rust-os-info-3 (package (name "rust-os-info") - (version "3.0.6") + (version "3.0.7") (source (origin (method url-fetch) (uri (crate-uri "os_info" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1pbcf2in8i9w6zjzk6jmrd89gm5h7qpyqi3hvkl0axpzp1m57lmk")))) + (base32 "09x2sm4pgcpk14hakj4iq0zkglx1bwxlq3a5mbwc737dpwh11jba")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -51059,8 +51080,28 @@ (define-public rust-rustdoc-stripper-0.1 "This package provides a tool to manipulate rustdoc comments.") (license license:asl2.0))) -(define-public rust-rustfix-0.5 +(define-public rust-rustfix-0.6 (package + (name "rust-rustfix") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustfix" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0apkjxv3z70vhnyz2kpwsivvndk6qk7kkp0rf7sg8pk7q1gy02vg")))) + (build-system cargo-build-system) + (home-page "https://github.com/rust-lang/rustfix") + (synopsis "Automatically apply the suggestions made by rustc.") + (description + "Automatically apply the suggestions made by rustc.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-rustfix-0.5 + (package/inherit rust-rustfix-0.6 (name "rust-rustfix") (version "0.5.1") (source @@ -60554,7 +60595,7 @@ (define-public rust-tap-1 (define-public rust-tar-0.4 (package (name "rust-tar") - (version "0.4.26") + (version "0.4.36") (source (origin (method url-fetch) @@ -60562,7 +60603,7 @@ (define-public rust-tar-0.4 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1lr6v3cpkfxd2lk5ll2jd8wr1xdskwj35smnh5sfb8xvzzxnn6dk")))) + "0iz40bd47xr69dsbckd6rv5ry2nqb2dp3z850q41pvpnmk6xk441")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Test tarballs not included in crate.