unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: brennan@umanwizard.com
To: 72821@debbugs.gnu.org
Cc: Brennan Vincent <brennan@umanwizard.com>, efraim@flashner.co.il
Subject: [bug#72821] [PATCH 2/4] gnu: rust: Update to 1.79
Date: Mon, 26 Aug 2024 13:40:55 -0400	[thread overview]
Message-ID: <20240826174057.1285361-2-brennan@umanwizard.com> (raw)
In-Reply-To: <20240826174057.1285361-1-brennan@umanwizard.com>

From: Brennan Vincent <brennan@umanwizard.com>

* 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






  reply	other threads:[~2024-08-26 17:42 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-26 17:38 [bug#72821] [PATCH 0/4] Update to latest rust brennan
2024-08-26 17:40 ` [bug#72821] [PATCH 1/4] gnu: rust: Update to 1.78 brennan
2024-08-26 17:40   ` brennan [this message]
2024-08-26 17:40   ` [bug#72821] [PATCH 3/4] gnu: rust: Add rust 1.80.1 brennan
2024-08-26 17:40   ` [bug#72821] [PATCH 4/4] gnu: rust: update to 1.80 brennan
2024-09-17  9:56 ` bug#72821: [PATCH 0/4] Update to latest rust Efraim Flashner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240826174057.1285361-2-brennan@umanwizard.com \
    --to=brennan@umanwizard.com \
    --cc=72821@debbugs.gnu.org \
    --cc=efraim@flashner.co.il \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).