chore(web/chromium): some more minor refactoring to extension build steps

9 files changed, 25 insertions, 28 deletions

diff --git a/modules/web/chromium/extensions/aria2-explorer/metadata.nix b/modules/web/chromium/extensions/aria2-explorer/metadata.nix
index a9b444b..06bbb1b 100644
--- a/modules/web/chromium/extensions/aria2-explorer/metadata.nix
+++ b/modules/web/chromium/extensions/aria2-explorer/metadata.nix
@@ -1,4 +1,4 @@
-{
+rec {
   pname = "aria2-explorer";
   owner = "alexhua";
   repo = "Aria2-Explorer";
@@ -6,7 +6,7 @@
   updateType = "release";
   tagPrefix = "v";
   id = "hhndckjijagcbbljjhjcbnpjhamkkcjl";
-  url = "https://github.com/alexhua/Aria2-Explorer/archive/refs/tags/v2.8.2.zip";
+  url = "https://github.com/alexhua/Aria2-Explorer/archive/refs/tags/v${version}.zip";
   hash = "sha256-4+SkvgWrELcohpv724YEtvSQSDCmjphkk8bvYggxVag=";
   extensionKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArOOLc1LawtEonls6j4P/KQyUAGO3KJcE9uAU9WV/tBIX6ulXivZypUAXC6Lokv56Bjnc08t/wUH8Xph0Gya4UzjSbZkdtR94yksY9mq5g/8df4p4v29SO+E6efQyXGyImEzFSHsNP4gu8akB5xT8O//51XRAXsMBVgUUTuUAlpnwd25Yy1tpQwqjbSV3gvAMo+a6+y0dBfXJ9fjwAYBwvx4cONSNjirIuyOG5r5FI5TaGMK+aV1xwNsDE59dyDkYL2f2mm1kN/2xMcayJrskVxtOcy18ijjXzyRJvNyhkLM2c5tEZHUkIlEgTjbJruF8EKrj2sCnodt1jknD0BSr1wIDAQAB";
 }
diff --git a/modules/web/chromium/extensions/browserpass/metadata.nix b/modules/web/chromium/extensions/browserpass/metadata.nix
index 862209b..16c9221 100644
--- a/modules/web/chromium/extensions/browserpass/metadata.nix
+++ b/modules/web/chromium/extensions/browserpass/metadata.nix
@@ -1,4 +1,4 @@
-{
+rec {
   pname = "browserpass";
   owner = "browserpass";
   repo = "browserpass-extension";
@@ -6,7 +6,7 @@
   updateType = "release";
   tagPrefix = "";
   id = "jbaodoonnfhdccelcpnekimkijgdfjhl";
-  url = "https://github.com/browserpass/browserpass-extension/releases/download/3.12.0/browserpass-chromium-3.12.0.zip";
+  url = "https://github.com/browserpass/browserpass-extension/releases/download/${version}/browserpass-chromium-${version}.zip";
   hash = "sha256-WBpPTtec7zJPWM1xNKVxWWW/sB1aIuPecp5fUTWRE8c=";
   extensionKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv8xL6YhF7YTUE57jhme0vyJi4FZGXDBLV93QYWv6yrYbmczkM4aEOp4FWm63NnkJ8aGZ/0uL0rHmB4qo36awso/1L9XGJaBbQAQuOv/uIPAE18STJ4EtXA1hYDMGbkkr4fZHYJTH3GmoeajZYfp/cu8qc0cK4P5FVq67qwYSD4uFQJRJKuX8jM4lzO8dLH/tJsN3KwlfeSA8xvS2jiIJHtCKc6XqMrOCCfSmI8uILfg06fv46VOoVDH91dlZguOYANAJDW69uCY9YcvyVEmmf6DUnvmkrziDtV2O4/Af6nt7R5JHOcVcqVScoXJG9sfd4KATMcgoZj3fy19+R/4GvwIDAQAB";
 }
diff --git a/modules/web/chromium/extensions/darkreader/metadata.nix b/modules/web/chromium/extensions/darkreader/metadata.nix
index 7cc116f..0611efd 100644
--- a/modules/web/chromium/extensions/darkreader/metadata.nix
+++ b/modules/web/chromium/extensions/darkreader/metadata.nix
@@ -1,12 +1,12 @@
-{
+rec {
   pname = "darkreader";
   owner = "darkreader";
   repo = "darkreader";
-  version = "4.9.130";
+  version = "4.9.132";
   updateType = "release";
   tagPrefix = "v";
   id = "nfkppknaehpcafkbgmhfhkpapflndfip";
-  url = "https://github.com/darkreader/darkreader/releases/download/v4.9.130/darkreader-chrome.zip";
+  url = "https://github.com/darkreader/darkreader/releases/download/v${version}/darkreader-chrome.zip";
   hash = "sha256-Y0HHVlK/FOZpfqWxCeM0Ob2Z8nUFKQ+WC8S9Sv9snpU=";
   extensionKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8xN0p4CHkthdkB6imIb+8T2xsNSH9eeFAy7NhP3xAO1ML6FJyOFroabQIG6HcV7miXmJamY7zmE96QgEEvGqQ18+g+RsfvriJp0LRXi95TJBdCXoMiW348bWmue0Jk+/rhzWijMn/z/5fDnrZl0xjKU7MAXzW9dWfiTeIBc4wlk21zjGJxiG0uM1YAywe3jW8g0QCBga9iTaN67D+sBbBs4HmPa3xIbtPTAgqt1LDEk2T7IseoUia8MwxATWKWFegW6legMkPLVWH9jQ+x2ZbjtDP9GXk+1YqqWQUll1Xmal7C9ljeagkM5nhxgttAQoWBMPMJFwr7VN3AXtNXXPWQIDAQAB";
 }
diff --git a/modules/web/chromium/extensions/default.nix b/modules/web/chromium/extensions/default.nix
index a7b1e91..49290c4 100644
--- a/modules/web/chromium/extensions/default.nix
+++ b/modules/web/chromium/extensions/default.nix
@@ -9,8 +9,6 @@ let
     inherit lib pkgs config;
   };
 
-  mkExtension = path: import path { inherit lib pkgs extLib; };
-
   extensionSubmodule = lib.types.submodule {
     options = {
       pname = lib.mkOption {
@@ -48,13 +46,12 @@ in
     '';
   };
 
-  # Readonly options get their actual value assigned here in this module
   config.web.chromium.extensions = {
-    aria2Explorer = mkExtension ./aria2-explorer;
-    browserpass = mkExtension ./browserpass;
-    darkreader = mkExtension ./darkreader;
-    searxngHome = mkExtension ./searxng-home;
-    ublockOrigin = mkExtension ./ublock-origin;
-    vimium = mkExtension ./vimium;
+    aria2Explorer = import ./aria2-explorer { inherit lib pkgs extLib; };
+    browserpass = import ./browserpass { inherit lib pkgs extLib; };
+    darkreader = import ./darkreader { inherit lib pkgs extLib; };
+    searxngHome = import ./searxng-home { inherit lib pkgs extLib; };
+    ublockOrigin = import ./ublock-origin { inherit lib pkgs extLib; };
+    vimium = import ./vimium { inherit lib pkgs extLib; };
   };
 }
diff --git a/modules/web/chromium/extensions/inject_extension_key.lua b/modules/web/chromium/extensions/inject_extension_key.lua
index f5c8c2b..fe6aa06 100644
--- a/modules/web/chromium/extensions/inject_extension_key.lua
+++ b/modules/web/chromium/extensions/inject_extension_key.lua
@@ -1,7 +1,7 @@
 #!/usr/bin/env luajit
 -- Strip JSON comments and trailing commas from a manifest, inject the
 -- extension's public key, and rewrite it.
-local dkjson = require("dkjson")
+local cjson = require("cjson")
 
 local manifest_path = assert(arg[1], "usage: inject_extension_key.lua <manifest> <extension_key>")
 local extension_key = assert(arg[2], "usage: inject_extension_key.lua <manifest> <extension_key>")
@@ -70,9 +70,9 @@ while character_position <= content_length do
   end
 end
 
-local manifest_data = dkjson.decode(table.concat(sanitized_chunks))
+local manifest_data = cjson.decode(table.concat(sanitized_chunks))
 manifest_data.key = extension_key
 
 manifest_file = assert(io.open(manifest_path, "w"))
-manifest_file:write(dkjson.encode(manifest_data, { indent = true }))
+manifest_file:write(cjson.encode(manifest_data))
 manifest_file:close()
diff --git a/modules/web/chromium/extensions/lib.nix b/modules/web/chromium/extensions/lib.nix
index 7059b35..d2e2c94 100644
--- a/modules/web/chromium/extensions/lib.nix
+++ b/modules/web/chromium/extensions/lib.nix
@@ -23,7 +23,7 @@
         config.file-management.ouch.package
         # TODO: Switch to using cjson. As we are already using it for other
         # scripts like eww
-        (pkgs.luajit.withPackages (ps: [ ps.dkjson ]))
+        (pkgs.luajit.withPackages (ps: [ ps.lua-cjson ]))
       ];
       dontUnpack = true;
 
diff --git a/modules/web/chromium/extensions/searxng-home/metadata.nix b/modules/web/chromium/extensions/searxng-home/metadata.nix
index f2d58f6..8258e31 100644
--- a/modules/web/chromium/extensions/searxng-home/metadata.nix
+++ b/modules/web/chromium/extensions/searxng-home/metadata.nix
@@ -1,4 +1,4 @@
-{
+rec {
   pname = "searxng-home";
   owner = "arpitchakladar";
   repo = "searxng-home";
@@ -6,7 +6,7 @@
   updateType = "release";
   tagPrefix = "v";
   id = "gmkjafoflhifgcnmpomcoakhahmepfkc";
-  url = "https://github.com/arpitchakladar/searxng-home/releases/download/v0.2.0/chrome-v0.2.0.zip";
+  url = "https://github.com/arpitchakladar/searxng-home/releases/download/v${version}/chrome-v${version}.zip";
   hash = "sha256-fbXxtjTa8GKxylc5JS3GVj/oC+xCI5VJkE3bBpA2CbY=";
   isCrx = false;
   extensionKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2cDXvyOi1QgsWlC8LnwyXIV7EZ6yWLKvKCNBn8DPD4DwJgw221wqo6R9p/qnsnqAuveZrV/ApRq6MdzAclkWTGKyCJCRdJGBG/XM3BVfMBkuLXaLrvpFf8p/mDcAP37yOh0Z45XMTr55Y9ifnNH6Wu+3zAaASJlkBuGZ5ygbcUYcomcKjs7qfqxqY8Qe9ovIuLOQely+X9i+Qa6bZ0GJUTgXiKHckgY/43l+H+gs9V91he8qaSubzWPqwbYk8aWhTmjQTeR0vfUP+1/XBESt4u4NGxHsuk+ZwwbL6ThYRbzgj/UbvVGVQsanhIwODdJte51XanEo475Woal31++uxwIDAQAB";
diff --git a/modules/web/chromium/extensions/ublock-origin/metadata.nix b/modules/web/chromium/extensions/ublock-origin/metadata.nix
index 86b99d6..078cac2 100644
--- a/modules/web/chromium/extensions/ublock-origin/metadata.nix
+++ b/modules/web/chromium/extensions/ublock-origin/metadata.nix
@@ -1,12 +1,12 @@
-{
+rec {
   pname = "ublock-origin";
   owner = "gorhill";
   repo = "uBlock";
-  version = "1.74.0";
+  version = "1.75.0";
   updateType = "release";
   tagPrefix = "";
   id = "eahmphincfcmmpgkpobpneimcjndlcna";
-  url = "https://github.com/gorhill/uBlock/releases/download/1.74.0/uBlock0_1.74.0.chromium.zip";
-  hash = "sha256-KaR16CaIswTyqbLAV3wmVaiq91zjY/4C1yDTibu59FE=";
+  url = "https://github.com/gorhill/uBlock/releases/download/${version}/uBlock0_${version}.chromium.zip";
+  hash = "sha256-OTz5VwnRB01AIpcOkBTkNDlcU6giOH8eJfQ76Xz0tYI=";
   extensionKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtXfkoFzWOh3Fet9x4L6WY1pw755kt7bFwqd/nmTm5Ptg7d40Qde0tTIhceCFVkwrWTQ3n2/WSpYXoU/UMgSW9anBzoUM0ZXanIdoeHwvL3eMNyx+iyvSrRxee26GwzbZ8J0UvH77KT3rW/iV5ejV4wTxTD3rFr0udkI5bbTPYpmGFOKPD8I3IB6BsoUTKW3XTSLM0fUYggdbDNwQGZvLYwqZzk/vWH/oifHR6CEvdFR51JAdf3tJQhttI6My49Vq6etCi9y5ZLXrMksxcEcIlQKaF2fdlfL1bYXRAVFDsieuAmu3gJPBj65PVJif5A7DfcH8zm8YGPwrJlTjaJQeDQIDAQAB";
 }
diff --git a/modules/web/chromium/extensions/vimium/metadata.nix b/modules/web/chromium/extensions/vimium/metadata.nix
index 04b83a9..f7e3a6d 100644
--- a/modules/web/chromium/extensions/vimium/metadata.nix
+++ b/modules/web/chromium/extensions/vimium/metadata.nix
@@ -1,4 +1,4 @@
-{
+rec {
   pname = "vimium";
   owner = "philc";
   repo = "vimium";
@@ -6,7 +6,7 @@
   updateType = "tag";
   tagPrefix = "v";
   id = "ojbnfglfbelfbgfjlkehclgfkdkkjkdj";
-  url = "https://github.com/philc/vimium/archive/refs/tags/v2.4.2.zip";
+  url = "https://github.com/philc/vimium/archive/refs/tags/v${version}.zip";
   hash = "sha256-Q+Tus7nl7TiuVJ4hn8vYg9L2cC4NhqWSOr5WKD0RSq0=";
   extensionKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqUw4MXlUYAqIQqJ1Gb/RH7RdgVjekKed1aoJS1OPM5C9EFfvVlj0/eIf8dVbCMKc7ThRYYJkZPqFNN38T0LtnBJbvdiJztL/nGueJT7GupXisIzJ9s17X+HpogODouDY7qHldQRw/7qnrBe0NeNxWVeUOH9PmHi8nBTZ3JRygS9svZ1BvY0ZkPZyNDTEsXCbb+fkSOOkjqDNqtt98eFJhPGZ0W+cn3KgTdr+rC0rqfacwfu41dpmQPEirOFtshs8DywoI+L66UtqVfwhBNdb3+JN7oeDs4HNFjCPbqOTSKKCng+nNndpIen2CKYUuYztvmrrRdQeEv5i3l7/MFrRXQIDAQAB";
 }