From 9c964dc07e8ec49604fcbde98e25ec029286fea9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 16:31:49 +0000 Subject: [PATCH 1/6] floorp-unwrapped: 11.13.2 -> 11.13.3 (cherry picked from commit 15a8e38e3453f084bfac1da09c2b1f0619438ceb) --- pkgs/applications/networking/browsers/floorp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 7b015bafbb0fa6c..30c7d10fb025e0f 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -7,7 +7,7 @@ ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.13.2"; + packageVersion = "11.13.3"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -22,7 +22,7 @@ repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-sFtGtxk3vdR5JoZb1yiITybIfGmOYzKLb9NtbhWjBt8="; + hash = "sha256-9EDTVckSqv/nyDi4qjMd54I69WiqM8v6om7zQLT+pQc="; }; extraConfigureFlags = [ From 011a56ef3b3339b7e12300cc89f859e83dff7de1 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sat, 15 Jun 2024 20:25:18 +0200 Subject: [PATCH 2/6] floorp: 11.3.3 -> 11.14.1 Release notes: https://blog.ablaze.one/4375/2024-06-00/ Git changelog: https://github.com/Floorp-Projects/Floorp/compare/v11.13.3...v11.14.1 Signed-off-by: Christoph Heiss (cherry picked from commit 8fc88142fe9a074b5d80350e897996fa723f2b6b) --- pkgs/applications/networking/browsers/floorp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 30c7d10fb025e0f..2453b4088a8f319 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -7,7 +7,7 @@ ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.13.3"; + packageVersion = "11.14.1"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -15,14 +15,14 @@ allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree - version = "115.12.0"; + version = "115.13.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-9EDTVckSqv/nyDi4qjMd54I69WiqM8v6om7zQLT+pQc="; + hash = "sha256-PhI+hIypPF6W5RJIXhCAXblSJNwgYavfCgdQozDSXG0="; }; extraConfigureFlags = [ From 97b8c92290871a0d7d85fb89639384e54f996efc Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sun, 16 Jun 2024 11:43:35 +0200 Subject: [PATCH 3/6] floorp: patch .desktop PWA file command path Floorp hardcodes /usr/bin/floorp as binary path when generating .desktop files for PWAs. That obviously not work for Nix-installed version, so patch it to just refer to "floorp", relying on $PATH. See also #314115. Signed-off-by: Christoph Heiss (cherry picked from commit 116ee53f879f036d06235cde0313d6ca9e54d9c0) --- pkgs/applications/networking/browsers/floorp/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 2453b4088a8f319..b517add8ed7c6e1 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -31,6 +31,13 @@ "--with-unsigned-addon-scopes=app,system" ]; + extraPostPatch = '' + # Fix .desktop files for PWAs generated by Floorp; they hardcode /usr/bin + # https://github.com/NixOS/nixpkgs/issues/314115 + substituteInPlace floorp/browser/base/content/modules/ssb/LinuxSupport.mjs \ + --replace-fail /usr/bin/floorp floorp + ''; + updateScript = ./update.sh; meta = { From 9eb6d1d0bde1c17ba2f796c187fbd402baf00e80 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Wed, 10 Jul 2024 13:16:11 +0200 Subject: [PATCH 4/6] floorp: 11.14.1 -> 11.15.0 Release notes: https://blog.ablaze.one/4397/2024-07-21/ Git changelog: https://github.com/Floorp-Projects/Floorp/compare/v11.14.1...v11.15.0 Signed-off-by: Christoph Heiss (cherry picked from commit e12df25076ad0eb9c22b975763a23188dc63a6d0) --- .../networking/browsers/floorp/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index b517add8ed7c6e1..6cc26ac589f7aa1 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -3,11 +3,12 @@ , fetchFromGitHub , buildMozillaMach , nixosTests +, python311 }: ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.14.1"; + packageVersion = "11.15.0"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -22,7 +23,7 @@ repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-PhI+hIypPF6W5RJIXhCAXblSJNwgYavfCgdQozDSXG0="; + hash = "sha256-LRuts3O3Rj5e6rT9gKTTwAIsY0oSziuiZ3rzE7wHa7o="; }; extraConfigureFlags = [ @@ -32,10 +33,12 @@ ]; extraPostPatch = '' - # Fix .desktop files for PWAs generated by Floorp; they hardcode /usr/bin - # https://github.com/NixOS/nixpkgs/issues/314115 + # Fix .desktop files for PWAs generated by Floorp + # The executable path returned by Services.dirsvc.get() is absolute and + # thus is the full /nix/store/[..] path. To avoid breaking PWAs with each + # update, rely on `floorp` being in $PATH, as before. substituteInPlace floorp/browser/base/content/modules/ssb/LinuxSupport.mjs \ - --replace-fail /usr/bin/floorp floorp + --replace-fail 'Services.dirsvc.get("XREExeF",Ci.nsIFile).path' floorp ''; updateScript = ./update.sh; @@ -61,6 +64,7 @@ enableOfficialBranding = false; googleAPISupport = true; mlsAPISupport = true; + python3 = python311; }).overrideAttrs (prev: { MOZ_DATA_REPORTING = ""; MOZ_TELEMETRY_REPORTING = ""; From 40b84fb84aa0f1b5cd59a33be2ab7bf4a143c125 Mon Sep 17 00:00:00 2001 From: Kilian Mio <86004375+Mikilio@users.noreply.github.com> Date: Sun, 28 Jul 2024 23:21:44 +0200 Subject: [PATCH 5/6] floorp: fix substitution of executable Fixing a regression introduced in commit e12df25 (cherry picked from commit 0b62c871caac864484a30b217959205dda69be72) --- pkgs/applications/networking/browsers/floorp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 6cc26ac589f7aa1..2f1d035876cb987 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -38,7 +38,7 @@ # thus is the full /nix/store/[..] path. To avoid breaking PWAs with each # update, rely on `floorp` being in $PATH, as before. substituteInPlace floorp/browser/base/content/modules/ssb/LinuxSupport.mjs \ - --replace-fail 'Services.dirsvc.get("XREExeF",Ci.nsIFile).path' floorp + --replace-fail 'Services.dirsvc.get("XREExeF",Ci.nsIFile).path' '"floorp"' ''; updateScript = ./update.sh; From 4be97a3bc6d6444e0eaeb0a46081994168495c4e Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Thu, 8 Aug 2024 10:07:02 +0200 Subject: [PATCH 6/6] floorp: 11.15.0 -> 11.16.0 Release notes: https://blog.ablaze.one/4415/2024-08-00/ Git changelog: https://github.com/Floorp-Projects/Floorp/compare/v11.15.0...v11.16.0 Signed-off-by: Christoph Heiss (cherry picked from commit d5f5a05d7e9efbc925d29d8ac330a4ead05739b6) --- pkgs/applications/networking/browsers/floorp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/floorp/default.nix b/pkgs/applications/networking/browsers/floorp/default.nix index 2f1d035876cb987..b29d1717905b898 100644 --- a/pkgs/applications/networking/browsers/floorp/default.nix +++ b/pkgs/applications/networking/browsers/floorp/default.nix @@ -8,7 +8,7 @@ ((buildMozillaMach rec { pname = "floorp"; - packageVersion = "11.15.0"; + packageVersion = "11.16.0"; applicationName = "Floorp"; binaryName = "floorp"; branding = "browser/branding/official"; @@ -16,14 +16,14 @@ allowAddonSideload = true; # Must match the contents of `browser/config/version.txt` in the source tree - version = "115.13.0"; + version = "115.15.0"; src = fetchFromGitHub { owner = "Floorp-Projects"; repo = "Floorp"; fetchSubmodules = true; rev = "v${packageVersion}"; - hash = "sha256-LRuts3O3Rj5e6rT9gKTTwAIsY0oSziuiZ3rzE7wHa7o="; + hash = "sha256-bmB88EIc5S/EYZXiQ5Dc+LjcGB4dlwKRBBV0T0ln88E="; }; extraConfigureFlags = [