[bug#78565] gnu: ublock-origin: Update to 1.64.0.

Message ID 20250523133132.3114-1-nandre@riseup.net
State New
Headers
Series [bug#78565] gnu: ublock-origin: Update to 1.64.0. |

Commit Message

André Batista May 23, 2025, 1:31 p.m. UTC
  * gnu/packages/browser-extensions.scm (ublock-origin): Update to 1.64.0.
(ublock-main-assets): Update to d59acb82a09c668be70872044f2a4fd11273f0a7.
(ublock-prod-assets): Update to 70efa9f0dabb41782ae53430d8acf45032a2edb5.

Change-Id: I8e3cee8d786619fc3f3849dcd81c07fb25446583
---
 gnu/packages/browser-extensions.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


base-commit: 8dff81313876a54519ce17e9fda64d4310e2dd5c
  

Comments

Hilton Chain May 24, 2025, 1:27 a.m. UTC | #1
André Batista <nandre@riseup.net> writes:

> * gnu/packages/browser-extensions.scm (ublock-origin): Update to 1.64.0.
> (ublock-main-assets): Update to d59acb82a09c668be70872044f2a4fd11273f0a7.
> (ublock-prod-assets): Update to 70efa9f0dabb41782ae53430d8acf45032a2edb5.
>
> Change-Id: I8e3cee8d786619fc3f3849dcd81c07fb25446583
> ---
>  gnu/packages/browser-extensions.scm | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)

Updated revision for assets and applied as
213d5a4db3dac8fb4a5c7e33432145759169081e, thanks!
  
André Batista May 24, 2025, 3:03 p.m. UTC | #2
Hi Hako,

sáb 24 mai 2025 às 09:27:22 (1748089642), hako@ultrarare.space enviou:
> André Batista <nandre@riseup.net> writes:
> 
> > * gnu/packages/browser-extensions.scm (ublock-origin): Update to 1.64.0.
> > (ublock-main-assets): Update to d59acb82a09c668be70872044f2a4fd11273f0a7.
> > (ublock-prod-assets): Update to 70efa9f0dabb41782ae53430d8acf45032a2edb5.
> >
> > Change-Id: I8e3cee8d786619fc3f3849dcd81c07fb25446583
> > ---
> >  gnu/packages/browser-extensions.scm | 12 ++++++------
> >  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> Updated revision for assets and applied as
> 213d5a4db3dac8fb4a5c7e33432145759169081e, thanks! 

Thanks!

While we are at it, may I ask when am I supposed to update the revision?
Seen your fix reminded me that this is not clear to me.

Cheers!
  
Hilton Chain May 24, 2025, 3:55 p.m. UTC | #3
André Batista <nandre@riseup.net> writes:

> Hi Hako,
>
> sáb 24 mai 2025 às 09:27:22 (1748089642), hako@ultrarare.space enviou:
>> André Batista <nandre@riseup.net> writes:
>> 
>> > * gnu/packages/browser-extensions.scm (ublock-origin): Update to 1.64.0.
>> > (ublock-main-assets): Update to d59acb82a09c668be70872044f2a4fd11273f0a7.
>> > (ublock-prod-assets): Update to 70efa9f0dabb41782ae53430d8acf45032a2edb5.
>> >
>> > Change-Id: I8e3cee8d786619fc3f3849dcd81c07fb25446583
>> > ---
>> >  gnu/packages/browser-extensions.scm | 12 ++++++------
>> >  1 file changed, 6 insertions(+), 6 deletions(-)
>> 
>> Updated revision for assets and applied as
>> 213d5a4db3dac8fb4a5c7e33432145759169081e, thanks! 
>
> Thanks!
>
> While we are at it, may I ask when am I supposed to update the revision?
> Seen your fix reminded me that this is not clear to me.

Update revision is to make sure the new version is greater that the old
one:
--8<---------------cut here---------------start------------->8---
0.0.0-1.xyzxyzx
0.0.0-2.yzxyzxy
--8<---------------cut here---------------end--------------->8---

and Guix UI displays the version change, e.g. ‘guix upgrade’ and
‘guix pull --details’.

It's not strictly necessary here since these assets are just sources
with no actual version information attached, but it's a good practice to
follow :)
  

Patch

diff --git a/gnu/packages/browser-extensions.scm b/gnu/packages/browser-extensions.scm
index 9896368b382..ef6b1e61cc1 100644
--- a/gnu/packages/browser-extensions.scm
+++ b/gnu/packages/browser-extensions.scm
@@ -87,7 +87,7 @@  (define ublock-main-assets
   ;; Arbitrary commit of branch master,
   ;; Update when updating uBlockOrigin.
   (let* ((name "ublock-main-assets")
-         (commit "ac5521afc45273f40a9fc835272b1010c19811e4")
+         (commit "d59acb82a09c668be70872044f2a4fd11273f0a7")
          (revision "2")
          (version (git-version "0" revision commit)))
     (origin
@@ -97,13 +97,13 @@  (define ublock-main-assets
             (commit commit)))
       (file-name (git-file-name name version))
       (sha256
-       (base32 "0iv5xyg0vwwfci5s38svzwlg7wn03nryjv2hb5yl9nbbn3wv0yhw")))))
+       (base32 "0bn9470qcjwxmbcvpvgcc2ar3p9jfkd3gachvfd7lldlyrkgnvi7")))))
 
 (define ublock-prod-assets
   ;; Arbitrary commit of branch gh-pages,
   ;; Update when updating uBlockOrigin.
   (let* ((name "ublock-prod-assets")
-         (commit "9177513ffba6f2fe5d627ccd7ce3585d54716aa9")
+         (commit "70efa9f0dabb41782ae53430d8acf45032a2edb5")
          (revision "2")
          (version (git-version "0" revision commit)))
     (origin
@@ -113,12 +113,12 @@  (define ublock-prod-assets
             (commit commit)))
       (file-name (git-file-name name version))
       (sha256
-       (base32 "0mjb603v83psyzc9hpsn45k0rfacczxnnlbicflsjzhrsmc2y46r")))))
+       (base32 "15z1ynsajqa2aqk4wlwqv165hmcf1mav92jas9sqs6r6a9d41qcx")))))
 
 (define ublock-origin
   (package
     (name "ublock-origin")
-    (version "1.63.2")
+    (version "1.64.0")
     (home-page "https://github.com/gorhill/uBlock")
     (source (origin
               (method git-fetch)
@@ -128,7 +128,7 @@  (define ublock-origin
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1j34a7wycd563syw6f75f14fypwr25b3xqvd2dva8yq0s4ad7b0z"))))
+                "0fsqb6zfbiyfd0lc3anb1f09sk0i5bxl1kmspbj31xyn6drzdz3b"))))
     (build-system gnu-build-system)
     (outputs '("xpi" "firefox" "chromium"))
     (properties '((addon-id . "uBlock0@raymondhill.net")))