summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Heiss <christoph@c8h4.io>2024-08-26 12:20:40 +0200
committerChristoph Heiss <christoph@c8h4.io>2024-09-26 23:10:11 +0200
commit91f34d54d41a5a2738afba98e667822fb2a0e1c0 (patch)
tree1da5a5096cbd73f69488d0d568c3a2a6ce479356
parent[Backport release-24.05] chromedriver,{ungoogled-,}chromium: 129.0.6668.58-1 ... (diff)
downloadnixpkgs-91f34d54d41a5a2738afba98e667822fb2a0e1c0.tar.gz
floorp: 11.17.5 -> 11.17.7
Release notes: https://blog.ablaze.one/4464/2024-08-01/ Git changelog: https://github.com/Floorp-Projects/Floorp/compare/v11.17.5...v11.17.7 Signed-off-by: Christoph Heiss <christoph@c8h4.io> (cherry picked from commit a694040e17f8795c68164b202fcc6e27460d9332)
-rw-r--r--pkgs/applications/networking/browsers/floorp/default.nix15
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix
index be20ac36b50c..18400edfd546 100644
--- a/pkgs/applications/networking/browsers/floorp/default.nix
+++ b/pkgs/applications/networking/browsers/floorp/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
+, fetchpatch
, buildMozillaMach
, nixosTests
, python311
@@ -8,7 +9,7 @@
((buildMozillaMach rec {
pname = "floorp";
- packageVersion = "11.17.5";
+ packageVersion = "11.17.7";
applicationName = "Floorp";
binaryName = "floorp";
branding = "browser/branding/official";
@@ -16,14 +17,14 @@
allowAddonSideload = true;
# Must match the contents of `browser/config/version.txt` in the source tree
- version = "128.1.0";
+ version = "128.2.0";
src = fetchFromGitHub {
owner = "Floorp-Projects";
repo = "Floorp";
fetchSubmodules = true;
rev = "v${packageVersion}";
- hash = "sha256-8uONEMQI801c9txDa1ZmHQE8xQCViAJbTkxtgYRmUDE=";
+ hash = "sha256-IAzPt696AWBEyfxR5U5/Isd6urPoi3fHshT+Fl+o/Bg=";
};
extraConfigureFlags = [
@@ -68,4 +69,12 @@
}).overrideAttrs (prev: {
MOZ_DATA_REPORTING = "";
MOZ_TELEMETRY_REPORTING = "";
+
+ # Upstream already includes some of the bugfix patches that are applied by
+ # `buildMozillaMach`. Pick out only the relevant ones for Floorp and override
+ # the list here.
+ patches = [
+ ../firefox/env_var_for_system_dir-ff111.patch
+ ../firefox/no-buildconfig-ffx121.patch
+ ];
})