firefoxpwa: init at 2.7.3 #215905

pasqui23 · 2023-02-12T02:07:47Z

Description of changes

Fixes filips123/PWAsForFirefox#204
Fixes #186961

Things done

nixos-discourse · 2023-02-12T11:48:50Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/1819

SuperSandro2000 · 2023-02-16T20:43:14Z

pkgs/tools/networking/firefoxpwa/default.nix

@@ -0,0 +1,90 @@
+# <https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=firefox-pwa>


Suggested change

# <https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=firefox-pwa>

SuperSandro2000 · 2023-02-16T20:45:21Z

pkgs/tools/networking/firefoxpwa/default.nix

+      # replace the version in the lockfile, otherwise Nix complains
+      sed -zi 's;name = "firefoxpwa"\nversion = "0.0.0";name = "firefoxpwa"\nversion = "${version}";' Cargo.lock
+      # replace the version number in the profile template files


Suggested change

# replace the version in the lockfile, otherwise Nix complains

sed -zi 's;name = "firefoxpwa"\nversion = "0.0.0";name = "firefoxpwa"\nversion = "${version}";' Cargo.lock

# replace the version number in the profile template files

sed -zi 's;name = "firefoxpwa"\nversion = "0.0.0";name = "firefoxpwa"\nversion = "${version}";' Cargo.lock

comments should explain the reasons behind a line, not what it is doing and the first comment is obvious.

SuperSandro2000 · 2023-02-16T20:46:27Z

pkgs/tools/networking/firefoxpwa/default.nix

+      # Completions
+      install -Dm755 $target/completions/firefoxpwa.bash $out/share/bash-completion/completions/firefoxpwa
+      install -Dm755 $target/completions/firefoxpwa.fish $out/share/fish/vendor_completions.d/firefoxpwa.fish
+      install -Dm755 $target/completions/_firefoxpwa $out/share/zsh/vendor-completions/_firefoxpwa


Please use installCompletion

pkgs/applications/networking/browsers/firefox/wrapper.nix

SuperSandro2000 · 2023-03-09T15:04:14Z

pkgs/tools/networking/firefoxpwa/default.nix

+    doCheck = false;
+
+    nativeBuildInputs = [ pkg-config installShellFiles ];
+    buildInputs = [ openssl.dev openssl ];


That looks fishy. Why do we need both?

SuperSandro2000 · 2023-03-09T15:04:23Z

pkgs/tools/networking/firefoxpwa/default.nix

+    nativeBuildInputs = [ pkg-config installShellFiles ];
+    buildInputs = [ openssl.dev openssl ];
+
+    preConfigure = ''


Can we do this in postPatch?

No or cargo complains

That means that our cargo.lock is out of date and needs to be fixed, too.

buildRustPackage take the Cargo.lock from upstream, so the problem is there?

It's because I don't want to update the version in Cargo.toml every time before I release a new version. So, Cargo.toml in the repository only sets version = "0.0.0" and the actual version is then automatically set when building and releasing the package (in GitHub Actions for the official packages and here for Nix package).

We should patch that version to be correct.

Aren't we already doing this?

SuperSandro2000 · 2023-03-09T15:04:44Z

pkgs/tools/networking/firefoxpwa/default.nix

+      installShellCompletion --bash $target/completions/firefoxpwa.bash
+      installShellCompletion --fish $target/completions/firefoxpwa.fish
+      installShellCompletion --zsh $target/completions/_firefoxpwa


Suggested change

installShellCompletion --bash $target/completions/firefoxpwa.bash

installShellCompletion --fish $target/completions/firefoxpwa.fish

installShellCompletion --zsh $target/completions/_firefoxpwa

installShellCompletion --cmd firefoxpwa \

--bash $target/completions/firefoxpwa.bash \

--fish $target/completions/firefoxpwa.fish \

--zsh $target/completions/_firefoxpwa

camillemndn · 2023-03-12T11:45:43Z

