diff options
| author | Marcus Ramberg <marcus@means.no> | 2024-09-27 19:57:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-27 19:57:33 +0200 |
| commit | 073a3401b0a6ac0b6490940bce33fe9d30aab10f (patch) | |
| tree | d8504d2cf5032cf1685683dd364ad12e6e6074f0 | |
| parent | [Backport release-24.05] cups-filters: apply patch for CVE-2024-47076 (#344833) (diff) | |
| parent | floorp-unwrapped: 11.17.8 -> 11.18.1 (diff) | |
| download | nixpkgs-073a3401b0a6ac0b6490940bce33fe9d30aab10f.tar.gz | |
[Backport release-24.05] floorp: 11.17.5 -> 11.18.1 (#344739)
| -rw-r--r-- | pkgs/applications/networking/browsers/floorp/default.nix | 15 |
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..dcb53249ed4d 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.18.1"; 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.3.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-8uONEMQI801c9txDa1ZmHQE8xQCViAJbTkxtgYRmUDE="; + hash = "sha256-w7b3s8/ekDzGbjbdqK/9W9S5e79fbE9ftJkSsz2sQtA="; }; 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 + ]; }) |