From dac60468288b12d1de90b19258674b2ec5fd4781 Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 16 Jan 2024 19:10:32 +0000 Subject: [PATCH] firefox-extensions: update to latest --- .../0003-disable-metrics.patch | 13 ++++-- .../bypass-paywalls-clean/default.nix | 4 +- .../ctrl-shift-c-should-copy/default.nix | 2 +- .../ctrl-shift-c-should-copy/default.nix.cmp | 46 +++++++++++++++++++ .../additional/firefox-extensions/default.nix | 10 ++-- 5 files changed, 62 insertions(+), 13 deletions(-) create mode 100644 pkgs/additional/firefox-extensions/ctrl-shift-c-should-copy/default.nix.cmp diff --git a/pkgs/additional/firefox-extensions/bypass-paywalls-clean/0003-disable-metrics.patch b/pkgs/additional/firefox-extensions/bypass-paywalls-clean/0003-disable-metrics.patch index 3a9f4318..eca95483 100644 --- a/pkgs/additional/firefox-extensions/bypass-paywalls-clean/0003-disable-metrics.patch +++ b/pkgs/additional/firefox-extensions/bypass-paywalls-clean/0003-disable-metrics.patch @@ -1,17 +1,18 @@ -commit 780d994fb2dd53b88f81ffa47b98e9433a861e30 +commit aaee6f230dbc4355dcf7fe898df131034101bbbd Author: Colin -Date: 2023-07-18 22:24:34 +0000 +Date: 2024-01-16 18:48:05 +0000 disable metrics reporting diff --git a/background.js b/background.js -index 7c7338b..2da515a 100644 +index eed1089..281b77b 100644 --- a/background.js +++ b/background.js -@@ -896,13 +896,6 @@ ext_api.tabs.onUpdated.addListener((tabId, changeInfo, tab) => { +@@ -979,16 +979,6 @@ ext_api.tabs.onUpdated.addListener((tabId, changeInfo, tab) => { } }); +-setTimeout(function () { -setInterval(function () { - let current_date_str = currentDateStr(); - if (last_date_str < current_date_str) { @@ -19,6 +20,8 @@ index 7c7338b..2da515a 100644 - last_date_str = current_date_str; - } -}, 60 * 60 * 1000); - +-}, 1000); +- var extraInfoSpec = ['blocking', 'requestHeaders']; if (ext_api.webRequest.OnBeforeSendHeadersOptions.hasOwnProperty('EXTRA_HEADERS')) + extraInfoSpec.push('extraHeaders'); diff --git a/pkgs/additional/firefox-extensions/bypass-paywalls-clean/default.nix b/pkgs/additional/firefox-extensions/bypass-paywalls-clean/default.nix index 28aff6e6..d891be8f 100644 --- a/pkgs/additional/firefox-extensions/bypass-paywalls-clean/default.nix +++ b/pkgs/additional/firefox-extensions/bypass-paywalls-clean/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "bypass-paywalls-clean"; - version = "3.4.7.0"; + version = "3.5.1.0"; src = fetchFromGitLab { owner = "magnolia1234"; repo = "bypass-paywalls-firefox-clean"; rev = "v${version}"; - hash = "sha256-kMIddSSarlwqBI0y4YVcXaBelSRjQ9EJSrH0kXISyu0="; + hash = "sha256-61Yi7+F3NFeOEhF7L/b1c/vRfkunjruXs3ZxbJvjgfY="; }; patches = [ diff --git a/pkgs/additional/firefox-extensions/ctrl-shift-c-should-copy/default.nix b/pkgs/additional/firefox-extensions/ctrl-shift-c-should-copy/default.nix index f7bb1773..d8e8e2e9 100644 --- a/pkgs/additional/firefox-extensions/ctrl-shift-c-should-copy/default.nix +++ b/pkgs/additional/firefox-extensions/ctrl-shift-c-should-copy/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "ctrl-shift-c-should-copy"; - version = "unstable-2023-03-04"; + version = "unstable-2023-03-03"; src = fetchFromGitHub { owner = "jscher2000"; diff --git a/pkgs/additional/firefox-extensions/ctrl-shift-c-should-copy/default.nix.cmp b/pkgs/additional/firefox-extensions/ctrl-shift-c-should-copy/default.nix.cmp new file mode 100644 index 00000000..64bf4933 --- /dev/null +++ b/pkgs/additional/firefox-extensions/ctrl-shift-c-should-copy/default.nix.cmp @@ -0,0 +1,46 @@ +{ stdenv, lib +, fetchFromGitHub +, unstableGitUpdater +, zip +}: + +stdenv.mkDerivation { + pname = "ctrl-shift-c-should-copy"; + version = "unstable-2023-03-03"; + + src = fetchFromGitHub { + owner = "jscher2000"; + repo = "Ctrl-Shift-C-Should-Copy"; + rev = "d9e67f330d0e13fc3796e9d797f12450f75a8c6a"; + hash = "sha256-AzH1rZFqEH8sovZZfJykvsEmCedEZWigQFHWHl6/PdE="; + }; + + nativeBuildInputs = [ zip ]; + + buildPhase = '' + zip -r extension.zip ./* + ''; + + installPhase = '' + install extension.zip $out + ''; + + passthru = { + extid = "ctrl-shift-c-copy@jeffersonscher.com"; + updateScript = unstableGitUpdater { }; + }; + + meta = { + homepage = "https://github.com/jscher2000/Ctrl-Shift-C-Should-Copy"; + description = "Potential Firefox extension to intercept Ctrl+Shift+C, block opening developer tools, and copy the selection to the clipboard."; + longDescription = '' + it comes with several limitations: + - doesn't work on new-tab page + - doesn't work if the focus isn't on page content + - e.g. ctrl+shift+c from URL bar still brings up dev console, incorrectly. + + the proper fix to disabling Ctrl+Shift+C seems to require compiling Firefox from source, as of their Quantum project post-2019. + ''; + maintainer = with lib.maintainers; [ colinsane ]; + }; +} diff --git a/pkgs/additional/firefox-extensions/default.nix b/pkgs/additional/firefox-extensions/default.nix index 7666e615..496a6b56 100644 --- a/pkgs/additional/firefox-extensions/default.nix +++ b/pkgs/additional/firefox-extensions/default.nix @@ -135,7 +135,7 @@ in (lib.makeScope newScope (self: with self; { extid = "i2ppb@eyedeekay.github.io"; pname = "i2p-in-private-browsing"; url = "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/releases/download/${version}/i2ppb@eyedeekay.github.io.xpi"; - version = "1.47"; + version = "1.49"; hash = "sha256-LnR5z3fqNJywlr/khFdV4qloKGQhbxNZQvWCEgz97DU="; }; open-in-mpv = fetchVersionedAddon rec { @@ -161,8 +161,8 @@ in (lib.makeScope newScope (self: with self; { extid = "sponsorBlocker@ajay.app"; pname = "sponsorblock"; url = "https://github.com/ajayyy/SponsorBlock/releases/download/${version}/FirefoxSignedInstaller.xpi"; - version = "5.4.29"; - hash = "sha256-AR4SxbCffgupZMcbVgBB+vmd/u4ADsi4GXKg4oKWt34="; + version = "5.5"; + hash = "sha256-hV50GaS05WTVQOXTFDiM5SN0Jf1wNySfEuUTUSENBRw="; }; ublacklist = fetchVersionedAddon rec { extid = "@ublacklist"; @@ -177,8 +177,8 @@ in (lib.makeScope newScope (self: with self; { # N.B.: a handful of versions are released unsigned # url = "https://github.com/gorhill/uBlock/releases/download/${version}/uBlock0_${version}.signed.xpi"; url = "https://github.com/gorhill/uBlock/releases/download/${version}/uBlock0_${version}.firefox.signed.xpi"; - version = "1.54.1b21"; - hash = "sha256-baF8399byq4vOm0OSNe/3bz3mZAV/cf1ohmIJg5MGkA="; + version = "1.55.1b8"; + hash = "sha256-LfcONhxWWhGycHkNgS4JRErBj7cuoS0g1sOCDv56pOk="; }; }; })).overrideScope (self: super: