Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

firefoxpwa: 2.13.1 -> 2.13.2 #372499

Merged
merged 2 commits into from
Jan 10, 2025
Merged

Conversation

adamcstephens
Copy link
Contributor

@adamcstephens adamcstephens commented Jan 9, 2025

https://github.com/filips123/PWAsForFirefox/releases/tag/v2.13.2

Removing self from maintainer as I no longer use this.

Fixes: #372488

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@adamcstephens adamcstephens added the backport release-24.11 Backport PR automatically label Jan 9, 2025
@adamcstephens
Copy link
Contributor Author

Built passthru tests on x86-64 linux
/nix/store/6bmk9pdpi2ri9xb6zi28znbd9a2dfkpj-vm-test-run-firefoxpwa

@FliegendeWurst
Copy link
Member

Could switch to the new cargo fetcher to avoid copying Cargo.lock to nixpkgs.

diff --git a/pkgs/by-name/fi/firefoxpwa/package.nix b/pkgs/by-name/fi/firefoxpwa/package.nix
index 337796612b2b..831980a63bd8 100644
--- a/pkgs/by-name/fi/firefoxpwa/package.nix
+++ b/pkgs/by-name/fi/firefoxpwa/package.nix
@@ -40,13 +40,8 @@ rustPlatform.buildRustPackage rec {
   sourceRoot = "${src.name}/native";
   buildFeatures = [ "immutable-runtime" ];
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "mime-0.4.0-a.0" = "sha256-LjM7LH6rL3moCKxVsA+RUL9lfnvY31IrqHa9pDIAZNE=";
-      "web_app_manifest-0.0.0" = "sha256-G+kRN8AEmAY1TxykhLmgoX8TG8y2lrv7SCRJlNy0QzA=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-UxUXXF13YyS+ViEsjjfuNinq7n4W28J+fZsy/WeV6Dc=";
 
   preConfigure = ''
     sed -i 's;version = "0.0.0";version = "${version}";' Cargo.toml

@adamcstephens
Copy link
Contributor Author

Could switch to the new cargo fetcher to avoid copying Cargo.lock to nixpkgs.

Oh neat! Thanks for sharing

@FliegendeWurst FliegendeWurst merged commit 8eb0639 into NixOS:master Jan 10, 2025
23 of 27 checks passed
@nixpkgs-ci

This comment was marked as resolved.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Need to update PWAsForFirefox to latest release to be compatible with current Firefox in unstable
2 participants