[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
431/470: gnu: rust-adblock: Update to 0.7.5.
From: |
guix-commits |
Subject: |
431/470: gnu: rust-adblock: Update to 0.7.5. |
Date: |
Thu, 16 Mar 2023 03:02:32 -0400 (EDT) |
efraim pushed a commit to branch rust-team
in repository guix.
commit 355476a3cc26104673c3f17f434266d8987fd09f
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 98ac6175ae..69beab9ed5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1819,7 +1819,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 ac503f152d..c8e73b5fae 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1577,10 +1577,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)
@@ -1588,42 +1588,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
-
- 449/470: gnu: Add rust-libmdns-0.6., (continued)
- 449/470: gnu: Add rust-libmdns-0.6., guix-commits, 2023/03/16
- 459/470: gnu: Add rust-indexmap-1.6., guix-commits, 2023/03/16
- 452/470: gnu: rust-libloading: Remove bundled libraries., guix-commits, 2023/03/16
- 455/470: gnu: rust-bootstrap: Remove bundled libraries., guix-commits, 2023/03/16
- 226/470: gnu: Add rust-yasna-0.4., guix-commits, 2023/03/16
- 421/470: gnu: fd: Update to 8.7.0., guix-commits, 2023/03/16
- 429/470: gnu: rust-similar-asserts-1: Update to 1.4.2., guix-commits, 2023/03/16
- 427/470: gnu: Add rust-argmax-0.3., guix-commits, 2023/03/16
- 420/470: gnu: rust-ucd-trie-0.1: Update to 0.1.5., guix-commits, 2023/03/16
- 407/470: gnu: Add rust-crossterm-0.25., guix-commits, 2023/03/16
- 431/470: gnu: rust-adblock: Update to 0.7.5.,
guix-commits <=
- 437/470: gnu: rust-arbitrary-1: Update to 1.2.3., guix-commits, 2023/03/16
- 439/470: gnu: rust-bytes-1: Update to 1.4.0., guix-commits, 2023/03/16
- 440/470: gnu: rust-derive-arbitrary-1: Update to 1.2.3., guix-commits, 2023/03/16
- 441/470: gnu: rust-env-logger-0.9: Update to 0.9.3., guix-commits, 2023/03/16
- 432/470: gnu: Remove rust-tokio-1.8., guix-commits, 2023/03/16
- 468/470: gnu: rbw: Add missing input., guix-commits, 2023/03/16
- 470/470: Revert "gnu: rust: Remove more bundled sources.", guix-commits, 2023/03/16
- 451/470: gnu: libsequoia: Use existing rust-tokio-1., guix-commits, 2023/03/16
- 458/470: gnu: rust: Remove more bundled sources., guix-commits, 2023/03/16
- 465/470: gnu: agate: Add missing input., guix-commits, 2023/03/16