me
/
guix
Archived
1
0
Fork 0
Code

gnu: ublock-origin: Update to 1.51.0. 

* gnu/packages/browser-extensions.scm
(ublock-main-assets): Add origin.
(ublock-prod-assets): Add origin.
(ublock-origin): Update to 1.51.0.
[source]: Dropped (recursive? #t).
[arguments]: Rewrite phase do-not-depend-on-git. Use gexp.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Nicolas Graves 2023-08-29 18:59:01 +02:00 committed by Ludovic Courtès
parent 51e1df07b1
commit fe7b5df00c
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 72 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
gnu/packages/browser-extensions.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2023 Nicolas Graves <ngraves@ngraves.fr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -17,6 +18,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages browser-extensions) (define-module (gnu packages browser-extensions)
#:use-module (guix gexp)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system copy) #:use-module (guix build-system copy)
@ -48,57 +50,88 @@ supported content to the Kodi media center.")
(define-public play-to-kodi/chromium (define-public play-to-kodi/chromium
(make-chromium-extension play-to-kodi)) (make-chromium-extension play-to-kodi))
(define ublock-main-assets
;; Arbitrary commit of branch master,
;; Update when updating uBlockOrigin.
(let* ((name "ublock-main-assets")
(commit "c8783488f377723165e3661062bd124ae6d57165")
(revision "0")
(version (git-version "0" revision commit)))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/uBlockOrigin/uAssets")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "1b6a1m6s060r49vg563f32rsy057af6i4jcyprym4sdci3z90nls")))))
(define ublock-prod-assets
;; Arbitrary commit of branch gh-pages,
;; Update when updating uBlockOrigin.
(let* ((name "ublock-prod-assets")
(commit "fbcfe9229ab6b865ef349c01a4eac73943be8418")
(revision "0")
(version (git-version "0" revision commit)))
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/uBlockOrigin/uAssets")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32 "0s5rvaz8lc9lk44yfc8463vah8yppy1ybmag0dpd4m1hyj6165h0")))))
(define ublock-origin (define ublock-origin
(package (package
(name "ublock-origin") (name "ublock-origin")
(version "1.45.2") (version "1.51.0")
(home-page "https://github.com/gorhill/uBlock") (home-page "https://github.com/gorhill/uBlock")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (url home-page) (commit version) (uri (git-reference
;; Also fetch the tightly coupled (url home-page)
;; "uAssets" submodule. (commit version)))
(recursive? #t)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0dz1rcphm8cbc2qdd41ahbsqskmqcf2ja6zx0vq0dswnakpc3lyd")))) "1i8rnij3sbwg6vj6znprrsca0n5xjzhmhppaa8v6jyxg6wrrfch1"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(outputs '("xpi" "firefox" "chromium")) (outputs '("xpi" "firefox" "chromium"))
(arguments (arguments
'(#:tests? #f ;no tests (list
#:allowed-references () #:tests? #f ;no tests
#:phases #:allowed-references '()
(modify-phases (map (lambda (phase) #:phases
(assq phase %standard-phases)) #~(modify-phases (map (lambda (phase)
'(set-paths unpack patch-source-shebangs)) (assq phase %standard-phases))
(add-after 'unpack 'do-not-depend-on-git '(set-paths unpack patch-source-shebangs))
(lambda _ (add-after 'unpack 'do-not-depend-on-git
;; The script attempts to checkout the uAssets submodule, (lambda _
;; but we already did so with git-fetch. (mkdir-p "dist/build/uAssets/main")
(substitute* "tools/make-assets.sh" (copy-recursively #$ublock-main-assets "dist/build/uAssets/main")
(("^git submodule update.*") (mkdir-p "dist/build/uAssets/prod")
"")))) (copy-recursively #$ublock-prod-assets "dist/build/uAssets/prod")))
(add-after 'unpack 'make-files-writable (add-after 'unpack 'make-files-writable
(lambda _ (lambda _
;; The build system copies some files and later tries ;; The build system copies some files and later tries
;; modifying them. ;; modifying them.
(for-each make-file-writable (find-files ".")))) (for-each make-file-writable (find-files "."))))
(add-after 'patch-source-shebangs 'build-xpi (add-after 'patch-source-shebangs 'build-xpi
(lambda _ (lambda _
(invoke "./tools/make-firefox.sh" "all"))) (invoke "./tools/make-firefox.sh" "all")))
(add-after 'build-xpi 'build-chromium (add-after 'build-xpi 'build-chromium
(lambda _ (lambda _
(invoke "./tools/make-chromium.sh"))) (invoke "./tools/make-chromium.sh")))
(add-after 'build-chromium 'install (add-after 'build-chromium 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((firefox (assoc-ref outputs "firefox")) (let ((firefox (assoc-ref outputs "firefox"))
(xpi (assoc-ref outputs "xpi")) (xpi (assoc-ref outputs "xpi"))
(chromium (assoc-ref outputs "chromium"))) (chromium (assoc-ref outputs "chromium")))
(install-file "dist/build/uBlock0.firefox.xpi" (install-file "dist/build/uBlock0.firefox.xpi"
(string-append xpi "/lib/mozilla/extensions")) (string-append xpi "/lib/mozilla/extensions"))
(copy-recursively "dist/build/uBlock0.firefox" firefox) (copy-recursively "dist/build/uBlock0.firefox" firefox)
(copy-recursively "dist/build/uBlock0.chromium" chromium))))))) (copy-recursively "dist/build/uBlock0.chromium" chromium)))))))
(native-inputs (native-inputs
(list python-wrapper zip)) (list python-wrapper zip))
(synopsis "Block unwanted content from web sites") (synopsis "Block unwanted content from web sites")