Hi, so I managed to make the runtime-patched files writable via an upstream PR, I hope it will be accepted!

Now, it seems that the updater is broken, I guess the binary should be patched-elf to work with NixOS, but don't you think it could be interesting to wrap firefoxpwa with a script that softlinks the ${pkgs.firefox}/lib/firefox/* folder and disable auto-updates, to increase reproducibility and update via NixOS?

Also, the sound and notifications seem to be broken. Can you reproduce? Do you think firefoxpwa should be built with libpulseaudio and libnotify ?
I found a fix, inspired by the firefox derivation: camillemndn@9072e7f but I guess it could be improved.

Thanks!

SuperSandro2000 · 2023-04-18T15:03:14Z

pkgs/tools/networking/firefoxpwa/default.nix

@@ -25,9 +26,16 @@ let
    pname = "${pname}-unwrapped";

    src = "${source}/${dir}";
-    cargoSha256 = "sha256-G8CxvANwjh8rCuBtQbO0UseQTg40EL0eqW7GG/XTpOg=";
+    cargoLock = {
+      lockFile = "${unwrapped.src}/Cargo.lock";


I think this triggers IFD which is not allowed

SuperSandro2000 · 2023-04-18T15:03:22Z

pkgs/tools/networking/firefoxpwa/default.nix


-    nativeBuildInputs = [ pkg-config installShellFiles ];
+    nativeBuildInputs = [ pkg-config installShellFiles bintools ];


bintools should be part of stdenv

pasqui23 · 2023-04-19T09:01:05Z

On 18/04/23 17:03, Sandro ***@***.***> wrote: bintools should be part of stdenv

Without `bintools` the `ar` command is not found

camillemndn · 2023-04-23T16:08:04Z

So turns out the 2.5.0 version did not buils and I forgot to check. I tried to fix the build build but I got struck at yje following error:

; nix build .#firefoxpwa                                                                    # took 23m18s zsh 
warning: binary cache 'http://127.0.0.1:12304' is for Nix stores with prefix 'Nix::Store::getStoreDir', not '/nix/store'
error: builder for '/nix/store/2kxbhaqsxdvb8p98zvqmqrd9wnpv39dx-firefoxpwa-unwrapped-2.5.0.drv' failed with exit code 101;
       last 25 log lines:
       >   running: "gcc" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-I" "bzip2-1.0.8" "-D_FILE_OFFSET_BITS=64" "-DBZ_NO_STDIO" "-o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/compress.o" "-c" "bzip2-1.0.8/compress.c"
       >   exit status: 0
       >   running: "gcc" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-I" "bzip2-1.0.8" "-D_FILE_OFFSET_BITS=64" "-DBZ_NO_STDIO" "-o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/decompress.o" "-c" "bzip2-1.0.8/decompress.c"
       >   exit status: 0
       >   running: "gcc" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-I" "bzip2-1.0.8" "-D_FILE_OFFSET_BITS=64" "-DBZ_NO_STDIO" "-o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/bzlib.o" "-c" "bzip2-1.0.8/bzlib.c"
       >   exit status: 0
       >   cargo:rerun-if-env-changed=AR_x86_64-unknown-linux-gnu
       >   AR_x86_64-unknown-linux-gnu = None
       >   cargo:rerun-if-env-changed=AR_x86_64_unknown_linux_gnu
       >   AR_x86_64_unknown_linux_gnu = None
       >   cargo:rerun-if-env-changed=HOST_AR
       >   HOST_AR = None
       >   cargo:rerun-if-env-changed=AR
       >   AR = Some("ar")
       >   running: "ar" "cq" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/libbz2.a" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/blocksort.o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/huffman.o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/crctable.o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/randtable.o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/compress.o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/decompress.o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/bzlib.o"
       >   exit status: 0
       >   running: "ar" "s" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/libbz2.a"
       >   exit status: 0
       >   cargo:rustc-link-lib=static=bz2
       >   cargo:rustc-link-search=native=/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib
       >
       >   --- stderr
       >   thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: Os { code: 13, kind: PermissionDenied, message: "Permission denied" }', /build/cargo-vendor-dir/bzip2-sys-0.1.11+1.0.8/build.rs:44:64
       >   note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
       > warning: build failed, waiting for other jobs to finish...
       For full logs, run 'nix log /nix/store/2kxbhaqsxdvb8p98zvqmqrd9wnpv39dx-firefoxpwa-unwrapped-2.5.0.drv'.
error: 1 dependencies of derivation '/nix/store/q84mn5n28bzngcvfai1lbywqbsrrhm4j-firefoxpwa-2.5.0.drv' failed to build

Hi, it builds for me on x86_64-linux, what is your architecture? It seems that you need to build bzip2 from source, but that I did not need to!

camillemndn · 2023-04-23T16:55:18Z

pkgs/tools/networking/firefoxpwa/default.nix

+, fetchFromGitHub
+, openssl
+, symlinkJoin
+, buildFHSUserEnv


I think buildFHSUserEnv has been renamed buildFHSEnv.

Also it seems like the FHS env script fails since the latest updates for me: the Firefox window does not open and there is no error. If I use the unwrapped binary, it works!

pasqui23 · 2023-04-24T11:09:06Z

So turns out the 2.5.0 version did not buils and I forgot to check. I tried to fix the build build but I got struck at yje following error:

; nix build .#firefoxpwa                                                                    # took 23m18s zsh 
warning: binary cache 'http://127.0.0.1:12304' is for Nix stores with prefix 'Nix::Store::getStoreDir', not '/nix/store'
error: builder for '/nix/store/2kxbhaqsxdvb8p98zvqmqrd9wnpv39dx-firefoxpwa-unwrapped-2.5.0.drv' failed with exit code 101;
       last 25 log lines:
       >   running: "gcc" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-I" "bzip2-1.0.8" "-D_FILE_OFFSET_BITS=64" "-DBZ_NO_STDIO" "-o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/compress.o" "-c" "bzip2-1.0.8/compress.c"
       >   exit status: 0
       >   running: "gcc" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-I" "bzip2-1.0.8" "-D_FILE_OFFSET_BITS=64" "-DBZ_NO_STDIO" "-o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/decompress.o" "-c" "bzip2-1.0.8/decompress.c"
       >   exit status: 0
       >   running: "gcc" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-m64" "-I" "bzip2-1.0.8" "-D_FILE_OFFSET_BITS=64" "-DBZ_NO_STDIO" "-o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/bzlib.o" "-c" "bzip2-1.0.8/bzlib.c"
       >   exit status: 0
       >   cargo:rerun-if-env-changed=AR_x86_64-unknown-linux-gnu
       >   AR_x86_64-unknown-linux-gnu = None
       >   cargo:rerun-if-env-changed=AR_x86_64_unknown_linux_gnu
       >   AR_x86_64_unknown_linux_gnu = None
       >   cargo:rerun-if-env-changed=HOST_AR
       >   HOST_AR = None
       >   cargo:rerun-if-env-changed=AR
       >   AR = Some("ar")
       >   running: "ar" "cq" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/libbz2.a" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/blocksort.o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/huffman.o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/crctable.o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/randtable.o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/compress.o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/decompress.o" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/bzip2-1.0.8/bzlib.o"
       >   exit status: 0
       >   running: "ar" "s" "/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib/libbz2.a"
       >   exit status: 0
       >   cargo:rustc-link-lib=static=bz2
       >   cargo:rustc-link-search=native=/build/native/target/x86_64-unknown-linux-gnu/release/build/bzip2-sys-3b02640410b495aa/out/lib
       >
       >   --- stderr
       >   thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: Os { code: 13, kind: PermissionDenied, message: "Permission denied" }', /build/cargo-vendor-dir/bzip2-sys-0.1.11+1.0.8/build.rs:44:64
       >   note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
       > warning: build failed, waiting for other jobs to finish...
       For full logs, run 'nix log /nix/store/2kxbhaqsxdvb8p98zvqmqrd9wnpv39dx-firefoxpwa-unwrapped-2.5.0.drv'.
error: 1 dependencies of derivation '/nix/store/q84mn5n28bzngcvfai1lbywqbsrrhm4j-firefoxpwa-2.5.0.drv' failed to build

Hi, it builds for me on x86_64-linux, what is your architecture? It seems that you need to build bzip2 from source, but that I did not need to!

The error is in the build of firefoxpwa-unwrapped,did you do any change to the code? Rebase to latest master?

SuperSandro2000 · 2023-04-29T22:16:29Z

Without bintools the ar command is not found

I think we want to use the ar in the AR env.

pasqui23 · 2023-04-30T09:48:17Z

I think we want to use the ar in the AR env.

After replacing bintools with ar I get

; nix build .#firefoxpwa                                                                       # zsh 
error: Function called without required argument "ar" at /nix/store/dsw0g2mmkjihhvjgk7jb9lvhjnph1wsl-source/pkgs/tools/networking/firefoxpwa/default.nix:9, did you mean "acr", "ag" or "air"?

pasqui23 · 2023-09-16T17:41:59Z

Ok the problem was a missing bzip2 dependency. Added that and updated to 2.7.3

Co-authored-by: Camille M. <[email protected]>

camillemndn · 2023-11-01T16:42:30Z

Hi, Check out my PR, I made the update and created a test!

camillemndn · 2024-01-22T15:08:24Z

More up to date here: #263404

pasqui23 requested a review from mweinelt as a code owner February 12, 2023 02:07

pasqui23 changed the title ~~Firefox pwa~~ firefox-pwa: init at 2.1.2 Feb 12, 2023

ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 labels Feb 12, 2023

pasqui23 force-pushed the firefox-pwa branch 3 times, most recently from 57bafcd to 5049e6c Compare February 12, 2023 11:45

ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin and removed 10.rebuild-darwin: 1 10.rebuild-darwin: 1-10 labels Feb 12, 2023

pasqui23 force-pushed the firefox-pwa branch from 5049e6c to 40c7f3c Compare February 12, 2023 12:01

pasqui23 changed the title ~~firefox-pwa: init at 2.1.2~~ firefox-pwa: init at 2.4.1 Feb 12, 2023

pasqui23 changed the title ~~firefox-pwa: init at 2.4.1~~ firefox-pwa: init at 2.4.1 [WIP] Feb 12, 2023

pasqui23 force-pushed the firefox-pwa branch from 40c7f3c to 6d6cf1d Compare February 12, 2023 12:19

pasqui23 changed the title ~~firefox-pwa: init at 2.4.1 [WIP]~~ firefox-pwa: init at 2.4.1 Feb 12, 2023

pasqui23 force-pushed the firefox-pwa branch 2 times, most recently from 5bf1565 to 60f28e4 Compare February 12, 2023 16:38

pasqui23 changed the title ~~firefox-pwa: init at 2.4.1~~ firefoxpwa: init at 2.4.1 Feb 12, 2023

SuperSandro2000 reviewed Feb 16, 2023

View reviewed changes

pasqui23 force-pushed the firefox-pwa branch from 60f28e4 to 6decb5b Compare February 17, 2023 14:33

camillemndn reviewed Mar 9, 2023

View reviewed changes

pkgs/applications/networking/browsers/firefox/wrapper.nix Outdated Show resolved Hide resolved

SuperSandro2000 reviewed Mar 9, 2023

View reviewed changes

pasqui23 force-pushed the firefox-pwa branch from 6decb5b to cb79617 Compare March 11, 2023 20:33

camillemndn mentioned this pull request Mar 12, 2023

Fix write permissions for runtime autoconfig files filips123/PWAsForFirefox#311

Merged

pasqui23 requested review from filips123, linsui and camillemndn April 17, 2023 12:23

SuperSandro2000 reviewed Apr 18, 2023

View reviewed changes

camillemndn reviewed Apr 23, 2023

View reviewed changes

This comment was marked as outdated.

Sign in to view

pasqui23 force-pushed the firefox-pwa branch from 06450c4 to 91627f2 Compare September 16, 2023 17:41

pasqui23 changed the title ~~firefoxpwa: init at 2.5.0~~ firefoxpwa: init at 2.7.3 Sep 16, 2023

pasqui23 marked this pull request as ready for review September 16, 2023 17:42

pasqui23 requested review from SuperSandro2000 and camillemndn September 16, 2023 17:43

ofborg bot added 2.status: merge conflict This PR has merge conflicts with the target branch and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Sep 16, 2023

camillemndn mentioned this pull request Oct 25, 2023

firefoxpwa: init at 2.11.1 #263404

Merged

13 tasks

firefoxpwa: init at 2.7.3

451bb21

Co-authored-by: Camille M. <[email protected]>

pasqui23 force-pushed the firefox-pwa branch from 7e155f1 to 3e75c6f Compare November 1, 2023 14:18

github-actions bot removed 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 1, 2023

firefox: added support for enableFirefoxPwa config

8fe2a3c

pasqui23 force-pushed the firefox-pwa branch from 3e75c6f to 8fe2a3c Compare November 1, 2023 14:21

camillemndn closed this Jan 22, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

firefoxpwa: init at 2.7.3 #215905

firefoxpwa: init at 2.7.3 #215905

pasqui23 commented Feb 12, 2023 •

edited

Loading

nixos-discourse commented Feb 12, 2023

SuperSandro2000 Feb 16, 2023

SuperSandro2000 Feb 16, 2023

SuperSandro2000 Feb 16, 2023

SuperSandro2000 Mar 9, 2023

SuperSandro2000 Mar 9, 2023

pasqui23 Mar 11, 2023

SuperSandro2000 Mar 27, 2023

pasqui23 Mar 27, 2023

filips123 Mar 27, 2023

SuperSandro2000 Apr 1, 2023

pasqui23 Apr 2, 2023

SuperSandro2000 Mar 9, 2023

camillemndn commented Mar 12, 2023 •

edited

Loading

SuperSandro2000 Apr 18, 2023

SuperSandro2000 Apr 18, 2023

pasqui23 commented Apr 19, 2023 via email

camillemndn commented Apr 23, 2023

camillemndn Apr 23, 2023

pasqui23 commented Apr 24, 2023

SuperSandro2000 commented Apr 29, 2023

pasqui23 commented Apr 30, 2023 •

edited

Loading

This comment was marked as outdated.

pasqui23 commented Sep 16, 2023

camillemndn commented Nov 1, 2023

camillemndn commented Jan 22, 2024

		@@ -0,0 +1,90 @@
		# <https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=firefox-pwa>


		nativeBuildInputs = [ pkg-config installShellFiles ];
		nativeBuildInputs = [ pkg-config installShellFiles bintools ];

firefoxpwa: init at 2.7.3 #215905

firefoxpwa: init at 2.7.3 #215905

Conversation

pasqui23 commented Feb 12, 2023 • edited Loading

Description of changes

Things done

nixos-discourse commented Feb 12, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

camillemndn commented Mar 12, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pasqui23 commented Apr 19, 2023 via email

camillemndn commented Apr 23, 2023

Choose a reason for hiding this comment

pasqui23 commented Apr 24, 2023

SuperSandro2000 commented Apr 29, 2023

pasqui23 commented Apr 30, 2023 • edited Loading

This comment was marked as outdated.

pasqui23 commented Sep 16, 2023

camillemndn commented Nov 1, 2023

camillemndn commented Jan 22, 2024

pasqui23 commented Feb 12, 2023 •

edited

Loading

camillemndn commented Mar 12, 2023 •

edited

Loading

pasqui23 commented Apr 30, 2023 •

edited

Loading