[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
272/469: gnu: rust-adblock: Update to 0.7.5.
From: |
guix-commits |
Subject: |
272/469: gnu: rust-adblock: Update to 0.7.5. |
Date: |
Tue, 25 Apr 2023 15:03:40 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit 4f73fbd9e4410521fc2e2344c75110bc4084f493
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Thu Mar 9 17:50:59 2023 +0200
gnu: rust-adblock: Update to 0.7.5.
* gnu/packages/crates-io.scm (rust-adblock-0.4): Replace with
rust-adblock-0.7.5.
[source]: Remove patch.
[arguments]: Add cargo-test-flags.
[cargo-inputs]: Replace rust-cssparser-0.25 with 0.28,
rust-selectors-0.21 with 0.23.
[cargo-development-inputs]: Replace rust-criterion-0.3 with 0.4,
rust-tokio-1.8 with rust-tokio.
[native-inputs]: Remove pkg-config, openssl.
* gnu/packages/patches/rust-adblock-ignore-live-tests.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
gnu/packages/crates-io.scm | 29 +++++----
.../patches/rust-adblock-ignore-live-tests.patch | 69 ----------------------
3 files changed, 17 insertions(+), 82 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index a714734bca..08c8ef54a8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1856,7 +1856,6 @@ dist_patch_DATA =
\
%D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \
%D%/packages/patches/rustc-1.54.0-src.patch \
%D%/packages/patches/rust-1.64-fix-riscv64-bootstrap.patch \
- %D%/packages/patches/rust-adblock-ignore-live-tests.patch \
%D%/packages/patches/i3status-rust-enable-unstable-features.patch \
%D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \
%D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch \
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 3df6d6b60b..8fb9b9e4cf 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1576,10 +1576,10 @@ threads. This makes it robust in face of panics (it
won't make your program
deadlock, like the standard Barrier).")
(license (list license:asl2.0 license:expat))))
-(define-public rust-adblock-0.4
+(define-public rust-adblock-0.7
(package
(name "rust-adblock")
- (version "0.4.1")
+ (version "0.7.5")
(source
(origin
(method git-fetch)
@@ -1587,42 +1587,47 @@ deadlock, like the standard Barrier).")
(url "https://github.com/brave/adblock-rust")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
- (patches (search-patches "rust-adblock-ignore-live-tests.patch"))
(sha256
(base32
- "0l2iacwkm66z6wc71wy62x2k5xllx94adrqncicxqsx203c3ljpl"))))
+ "0prlkq8am3sskg55x7b8vr4j54dmkjqldyl50isq5qyy9pff3xxs"))))
(build-system cargo-build-system)
(arguments
- `(#:cargo-inputs
+ `(#:cargo-test-flags
+ (list "--release" "--"
+ ;; Skip tests which require the network.
+ "--skip=check_live_from_filterlists"
+ "--skip=check_live_specific_urls"
+ "--skip=stable_serialization"
+ "--skip=stable_serialization_through_load")
+ #:cargo-inputs
(("rust-addr" ,rust-addr-0.14)
("rust-base64" ,rust-base64-0.13)
("rust-bitflags" ,rust-bitflags-1)
- ("rust-cssparser" ,rust-cssparser-0.25)
+ ("rust-cssparser" ,rust-cssparser-0.28)
("rust-flate2" ,rust-flate2-1)
("rust-idna" ,rust-idna-0.2)
("rust-itertools" ,rust-itertools-0.10)
("rust-lifeguard" ,rust-lifeguard-0.6)
("rust-once-cell" ,rust-once-cell-1)
- ("rust-percent-encoding"
- ,rust-percent-encoding-2)
+ ("rust-percent-encoding" ,rust-percent-encoding-2)
("rust-regex" ,rust-regex-1)
("rust-rmp-serde" ,rust-rmp-serde-0.13)
("rust-rmp-serde" ,rust-rmp-serde-0.15)
("rust-seahash" ,rust-seahash-3)
- ("rust-selectors" ,rust-selectors-0.21)
+ ("rust-selectors" ,rust-selectors-0.23)
("rust-serde" ,rust-serde-1)
("rust-serde-json" ,rust-serde-json-1)
("rust-twoway" ,rust-twoway-0.2)
("rust-url" ,rust-url-2))
#:cargo-development-inputs
- (("rust-criterion" ,rust-criterion-0.3)
+ (("rust-criterion" ,rust-criterion-0.4)
("rust-csv" ,rust-csv-1)
("rust-futures" ,rust-futures-0.3)
+ ("rust-mock-instant" ,rust-mock-instant-0.2)
("rust-reqwest" ,rust-reqwest-0.11)
("rust-serde-json" ,rust-serde-json-1)
("rust-sha2" ,rust-sha2-0.9)
- ("rust-tokio" ,rust-tokio-1.8))))
- (native-inputs (list pkg-config openssl))
+ ("rust-tokio" ,rust-tokio-1))))
(home-page "https://github.com/brave/adblock-rust/")
(synopsis "Adblock Plus syntax filter parsing and matching")
(description "This package provides native Rust module for Adblock Plus
diff --git a/gnu/packages/patches/rust-adblock-ignore-live-tests.patch
b/gnu/packages/patches/rust-adblock-ignore-live-tests.patch
deleted file mode 100644
index fc7f2858ff..0000000000
--- a/gnu/packages/patches/rust-adblock-ignore-live-tests.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From b83b5b453d3f7883ef4c12f84a7045486957c709 Mon Sep 17 00:00:00 2001
-From: Petr Hodina <phodina@protonmail.com>
-Date: Tue, 9 Nov 2021 17:02:54 +0100
-Subject: [PATCH] Ignore live tests.
-
-
-diff --git a/tests/live.rs b/tests/live.rs
-index b1a19fc..6bd4685 100644
---- a/tests/live.rs
-+++ b/tests/live.rs
-@@ -140,6 +140,7 @@ fn get_blocker_engine_deserialized_ios() -> Engine {
- }
-
- #[test]
-+#[ignore]
- fn check_live_specific_urls() {
- let mut engine = get_blocker_engine();
- {
-@@ -176,6 +177,7 @@ fn check_live_specific_urls() {
- }
-
- #[test]
-+#[ignore]
- fn check_live_deserialized_specific_urls() {
- let mut engine = get_blocker_engine_deserialized();
- {
-@@ -201,6 +203,7 @@ fn check_live_deserialized_specific_urls() {
- }
-
- #[test]
-+#[ignore]
- fn check_live_from_filterlists() {
- let engine = get_blocker_engine();
- let requests = load_requests();
-@@ -214,6 +217,7 @@ fn check_live_from_filterlists() {
- }
-
- #[test]
-+#[ignore]
- fn check_live_deserialized_file() {
- let engine = get_blocker_engine_deserialized();
- let requests = load_requests();
-@@ -243,6 +247,7 @@ fn check_live_deserialized_ios() {
-
- #[cfg(feature = "resource_assembler")]
- #[test]
-+#[ignore]
- fn check_live_redirects() {
- use
adblock::resources::resource_assembler::assemble_web_accessible_resources;
-
-@@ -278,6 +283,7 @@ fn check_live_redirects() {
- }
-
- #[test]
-+#[ignore]
- /// Ensure that two different engines loaded from the same textual filter set
serialize to
- /// identical buffers.
- fn stable_serialization() {
-@@ -291,6 +297,7 @@ fn stable_serialization() {
- }
-
- #[test]
-+#[ignore]
- /// Ensure that one engine's serialization result can be exactly reproduced
by another engine after
- /// deserializing from it.
- fn stable_serialization_through_load() {
---
-2.33.1
-
- 216/469: gnu: rust-wasm-bindgen-futures-0.4: Update to 0.4.34., (continued)
- 216/469: gnu: rust-wasm-bindgen-futures-0.4: Update to 0.4.34., guix-commits, 2023/04/25
- 231/469: gnu: Add rust-const-fn-assert-0.1., guix-commits, 2023/04/25
- 238/469: gnu: Remove rust-pangocairo-sys-0.10., guix-commits, 2023/04/25
- 246/469: etc: teams: Add sequoia.scm to the rust team., guix-commits, 2023/04/25
- 256/469: gnu: Add rust-lscolors-0.13., guix-commits, 2023/04/25
- 258/469: gnu: Add rust-ron-0.7., guix-commits, 2023/04/25
- 270/469: gnu: rust-similar-asserts-1: Update to 1.4.2., guix-commits, 2023/04/25
- 271/469: gnu: rust-tokio-1: Update to 1.26.0., guix-commits, 2023/04/25
- 281/469: gnu: rust-derive-arbitrary-1: Update to 1.2.3., guix-commits, 2023/04/25
- 161/469: gnu: Remove rust-target-lexicon-0.10., guix-commits, 2023/04/25
- 272/469: gnu: rust-adblock: Update to 0.7.5.,
guix-commits <=
- 289/469: gnu: Add rust-if-addrs-0.6., guix-commits, 2023/04/25
- 308/469: gnu: rust-crossbeam-deque-0.8: Update to 0.8.3., guix-commits, 2023/04/25
- 307/469: Revert "gnu: rust: Remove more bundled sources.", guix-commits, 2023/04/25
- 323/469: gnu: rust-windows-aarch64-msvc-0.42: Update to 0.42.2., guix-commits, 2023/04/25
- 331/469: gnu: rust-derive-arbitrary-1: Update to 1.3.0., guix-commits, 2023/04/25
- 339/469: gnu: rust-quote-1: Update to 1.0.25., guix-commits, 2023/04/25
- 335/469: gnu: rust-bytecheck-0.6: Update to 0.6.10., guix-commits, 2023/04/25
- 361/469: gnu: rust-fastrand-1: Update to 1.9.0., guix-commits, 2023/04/25
- 364/469: gnu: rust-tls-parser-0.10: Update to 0.11.0., guix-commits, 2023/04/25
- 384/469: gnu: rust-wayland-client-0.29: Update to 0.29.5., guix-commits, 2023/04/25