Skip to content

gg-jj: patch lockfile to fix mismatched NPM/Cargo versions of Tauri - #439100

Merged
alyssais merged 1 commit into
NixOS:masterfrom
magneticflux-:push-rounlxnzyknq
Sep 6, 2025
Merged

gg-jj: patch lockfile to fix mismatched NPM/Cargo versions of Tauri#439100
alyssais merged 1 commit into
NixOS:masterfrom
magneticflux-:push-rounlxnzyknq

Conversation

@magneticflux-

Copy link
Copy Markdown
Contributor

After #438726 updated tauri to >=2.8.0, it now checks for mismatched versions (tauri-apps/tauri#13993) and now fails to build gg-jj. This was always a problem, it just wasn't checked until now. This patch bumps the NPM versions to match the newer Cargo versions (since I assume that's preferable to a downgrade).

I struggled a bit to figure out how to properly apply the patch until I read the source of fetchNpmDeps since it only documents the src and hash parameters. Passing @args through to the actual derivation is obvious in hindsight 😆

This will probably be resolved whenever gg-jj gets some new activity since the new CLI will fail their build too. They don't have Issues enabled, but I'll send this patch upstream by itself as a surgical fix.

Maintainer: @pluiedev
Last major change: @alyssais

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci Bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Sep 1, 2025
@nix-owners
nix-owners Bot requested a review from pluiedev September 1, 2025 07:48
Comment thread pkgs/by-name/gg/gg-jj/package.nix Outdated

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you link to your upstream patch submission?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, sorry about that! It's gulbanana/gg#68, I removed the loose patch file in this one.

@magneticflux-
magneticflux- force-pushed the push-rounlxnzyknq branch 3 times, most recently from 3c24639 to 880fe2a Compare September 2, 2025 00:23
Comment thread pkgs/by-name/gg/gg-jj/package.nix Outdated
After NixOS#438726 updated `tauri` to >=2.8.0, it now checks for mismatched versions (tauri-apps/tauri#13993). This was always a problem, it just wasn't checked until now. This patch bumps the NPM versions to match the newer Cargo versions.
@qzylinra qzylinra mentioned this pull request Sep 3, 2025
3 tasks
@alyssais
alyssais merged commit e67134f into NixOS:master Sep 6, 2025
30 of 31 checks passed
@pluiedev pluiedev mentioned this pull request Sep 7, 2025
3 tasks
@getchoo getchoo mentioned this pull request Oct 17, 2025
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants