[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
318/373: Revert "gnu: rust: Remove more bundled sources."
From: |
guix-commits |
Subject: |
318/373: Revert "gnu: rust: Remove more bundled sources." |
Date: |
Sun, 16 Apr 2023 07:11:34 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit 52e0e8369d6cec46acb1c41bdd321238aff9cc4b
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Mar 15 22:57:51 2023 +0200
Revert "gnu: rust: Remove more bundled sources."
This reverts commit 7e777d70e67cc90f019988aa2af68bbf1fe25c00.
This makes it impractical to update several libraries without a rust
rebuild. Since rust doesn't retain a reference to these libraries it
isn't clear that this is the best choice.
---
gnu/packages/rust.scm | 35 -----------------------------------
1 file changed, 35 deletions(-)
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index a98ab87955..7b0436841f 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -50,7 +50,6 @@
#:use-module (gnu packages python)
#:use-module (gnu packages ssh)
#:use-module (gnu packages tls)
- #:use-module (gnu packages version-control)
#:use-module (gnu packages)
#:use-module (guix build-system cargo)
#:use-module (guix build-system copy)
@@ -718,33 +717,6 @@ safety and thread safety guarantees.")
(package
(inherit base-rust)
(outputs (cons "rustfmt" (package-outputs base-rust)))
- ;; This is the rust we build everything with, so we make sure to
unbundle more.
- ;; We allow other versions of the rust compiler to use bundled sources
so we
- ;; don't have to worry about carrying old versions of some libraries.
- (source
- (origin
- (inherit (package-source base-rust))
- (snippet
- '(begin
- (for-each delete-file-recursively
- '("src/llvm-project"
- "vendor/curl-sys/curl"
- "vendor/jemalloc-sys/jemalloc"
- "vendor/libgit2-sys/libgit2"
- ;"vendor/libnghttp2-sys/nghttp2"
- "vendor/libssh2-sys/libssh2"
- "vendor/libz-sys/src/zlib"
- ;"vendor/libz-sys/src/zlib-ng"
- "vendor/lzma-sys/xz-5.2"
- ;"vendor/openssl-src"
- "vendor/tikv-jemalloc-sys/jemalloc"))
- ;; Remove vendored dynamically linked libraries.
- ;; find . -not -type d -executable -exec file {} \+ | grep ELF
- (delete-file "vendor/vte/vim10m_match")
- (delete-file "vendor/vte/vim10m_table")
- ;; Also remove the bundled (mostly Windows) libraries.
- (for-each delete-file
- (find-files "vendor" ".*\\.(a|dll|exe|lib)$"))))))
(arguments
(substitute-keyword-arguments (package-arguments base-rust)
((#:tests? _ #f)
@@ -841,11 +813,6 @@ safety and thread safety guarantees.")
((file) file))
(("fn ctrl_c_kills_everyone")
"#[ignore]\nfn ctrl_c_kills_everyone"))))
- (add-after 'set-env 'set-more-env
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1")
- (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1")
- (setenv "OPENSSL_DIR" (assoc-ref inputs "openssl"))))
(add-after 'configure 'add-gdb-to-config
(lambda* (#:key inputs #:allow-other-keys)
(let ((gdb (assoc-ref inputs "gdb")))
@@ -890,8 +857,6 @@ safety and thread safety guarantees.")
(("prefix = \"[^\"]*\"")
(format #f "prefix = ~s" (assoc-ref outputs "rustfmt"))))
(invoke "./x.py" "install" "rustfmt")))))))
- (inputs (modify-inputs (package-inputs base-rust)
- (prepend curl libgit2 libssh xz zlib)))
;; Add test inputs.
(native-inputs (cons* `("gdb" ,gdb)
`("procps" ,procps)
- 339/373: gnu: Add rust-windows-targets-0.42., (continued)
- 339/373: gnu: Add rust-windows-targets-0.42., guix-commits, 2023/04/16
- 342/373: gnu: rust-derive-arbitrary-1: Update to 1.3.0., guix-commits, 2023/04/16
- 359/373: gnu: Add rust-compact-str-0.7., guix-commits, 2023/04/16
- 361/373: gnu: Add rust-windows-implement-0.46., guix-commits, 2023/04/16
- 366/373: gnu: rust: Disable tests that fail on aarch64., guix-commits, 2023/04/16
- 278/373: gnu: Add rust-faccess-0.2., guix-commits, 2023/04/16
- 292/373: gnu: rust-derive-arbitrary-1: Update to 1.2.3., guix-commits, 2023/04/16
- 311/373: gnu: Add rust-indexmap-1.6., guix-commits, 2023/04/16
- 321/373: gnu: Add rust-funty-2., guix-commits, 2023/04/16
- 286/373: gnu: rust-gif-0.11: Remove duplicate definition., guix-commits, 2023/04/16
- 318/373: Revert "gnu: rust: Remove more bundled sources.",
guix-commits <=
- 307/373: gnu: rust-bootstrap: Remove bundled libraries., guix-commits, 2023/04/16
- 320/373: gnu: rust-python3-dll-a-0.2: Update to 0.2.6., guix-commits, 2023/04/16
- 306/373: gnu: rust-tikv-jemalloc-sys-0.4: Remove bundled sources., guix-commits, 2023/04/16
- 326/373: gnu: Add rust-markup-proc-macro-0.13., guix-commits, 2023/04/16
- 343/373: gnu: rust-uuid-1: Update to 1.3.0., guix-commits, 2023/04/16
- 345/373: gnu: rust-bytecheck-derive-0.6: Update to 0.6.10., guix-commits, 2023/04/16
- 350/373: gnu: rust-quote-1: Update to 1.0.25., guix-commits, 2023/04/16
- 358/373: gnu: Add rust-test-strategy-0.2., guix-commits, 2023/04/16
- 360/373: gnu: Add rust-windows-interface-0.46., guix-commits, 2023/04/16
- 365/373: gnu: Add python-orjson., guix-commits, 2023/04/16