From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id WNYRM3m+zGY4OgAAqHPOHw:P1 (envelope-from ) for ; Mon, 26 Aug 2024 17:42:18 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id WNYRM3m+zGY4OgAAqHPOHw (envelope-from ) for ; Mon, 26 Aug 2024 19:42:17 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=U4x23cA5; dmarc=none; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1724694137; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Vco9hufJvsG44KnbesHCJcwTkTcqGE8dMO8pNrv3Ulc=; b=khPQh3fupzqzqlrw0myR1M76jR1ggEzfPXEkI4tgTJ9Ig9I5Cs6zyb0YFm5GHm9iAT1pME xT1318fZBtsQOh8gi45HfKx84RX0Fi57o8rl1yFWyoTOqRewFD/L4hg/jDtIRjWCng8Gil B8Gftv3TJtLUKGjV5f6kblMjz6ByRNPdEf5+Dx0RLPHoF96NWVSdwWFqp7EP+ojX/pCdAg hKsSsLlJ5qJpgn4oWsrfXanJR0queAy07kcEmFCc+xxl/p8TEs9bpmOlYFqOwoNrituQUE bBWqHg8+nQvW7Rts5lnnNAVkLcRvllM153Zf94TBHr9aM2hu7DBjxlwBYBNZfw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1724694137; a=rsa-sha256; cv=none; b=MZ1sVjou2q8OM78N8Shk0AqVY5NLQ2v+mt2NqGRpRqzeHBEcEQGeb9EtXdFhGRgP9iUXyb vjq+rJ8EyiIDFXPSR1OKKYJXC/GkBmN4uxDTNQ+JjAQE5T+cO5MhrWJJEhmJ2b5NKC/d9J +QmBYPzr/z9k4RSzmJv+hGJtsWSIh5aLiZF/UCcDQ34UFpElYIY2xO20L9A8qMqWjS/Y5M m3L5obI8Tvzrdp689FL1s8GwuhvJ9YbKWGeG3+CN8aBxAfJLqG9s8Miw3OyWaUXtRxYYnB 3fXieQ7GFHbLVllwoQEzg+s/TfbDph5G9vS4YMGdatEFuU5iVQ6a7wSU8J7i1g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=U4x23cA5; dmarc=none; 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" 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 81E597773B for ; Mon, 26 Aug 2024 19:42:17 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sidjJ-0006C0-Q8; Mon, 26 Aug 2024 13:42:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sidjH-0006B8-MM for guix-patches@gnu.org; Mon, 26 Aug 2024 13:42:11 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sidjH-0002nI-AL for guix-patches@gnu.org; Mon, 26 Aug 2024 13:42:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Vco9hufJvsG44KnbesHCJcwTkTcqGE8dMO8pNrv3Ulc=; b=U4x23cA5ok8uW2yTk8YASBxtVxtO6xp0UC0HQtvl19q6fDrKZT15KSv+E43jjgWWT5jnWnm6wDnolGD+tExboG5Jprbfzj8jBQj4QkhjRECdeUurU2U9CkVN2C1rgfbMOzG+VPpI4yh7C8kl4LhlSrHQmYutIgAzuzqPuw++z2lAsrugyyWyg8l4awbh1Ce1h9A1pczhRpicUjQQ/Yd+Lp89yJgndYj2SMbNu3XwZ4ytVqUTVs3ZvbZ0Msr+djbO0qY5lA9eTD7l9D5DS1ZxYafNYbeNRsHC3g/lOd0HmuRvjD+dEzaJvYkv7irosx/rHvONy/aBXPVx8eh1AoqC6A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sidk6-0004ZD-QA for guix-patches@gnu.org; Mon, 26 Aug 2024 13:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72821] [PATCH 2/4] gnu: rust: Update to 1.79 Resent-From: brennan@umanwizard.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 26 Aug 2024 17:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72821 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72821@debbugs.gnu.org Cc: Brennan Vincent , efraim@flashner.co.il Received: via spool by 72821-submit@debbugs.gnu.org id=B72821.172469414717481 (code B ref 72821); Mon, 26 Aug 2024 17:43:02 +0000 Received: (at 72821) by debbugs.gnu.org; 26 Aug 2024 17:42:27 +0000 Received: from localhost ([127.0.0.1]:45157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sidjX-0004Xs-4s for submit@debbugs.gnu.org; Mon, 26 Aug 2024 13:42:27 -0400 Received: from smtp.umanwizard.com ([54.203.248.109]:49601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sidjS-0004Xa-Ev for 72821@debbugs.gnu.org; Mon, 26 Aug 2024 13:42:25 -0400 Received: from localhost ([184.75.93.166]) by smtp.umanwizard.com ; 26 Aug 2024 17:41:11 +0000 X-Fes-Received-For: 72821@debbugs.gnu.org X-Fes-Received-From: From: brennan@umanwizard.com Date: Mon, 26 Aug 2024 13:40:55 -0400 Message-ID: <20240826174057.1285361-2-brennan@umanwizard.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240826174057.1285361-1-brennan@umanwizard.com> References: <20240826174057.1285361-1-brennan@umanwizard.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Fes-Encrypted: true X-Fes-Ehlo-Domain: localhost 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.01 X-Spam-Score: -6.01 X-Migadu-Queue-Id: 81E597773B X-Migadu-Scanner: mx11.migadu.com X-TUID: ebE+61vvNcl2 From: Brennan Vincent * gnu/packages/rust.scm (rust): Update to 1.79 Change-Id: Ic43b4c540413a0e1a08d46cca5a092badc221753 --- gnu/packages/rust.scm | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 9987d5569f..403c3933d4 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1034,7 +1034,7 @@ (define (make-ignore-test-list strs) ;;; Here we take the latest included Rust, make it public, and re-enable tests ;;; and extra components such as rustfmt. (define-public rust - (let ((base-rust rust-1.78)) + (let ((base-rust rust-1.79)) (package (inherit base-rust) (properties (append @@ -1048,19 +1048,18 @@ (define-public rust '(begin (for-each delete-file-recursively '("src/llvm-project" - "vendor/jemalloc-sys/jemalloc" - "vendor/openssl-src/openssl" - "vendor/tikv-jemalloc-sys/jemalloc" + "vendor/jemalloc-sys-0.5.4+5.3.0-patched/jemalloc" + "vendor/openssl-src-111.28.1+1.1.1w/openssl" + "vendor/tikv-jemalloc-sys-0.5.4+5.3.0-patched/jemalloc" ;; These are referenced by the cargo output ;; so we unbundle them. - "vendor/curl-sys/curl" - "vendor/libffi-sys/libffi" - "vendor/libnghttp2-sys/nghttp2" - "vendor/libz-sys/src/zlib" - "vendor/libz-sys-1.1.12/src/zlib")) + "vendor/curl-sys-0.4.72+curl-8.6.0/curl" + "vendor/libffi-sys-2.3.0/libffi" + "vendor/libnghttp2-sys-0.1.9+1.58.0/nghttp2" + "vendor/libz-sys-1.1.16/src/zlib")) ;; Use the packaged nghttp2 - (delete-file "vendor/libnghttp2-sys/build.rs") - (with-output-to-file "vendor/libnghttp2-sys/build.rs" + (delete-file "vendor/libnghttp2-sys-0.1.9+1.58.0/build.rs") + (with-output-to-file "vendor/libnghttp2-sys-0.1.9+1.58.0/build.rs" (lambda _ (format #t "fn main() {~@ println!(\"cargo:rustc-link-lib=nghttp2\");~@ @@ -1098,7 +1097,10 @@ (define-public rust (lambda _ (substitute* "src/tools/cargo/tests/testsuite/git.rs" ,@(make-ignore-test-list - '("fn fetch_downloads_with_git2_first_"))))) + '("fn fetch_downloads_with_git2_first_"))) + (substitute* "src/tools/cargo/tests/testsuite/build.rs" + ,@(make-ignore-test-list + '("fn build_with_symlink_to_path_dependency_with_build_script_in_git"))))) (add-after 'unpack 'disable-tests-requiring-mercurial (lambda _ (with-directory-excursion "src/tools/cargo/tests/testsuite/cargo_init" -- 2.45.2