unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6.
@ 2021-11-09 16:46 phodina via Guix-patches via
  2021-11-09 16:58 ` [bug#51724] [PATCH 02/12] gnu: Add rust-psl-types-2 phodina via Guix-patches via
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: phodina via Guix-patches via @ 2021-11-09 16:46 UTC (permalink / raw)
  To: 51724

Greetings!

The following series of patches add rust-adblock as a small milestone for upstreaming Brave browser.


* gnu/packages/crates-io.scm (rust-lifeguard-0.6): New variable.

----8<--------cut here----------------->8-----

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 4ccf463e23..35f334ac4f 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26490,6 +26490,25 @@ (define-public rust-libz-sys-1
     (license (list license:asl2.0
                    license:expat))))

+(define-public rust-lifeguard-0.6
+  (package
+    (name "rust-lifeguard")
+    (version "0.6.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "lifeguard" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "09iwwy7888i1kfvbrgwpl4xv3pwsz1fbzx54djs3gnvmszdr9gl9"))))
+    (build-system cargo-build-system)
+    (arguments `(#:skip-build? #t))
+    (home-page "https://github.com/zslayton/lifeguard")
+    (synopsis "Object pool manager in Rust")
+    (description "This package provides an object pool manager in Rust.")
+    (license license:expat)))
+
 (define-public rust-line-0.1
   (package
     (name "rust-line")
--
2.33.1




^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#51724] [PATCH 02/12] gnu: Add rust-psl-types-2.
  2021-11-09 16:46 [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6 phodina via Guix-patches via
@ 2021-11-09 16:58 ` phodina via Guix-patches via
  2021-11-09 16:59 ` [bug#51724] [PATCH 03/12] gnu: Add rust-psl-2 phodina via Guix-patches via
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: phodina via Guix-patches via @ 2021-11-09 16:58 UTC (permalink / raw)
  To: 51724@debbugs.gnu.org

* gnu/packages/crates-io.scm (rust-psl-types-2): New variable.

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 35f334ac4f..9f9d801730 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37923,6 +37923,26 @@ (define-public rust-proptest-derive-0.1
 trait of proptest.")
     (license (list license:expat license:asl2.0))))

+(define-public rust-psl-types-2
+  (package
+    (name "rust-psl-types")
+    (version "2.0.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "psl-types" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0kqssn9wgqpl1m26ynv7cvxanfhyjvssi2a3jc2nzpbw7q3ricv6"))))
+    (build-system cargo-build-system)
+    (arguments `(#:skip-build? #t))
+    (home-page "https://github.com/addr-rs/psl-types")
+    (synopsis "Common types for the public suffix implementation crates")
+    (description "This package provides common types for the public suffix
+implementation crates.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-psm-0.1
   (package
     (name "rust-psm")
--
2.33.1




^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#51724] [PATCH 03/12] gnu: Add rust-psl-2.
  2021-11-09 16:46 [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6 phodina via Guix-patches via
  2021-11-09 16:58 ` [bug#51724] [PATCH 02/12] gnu: Add rust-psl-types-2 phodina via Guix-patches via
@ 2021-11-09 16:59 ` phodina via Guix-patches via
  2021-11-09 17:00 ` [bug#51724] [PATCH 04/12] gnu: Add rust-publicsuffix-2 phodina via Guix-patches via
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: phodina via Guix-patches via @ 2021-11-09 16:59 UTC (permalink / raw)
  To: 51724@debbugs.gnu.org

* gnu/packages/crates-io.scm (rust-psl-2): New variable.

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9f9d801730..2a103eee97 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37923,6 +37923,37 @@ (define-public rust-proptest-derive-0.1
 trait of proptest.")
     (license (list license:expat license:asl2.0))))

+(define-public rust-psl-2
+  (package
+    (name "rust-psl")
+    (version "2.0.48")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "psl" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0a2d3z6gi7bwsi4xr6m3kq44wxyr81yqr5z76afv8kfxsc8p1nxh"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-psl-types" ,rust-psl-types-2))
+       #:cargo-development-inputs
+       (("rust-rspec", rust-rspec-1))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-version-requirements
+           (lambda _
+             (substitute* "Cargo.toml"
+               (("1.0.0") ,(package-version rust-rspec-1))))))))
+    (home-page "https://github.com/addr-rs/psl")
+    (synopsis "Extract root domain and suffix")
+    (description "This package extracts root domain and suffix from a domain
+name.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-psl-types-2
   (package
     (name "rust-psl-types")
--
2.33.1




^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#51724] [PATCH 04/12] gnu: Add rust-publicsuffix-2.
  2021-11-09 16:46 [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6 phodina via Guix-patches via
  2021-11-09 16:58 ` [bug#51724] [PATCH 02/12] gnu: Add rust-psl-types-2 phodina via Guix-patches via
  2021-11-09 16:59 ` [bug#51724] [PATCH 03/12] gnu: Add rust-psl-2 phodina via Guix-patches via
@ 2021-11-09 17:00 ` phodina via Guix-patches via
  2021-11-09 17:00 ` [bug#51724] [PATCH 05/12] gnu: Add rust-no-std-net-0.5 phodina via Guix-patches via
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: phodina via Guix-patches via @ 2021-11-09 17:00 UTC (permalink / raw)
  To: 51724@debbugs.gnu.org

* gnu/packages/crates-io.scm (rust-publicsuffix-2): New variable.
(rust-publicsuffix-1): Inherit from above.

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 2a103eee97..c103f24440 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -37997,8 +37997,36 @@ (define-public rust-psm-0.1
 stack pointer and inspect the properties of the stack.")
     (license (list license:isc license:asl2.0))))

+(define-public rust-publicsuffix-2
+  (package
+    (name "rust-publicsuffix")
+    (version "2.1.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "publicsuffix" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1q9kbcqh9pa06p3kq7d3ksbnqjhs88v5wk5qg89wrgkbmpnp4a99"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-byteorder" ,rust-byteorder-1)
+        ("rust-hashbrown" ,rust-hashbrown-0.11)
+        ("rust-idna" ,rust-idna-0.2)
+        ("rust-psl-types" ,rust-psl-types-2)
+        ("rust-unicase" ,rust-unicase-2))))
+    (home-page "https://github.com/rushmorem/publicsuffix")
+    (synopsis "Domain name parsing and email address validation")
+    (description "This package provides robust domain name parsing and RFC
+compliant email address validation.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-publicsuffix-1
   (package
+    (inherit rust-publicsuffix-2)
     (name "rust-publicsuffix")
     (version "1.5.4")
     (source
@@ -38009,7 +38037,6 @@ (define-public rust-publicsuffix-1
        (sha256
         (base32
          "0yvmjpywfyypfr17kxiwy6ssykgv8nmcdhfakas6548pfn8a9fiv"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs
        (("rust-error-chain" ,rust-error-chain-0.12)
@@ -38019,12 +38046,7 @@ (define-public rust-publicsuffix-1
         ("rust-regex" ,rust-regex-1)
         ("rust-url" ,rust-url-2))
        #:cargo-development-inputs
-       (("rust-rspec" ,rust-rspec-1))))
-    (home-page "https://github.com/rushmorem/publicsuffix")
-    (synopsis "Domain name parsing and email address validation")
-    (description "This package provides robust domain name parsing and RFC
-compliant email address validation.")
-    (license (list license:expat license:asl2.0))))
+       (("rust-rspec" ,rust-rspec-1))))))

 (define-public rust-pulldown-cmark-0.8
   (package
--
2.33.1




^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#51724] [PATCH 05/12] gnu: Add rust-no-std-net-0.5.
  2021-11-09 16:46 [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6 phodina via Guix-patches via
                   ` (2 preceding siblings ...)
  2021-11-09 17:00 ` [bug#51724] [PATCH 04/12] gnu: Add rust-publicsuffix-2 phodina via Guix-patches via
@ 2021-11-09 17:00 ` phodina via Guix-patches via
  2021-11-09 17:01 ` [bug#51724] [PATCH 06/12] gnu: Add rust-addr-0.14 phodina via Guix-patches via
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: phodina via Guix-patches via @ 2021-11-09 17:00 UTC (permalink / raw)
  To: 51724@debbugs.gnu.org

* gnu/packages/crates-io.scm (rust-no-std-net-0.5): New variable.

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c103f24440..8c3481d148 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -31185,6 +31185,29 @@ (define-public rust-no-panic-0.1
 prove a function can't ever panic.")
     (license (list license:expat license:asl2.0))))

+(define-public rust-no-std-net-0.5
+  (package
+    (name "rust-no-std-net")
+    (version "0.5.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "no-std-net" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0lkilh0wc7big3m5lsn9wqiz2xvj21kgmpbc15z92j93n51wxkhv"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/dunmatt/no-std-net")
+    (synopsis "Rust's std::net... without the @code{std}")
+    (description "This package provides Rust's std::net for environment
+without the @code{std}.")
+    (license license:expat)))
+
 (define-public rust-nodrop-0.1
   (package
     (name "rust-nodrop")
--
2.33.1




^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#51724] [PATCH 06/12] gnu: Add rust-addr-0.14.
  2021-11-09 16:46 [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6 phodina via Guix-patches via
                   ` (3 preceding siblings ...)
  2021-11-09 17:00 ` [bug#51724] [PATCH 05/12] gnu: Add rust-no-std-net-0.5 phodina via Guix-patches via
@ 2021-11-09 17:01 ` phodina via Guix-patches via
  2021-11-09 17:02 ` [bug#51724] [PATCH 07/12] gnu: rust-rmp-serde: Update to 0.15.5 phodina via Guix-patches via
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: phodina via Guix-patches via @ 2021-11-09 17:01 UTC (permalink / raw)
  To: 51724@debbugs.gnu.org

* gnu/packages/crates-io.scm (rust-addr-0.14): New variable.

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8c3481d148..c7b49f4096 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -1013,6 +1013,32 @@ (define-public rust-addr2line-0.14
 Rust, using gimli.")
     (license (list license:asl2.0 license:expat))))

+(define-public rust-addr-0.14
+  (package
+    (name "rust-addr")
+    (version "0.14.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (crate-uri "addr" version))
+        (file-name (string-append name "-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0w6v0wwv203v0lyvwsq27rwfhvmw7dsmrqc9r3gszbx2974wlk65"))))
+    (build-system cargo-build-system)
+    (arguments
+      `(#:skip-build? #t
+        #:cargo-inputs
+        (("rust-no-std-net" ,rust-no-std-net-0.5)
+         ("rust-psl" ,rust-psl-2)
+         ("rust-psl-types" ,rust-psl-types-2)
+         ("rust-publicsuffix" ,rust-publicsuffix-2)
+         ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/addr-rs/addr")
+    (synopsis "Parsing domain names")
+    (description "This package provides a library for parsing domain names.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-addr2line-0.11
   (package
     (inherit rust-addr2line-0.14)
--
2.33.1




^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#51724] [PATCH 07/12] gnu: rust-rmp-serde: Update to 0.15.5.
  2021-11-09 16:46 [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6 phodina via Guix-patches via
                   ` (4 preceding siblings ...)
  2021-11-09 17:01 ` [bug#51724] [PATCH 06/12] gnu: Add rust-addr-0.14 phodina via Guix-patches via
@ 2021-11-09 17:02 ` phodina via Guix-patches via
  2021-11-09 17:02 ` [bug#51724] [PATCH 08/12] gnu: Add rust-twoway-0.2 phodina via Guix-patches via
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: phodina via Guix-patches via @ 2021-11-09 17:02 UTC (permalink / raw)
  To: 51724@debbugs.gnu.org

* gnu/packages/crates-io.scm (rust-rmp-serde): Update to 0.15.5.
(rust-serdeconv-0.4)[arguments]: Update rust-rmp-serde-0.15 in cargo-inputs.

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index c7b49f4096..1d90181725 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41226,17 +41226,17 @@ (define-public rust-rmp-0.8
 MessagePack format.")
     (license license:expat)))

-(define-public rust-rmp-serde-0.14
+(define-public rust-rmp-serde-0.15
   (package
     (name "rust-rmp-serde")
-    (version "0.14.4")
+    (version "0.15.5")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "rmp-serde" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1n2jn3yj5zbjhz5lah98yylpzhfc1c0h5fcksjp75r3gj86dgrsc"))))
+        (base32 "178f4qlicldm9iy74q4wdqldk5i11p1ad30wzs9avx04mpwwygkj"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -45594,7 +45594,7 @@ (define-public rust-serdeconv-0.4
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-rmp-serde" ,rust-rmp-serde-0.14)
+       (("rust-rmp-serde" ,rust-rmp-serde-0.15)
         ("rust-serde" ,rust-serde-1)
         ("rust-serde-json" ,rust-serde-json-1)
         ("rust-toml" ,rust-toml-0.5)
--
2.33.1




^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#51724] [PATCH 08/12] gnu: Add rust-twoway-0.2.
  2021-11-09 16:46 [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6 phodina via Guix-patches via
                   ` (5 preceding siblings ...)
  2021-11-09 17:02 ` [bug#51724] [PATCH 07/12] gnu: rust-rmp-serde: Update to 0.15.5 phodina via Guix-patches via
@ 2021-11-09 17:02 ` phodina via Guix-patches via
  2021-11-09 17:03 ` [bug#51724] [PATCH 09/12] gnu: Add rust-rmp-serde-0.13 phodina via Guix-patches via
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: phodina via Guix-patches via @ 2021-11-09 17:02 UTC (permalink / raw)
  To: 51724@debbugs.gnu.org

* gnu/packages/crates-io.scm (rust-twoway-0.2): New variable.
  (rust-twoway-0.1): Inherit from above.

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 1d90181725..0506b787a5 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -56540,17 +56540,17 @@ (define-public rust-tungstenite-0.11
 makes them accessible for those who wants full control over the network.")
     (license (list license:expat license:asl2.0))))

-(define-public rust-twoway-0.1
+(define-public rust-twoway-0.2
   (package
     (name "rust-twoway")
-    (version "0.1.8")
+    (version "0.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (crate-uri "twoway" version))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-        (base32 "1lbf64snscr3vz71jbl6i2c8zr2ndsiqbk6316z39fj1a8mipcar"))))
+        (base32 "0iqb54firzb8jinl2674vz8s6c4h30842sa3v9pcs93w1m3gnzy5"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
@@ -56566,6 +56566,20 @@ (define-public rust-twoway-0.1
 strings.")
     (license (list license:expat license:asl2.0))))

+(define-public rust-twoway-0.1
+  (package
+    (inherit rust-twoway-0.2)
+    (name "rust-twoway")
+    (version "0.1.8")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "twoway" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+		"1lbf64snscr3vz71jbl6i2c8zr2ndsiqbk6316z39fj1a8mipcar"))))))
+
 (define-public rust-typeable-0.1
   (package
     (name "rust-typeable")
--
2.33.1




^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#51724] [PATCH 09/12] gnu: Add rust-rmp-serde-0.13.
  2021-11-09 16:46 [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6 phodina via Guix-patches via
                   ` (6 preceding siblings ...)
  2021-11-09 17:02 ` [bug#51724] [PATCH 08/12] gnu: Add rust-twoway-0.2 phodina via Guix-patches via
@ 2021-11-09 17:03 ` phodina via Guix-patches via
  2021-11-09 17:03 ` [bug#51724] [PATCH 10/12] gnu: Add rust-selectors-0.21 phodina via Guix-patches via
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: phodina via Guix-patches via @ 2021-11-09 17:03 UTC (permalink / raw)
  To: 51724@debbugs.gnu.org

* gnu/packages/crates-io.scm (rust-rmp-serde-0.13): New variable.

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 0506b787a5..13f064bbce 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -41249,6 +41249,29 @@ (define-public rust-rmp-serde-0.15
     (description "This crate provides Serde bindings for RMP.")
     (license license:expat)))

+(define-public rust-rmp-serde-0.13
+  (package
+    (name "rust-rmp-serde")
+    (version "0.13.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "rmp-serde" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1lqclnffx1b3r1faicscmk9j21mijl9bj7ywgjps77vf8ic1s7h1"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-byteorder" ,rust-byteorder-1)
+        ("rust-rmp" ,rust-rmp-0.8)
+        ("rust-serde" ,rust-serde-1))))
+    (home-page "https://github.com/3Hren/msgpack-rust")
+    (synopsis "Serde bindings for RMP")
+    (description "This crate provides Serde bindings for RMP.")
+    (license license:expat)))
+
 (define-public rust-rocket-0.4
   (package
     (name "rust-rocket")
--
2.33.1




^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#51724] [PATCH 10/12] gnu: Add rust-selectors-0.21.
  2021-11-09 16:46 [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6 phodina via Guix-patches via
                   ` (7 preceding siblings ...)
  2021-11-09 17:03 ` [bug#51724] [PATCH 09/12] gnu: Add rust-rmp-serde-0.13 phodina via Guix-patches via
@ 2021-11-09 17:03 ` phodina via Guix-patches via
  2021-11-09 17:04 ` [bug#51724] [PATCH 11/12] gnu: Add rust-tokio-1.8 phodina via Guix-patches via
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: phodina via Guix-patches via @ 2021-11-09 17:03 UTC (permalink / raw)
  To: 51724@debbugs.gnu.org

* gnu/packages/crates-io.scm (rust-selectors-0.21): New variable.

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 13f064bbce..a2150c155d 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -44940,6 +44940,21 @@ (define-public rust-selectors-0.22
     (description "This package provides CSS Selectors matching for Rust.")
     (license license:mpl2.0)))

+(define-public rust-selectors-0.21
+  (package
+    (inherit rust-selectors-0.22)
+    (name "rust-selectors")
+    (version "0.21.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "selectors" version))
+       (file-name
+        (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "11icfj8ix8fqjsnw3dqw83bmhd5qdhxzq2klb486akyypq0b31hv"))))))
+
 (define-public rust-sema-0.1
   (package
     (name "rust-sema")
--
2.33.1




^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#51724] [PATCH 11/12] gnu: Add rust-tokio-1.8.
  2021-11-09 16:46 [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6 phodina via Guix-patches via
                   ` (8 preceding siblings ...)
  2021-11-09 17:03 ` [bug#51724] [PATCH 10/12] gnu: Add rust-selectors-0.21 phodina via Guix-patches via
@ 2021-11-09 17:04 ` phodina via Guix-patches via
  2021-11-09 17:04 ` [bug#51724] [PATCH 12/12] gnu: Add rust-adblock-0.4 phodina via Guix-patches via
  2021-11-15 17:22 ` [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6 Nicolas Goaziou
  11 siblings, 0 replies; 13+ messages in thread
From: phodina via Guix-patches via @ 2021-11-09 17:04 UTC (permalink / raw)
  To: 51724@debbugs.gnu.org

* gnu/packages/crates-io.scm (rust-tokio-1.8): New variable.
  (rust-tokio-1): Inherit from above.

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index a2150c155d..159043d657 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -53186,10 +53186,10 @@ (define-public rust-titlecase-1
 Fireball''.")
     (license license:expat)))

-(define-public rust-tokio-1
+(define-public rust-tokio-1.8
   (package
     (name "rust-tokio")
-    (version "1.2.0")
+    (version "1.8.0")
     (source
      (origin
        (method url-fetch)
@@ -53197,13 +53197,12 @@ (define-public rust-tokio-1
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0fmfykdp29hjq5264mp6sa4c0wp5mlimbi0dd9mrxsk5qq20s6g8"))))
+         "1m18rs51wz6s7dwdwzr0j63kh815x4dx9k0f2c485crs7fqjw32p"))))
     (build-system cargo-build-system)
     (arguments
      `(#:skip-build? #t
        #:cargo-inputs
-       (("rust-autocfg" ,rust-autocfg-1)
-        ("rust-bytes" ,rust-bytes-1)
+       (("rust-bytes" ,rust-bytes-1)
         ("rust-libc" ,rust-libc-0.2)
         ("rust-memchr" ,rust-memchr-2)
         ("rust-mio" ,rust-mio-0.7)
@@ -53214,7 +53213,16 @@ (define-public rust-tokio-1
         ("rust-signal-hook-registry" ,rust-signal-hook-registry-1)
         ("rust-tokio-macros" ,rust-tokio-macros-1)
         ("rust-tracing" ,rust-tracing-0.1)
-        ("rust-winapi" ,rust-winapi-0.3))))
+        ("rust-winapi" ,rust-winapi-0.3))
+       #:cargo-development-inputs
+       (("rust-async-stream" ,rust-async-stream-0.3)
+        ("rust-autocfg" ,rust-autocfg-1)
+        ("rust-nix" ,rust-nix-0.19)
+        ("rust-futures" ,rust-futures-0.3)
+        ("rust-proptest" ,rust-proptest-1)
+        ("rust-sokcet2-0.4" ,rust-socket2-0.4)
+        ("rust-tokio-stream" ,rust-tokio-stream-0.1)
+        ("rust-tokio-test" ,rust-tokio-test-0.4))))
     (home-page "https://tokio.rs")
     (synopsis "Event-driven, non-blocking I/O platform")
     (description
@@ -53222,6 +53230,36 @@ (define-public rust-tokio-1
 writing asynchronous I/O backed applications.")
     (license license:expat)))

+(define-public rust-tokio-1
+  (package
+    (inherit rust-tokio-1.8)
+    (name "rust-tokio")
+    (version "1.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "tokio" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0fmfykdp29hjq5264mp6sa4c0wp5mlimbi0dd9mrxsk5qq20s6g8"))))
+    (arguments
+     `(#:skip-build? #t
+       #:cargo-inputs
+       (("rust-autocfg" ,rust-autocfg-1)
+        ("rust-bytes" ,rust-bytes-1)
+        ("rust-libc" ,rust-libc-0.2)
+        ("rust-memchr" ,rust-memchr-2)
+        ("rust-mio" ,rust-mio-0.7)
+        ("rust-num-cpus" ,rust-num-cpus-1)
+        ("rust-once-cell" ,rust-once-cell-1)
+        ("rust-parking-lot" ,rust-parking-lot-0.11)
+        ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)
+        ("rust-signal-hook-registry" ,rust-signal-hook-registry-1)
+        ("rust-tokio-macros" ,rust-tokio-macros-1)
+        ("rust-tracing" ,rust-tracing-0.1)
+        ("rust-winapi" ,rust-winapi-0.3))))))
+
 (define-public rust-tokio-0.3
   (package
     (inherit rust-tokio-1)
--
2.33.1




^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#51724] [PATCH 12/12] gnu: Add rust-adblock-0.4.
  2021-11-09 16:46 [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6 phodina via Guix-patches via
                   ` (9 preceding siblings ...)
  2021-11-09 17:04 ` [bug#51724] [PATCH 11/12] gnu: Add rust-tokio-1.8 phodina via Guix-patches via
@ 2021-11-09 17:04 ` phodina via Guix-patches via
  2021-11-15 17:22 ` [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6 Nicolas Goaziou
  11 siblings, 0 replies; 13+ messages in thread
From: phodina via Guix-patches via @ 2021-11-09 17:04 UTC (permalink / raw)
  To: 51724@debbugs.gnu.org

* gnu/packages/crates-io.scm (rust-adblock-0.4): New variable.
* gnu/packages/patches/rust-adblock-ignore-live-tests.patch: New file.
* gnu/local.mk: Add patch.

diff --git a/gnu/local.mk b/gnu/local.mk
index 05258ac054..c2923d45de 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1752,6 +1752,7 @@ dist_patch_DATA =					\
   %D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \
   %D%/packages/patches/rust-1.45-linker-locale.patch		\
   %D%/packages/patches/rust-1.48-linker-locale.patch		\
+  %D%/packages/patches/rust-adblock-ignore-live-tests.patch		\
   %D%/packages/patches/rust-bootstrap-stage0-test.patch		\
   %D%/packages/patches/rust-coresimd-doctest.patch		\
   %D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch	\
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 159043d657..1da99d8da6 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -982,6 +982,60 @@ (define-public rust-adaptive-barrier-0.1
 deadlock, like the standard Barrier).")
     (license (list license:asl2.0 license:expat))))

+(define-public rust-adblock-0.4
+  (package
+    (name "rust-adblock")
+    (version "0.4.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (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"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#: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-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-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-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-csv" ,rust-csv-1)
+        ("rust-futures" ,rust-futures-0.3)
+        ("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 `(("pkg-config" ,pkg-config)
+                     ("openssl" ,openssl)))
+    (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
+syntax (e.g.  EasyList, EasyPrivacy) filter parsing and matching.")
+    (license license:mpl2.0)))
+
 (define-public rust-addr2line-0.14
   (package
     (name "rust-addr2line")
diff --git a/gnu/packages/patches/rust-adblock-ignore-live-tests.patch b/gnu/packages/patches/rust-adblock-ignore-live-tests.patch
new file mode 100644
index 0000000000..a1c9c190b6
--- /dev/null
+++ b/gnu/packages/patches/rust-adblock-ignore-live-tests.patch
@@ -0,0 +1,69 @@
+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
+
--
2.33.1




^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6.
  2021-11-09 16:46 [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6 phodina via Guix-patches via
                   ` (10 preceding siblings ...)
  2021-11-09 17:04 ` [bug#51724] [PATCH 12/12] gnu: Add rust-adblock-0.4 phodina via Guix-patches via
@ 2021-11-15 17:22 ` Nicolas Goaziou
  11 siblings, 0 replies; 13+ messages in thread
From: Nicolas Goaziou @ 2021-11-15 17:22 UTC (permalink / raw)
  To: 51724; +Cc: 51724-done, phodina

Hello,

phodina via Guix-patches via <guix-patches@gnu.org> writes:

> The following series of patches add rust-adblock as a small milestone for upstreaming Brave browser.
>
>
> * gnu/packages/crates-io.scm (rust-lifeguard-0.6): New variable.

Applied. Thank you.

Regards,
-- 
Nicolas Goaziou




^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2021-11-15 17:23 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-09 16:46 [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6 phodina via Guix-patches via
2021-11-09 16:58 ` [bug#51724] [PATCH 02/12] gnu: Add rust-psl-types-2 phodina via Guix-patches via
2021-11-09 16:59 ` [bug#51724] [PATCH 03/12] gnu: Add rust-psl-2 phodina via Guix-patches via
2021-11-09 17:00 ` [bug#51724] [PATCH 04/12] gnu: Add rust-publicsuffix-2 phodina via Guix-patches via
2021-11-09 17:00 ` [bug#51724] [PATCH 05/12] gnu: Add rust-no-std-net-0.5 phodina via Guix-patches via
2021-11-09 17:01 ` [bug#51724] [PATCH 06/12] gnu: Add rust-addr-0.14 phodina via Guix-patches via
2021-11-09 17:02 ` [bug#51724] [PATCH 07/12] gnu: rust-rmp-serde: Update to 0.15.5 phodina via Guix-patches via
2021-11-09 17:02 ` [bug#51724] [PATCH 08/12] gnu: Add rust-twoway-0.2 phodina via Guix-patches via
2021-11-09 17:03 ` [bug#51724] [PATCH 09/12] gnu: Add rust-rmp-serde-0.13 phodina via Guix-patches via
2021-11-09 17:03 ` [bug#51724] [PATCH 10/12] gnu: Add rust-selectors-0.21 phodina via Guix-patches via
2021-11-09 17:04 ` [bug#51724] [PATCH 11/12] gnu: Add rust-tokio-1.8 phodina via Guix-patches via
2021-11-09 17:04 ` [bug#51724] [PATCH 12/12] gnu: Add rust-adblock-0.4 phodina via Guix-patches via
2021-11-15 17:22 ` [bug#51724] [PATCH 01/12] gnu: Add rust-lifeguard-0.6 Nicolas Goaziou

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).