Skip to content

podman-desktop: bump electron and pnpm version with adjusted updateScript#407982

Merged
khaneliman merged 2 commits intoNixOS:masterfrom
kachick:correct-podman-desktop-dependency
May 19, 2025
Merged

podman-desktop: bump electron and pnpm version with adjusted updateScript#407982
khaneliman merged 2 commits intoNixOS:masterfrom
kachick:correct-podman-desktop-dependency

Conversation

@kachick
Copy link
Copy Markdown
Member

@kachick kachick commented May 17, 2025

This PR is a follow-up to recent updates: #399934, #406299

Related commits in upstream

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/)
  • Nixpkgs 25.11 Release Notes (or backporting 24.11 and 25.05 Nixpkgs Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
  • NixOS 25.11 Release Notes (or backporting 24.11 and 25.05 NixOS Release notes)
    • (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.

kachick added 2 commits May 17, 2025 23:08
Upstream v1.18.0 updated the versions of pnpm and electron, but these
changes were not reflected in the nixpkgs definition at the time of
2d72c6e.

This commit aligns the versions accordingly.

* pnpm: podman-desktop/podman-desktop@b56fde3
* electron: podman-desktop/podman-desktop@47b8f00
@kachick kachick force-pushed the correct-podman-desktop-dependency branch from e1eae96 to 32146f4 Compare May 17, 2025 14:08
@github-actions github-actions Bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 17, 2025
@nix-owners nix-owners Bot requested review from booxter and panda2134 May 17, 2025 14:12
@kachick
Copy link
Copy Markdown
Member Author

kachick commented May 17, 2025

Intentionally omitted nixpkgs-review result on aarch64-linux.

When I run nixpkgs-review for pnpm packages on Linux GHA runners, it shows hash mismatch errors even though nix build succeeds. This is the same issue described in another PR.

Therefore, I only included the results from my NixOS machine and the Darwin GHA runners.


nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 407982


x86_64-linux

✅ 1 package built:
  • podman-desktop

x86_64-darwin

✅ 1 package built:
  • podman-desktop

aarch64-darwin

✅ 1 package built:
  • podman-desktop

@booxter
Copy link
Copy Markdown
Contributor

booxter commented May 17, 2025

Thank you for the update. I should be more cautious about upstream bumps. Thanks for including the update script - confirmed it works as intended. Also confirmed that the app still works on Darwin.

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 407982 --extra-nixpkgs-config '{ }'


x86_64-linux

✅ 1 package built:
  • podman-desktop

aarch64-linux

✅ 1 package built:
  • podman-desktop

x86_64-darwin

✅ 1 package built:
  • podman-desktop

aarch64-darwin

✅ 1 package built:
  • podman-desktop

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels May 18, 2025
@khaneliman khaneliman merged commit 9bd9c72 into NixOS:master May 19, 2025
64 of 65 checks passed
@kachick
Copy link
Copy Markdown
Member Author

kachick commented May 19, 2025

Thank you for reviewing and merging!

@kachick kachick deleted the correct-podman-desktop-dependency branch May 19, 2025 03:28
@kachick
Copy link
Copy Markdown
Member Author

kachick commented Jul 5, 2025

Since backporting the Electron 34 EOL PR #421203, podman-desktop has been raising an error. Therefore, is it reasonable to also backport this PR?

podman-desktop on nixos-25.05 remains on version 1.18.1

@nixpkgs-ci
Copy link
Copy Markdown
Contributor

nixpkgs-ci Bot commented Jul 5, 2025

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

Labels

8.has: port to stable This PR already has a backport to the stable release. 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. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants