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

podman-desktop: 1.13.2 -> 1.15.0 #361460

Closed
wants to merge 4 commits into from

Conversation

kachick
Copy link
Member

@kachick kachick commented Dec 3, 2024

Diff: podman-desktop/podman-desktop@v1.13.2...v1.15.0

Update postPatch with podman-desktop/podman-desktop@8af3761

This PR aims to fix failure in nixpkgs-update

patching file extensions/podman/packages/extension/package.json
substituteStream() in derivation podman-desktop-1.14.1: ERROR: pattern process.resourcesPath doesn't match anything in file 'packages/main/src/tray-animate-icon.ts'

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.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 3, 2024
@kachick kachick marked this pull request as draft December 3, 2024 14:47
@kachick
Copy link
Member Author

kachick commented Dec 3, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 361460


x86_64-linux

❌ 1 package failed to build:
  • podman-desktop

x86_64-darwin

✅ 1 package built:
  • podman-desktop

aarch64-darwin

✅ 1 package built:
  • podman-desktop

On Linux build of nixpkgs-review is failed with following

copying path '/nix/store/8zrk1a1p2gq8g7r5bh1f2asbf3a4b5rm-electron-33.0.2' from 'https://cache.nixos.org/'...
error: hash mismatch in fixed-output derivation '/nix/store/xq1bg197mw0a0gr1k06xfr405d03fsg3-podman-desktop-pnpm-deps.drv':
         specified: sha256-f7LDfKMPaVRtgvZLFz2JePXd45JBdBCNQR/Ch6VaBKU=
            got:    sha256-bbfyEpDj85HGC3fNLY2to2nKdldbefklJjWGpAYdSdw=
error: 1 dependencies of derivation '/nix/store/x624p5djj5dmk80dwi1al29a85q4iwdx-podman-desktop-1.14.1.drv' failed to build
error: 1 dependencies of derivation '/nix/store/5qgcsj4fb00zg5cgxw9cziik6rq4m306-review-shell.drv' failed to build
1 package failed to build:
podman-desktop

@kachick kachick force-pushed the update-podman-desktop branch 2 times, most recently from bd6e798 to c688e2d Compare December 3, 2024 15:44
@ofborg ofborg bot requested review from panda2134 and booxter December 4, 2024 04:01
@booxter
Copy link
Contributor

booxter commented Dec 14, 2024

Thank you for the PR; thanks for including helpful details about particular changes in the commit message.

The code change look good, and I was able to build both for linux and darwin. The darwin version starts and seems to work fine. My only concern is that the commit message lines are not as wrapped as it could be (I don't see a lot of commits in the repo that have such long lines). But I'm new to nixpkgs maintenance, maybe it's acceptable here. Let me know what you think. Other than that, this is good to go.

Diff: podman-desktop/podman-desktop@v1.13.2...v1.14.1

Update postPatch with
podman-desktop/podman-desktop@8af3761

This fixes nixpkgs-update failure
https://nixpkgs-update-logs.nix-community.org/podman-desktop/2024-11-26.log

```
patching file extensions/podman/packages/extension/package.json
substituteStream() in derivation podman-desktop-1.14.1: ERROR: pattern process.resourcesPath doesn't match anything in file 'packages/main/src/tray-animate-icon.ts'
```

Pin pnpm and electron version to respect
https://github.com/NixOS/nixpkgs/blob/1c26355e02ea8aa9bef6a7b3f59d74bd3c504c11/doc/languages-frameworks/javascript.section.md?plain=1#L427

Checked the version in

https://github.com/podman-desktop/podman-desktop/blob/v1.14.1/package.json
https://github.com/podman-desktop/podman-desktop/blob/v1.14.1/pnpm-lock.yaml

Attempt to fix the Linux build with inherit finalAttrs.patches

```
error: hash mismatch in fixed-output derivation '/nix/store/xq1bg197mw0a0gr1k06xfr405d03fsg3-podman-desktop-pnpm-deps.drv':
         specified: sha256-f7LDfKMPaVRtgvZLFz2JePXd45JBdBCNQR/Ch6VaBKU=
            got:    sha256-bbfyEpDj85HGC3fNLY2to2nKdldbefklJjWGpAYdSdw=
```

See https://github.com/NixOS/nixpkgs/blob/1c26355e02ea8aa9bef6a7b3f59d74bd3c504c11/doc/languages-frameworks/javascript.section.md?plain=1#L429

However it still making hash mismatch in nixpkgs-review
@kachick kachick force-pushed the update-podman-desktop branch from c688e2d to ee6b165 Compare December 24, 2024 06:56
@kachick kachick changed the title podman-desktop: 1.13.2 -> 1.14.1 podman-desktop: 1.13.2 -> 1.15.0 Dec 24, 2024
hash = "sha256-LPsNRd1c/cQeyBn3LZKnKeAsZ981sOkLYTnXIZL82LA=";
pnpmDeps = pnpm_9.fetchDeps {
inherit (finalAttrs) pname version src patches;
hash = "sha256-EzkAcd84JEBq6eDkh9XCGfCyeo5r2vpZSIvb2hqpsBU=";
Copy link
Member Author

Choose a reason for hiding this comment

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

This hash always will be different in nixpkgs-review in x86_64-linux report.

In nixpkgs-review

error: hash mismatch in fixed-output derivation '/nix/store/hm84x737h5dnd3g2ky8k5hg6fkmd8ly6-podman-desktop-pnpm-deps.drv':
         specified: sha256-EzkAcd84JEBq6eDkh9XCGfCyeo5r2vpZSIvb2hqpsBU=
            got:    sha256-2wmMuymv8C1ZVeGnWf2R3t9cf1jqiFIw0KJ/m3/cxZs=
error: 1 dependencies of derivation '/nix/store/wgrqfbf8wqkhvk7br091vw2nkfpn94dg-podman-desktop-1.15.0.drv' failed to build
error: 1 dependencies of derivation '/nix/store/fiw3n0zkxpwv2zcsc6zc0rya43rs315l-review-shell.drv' failed to build

It succeeds in darwin. I have no idea what is this 🤔

Copy link
Member Author

Choose a reason for hiding this comment

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

Might be related to #350063?

@kachick
Copy link
Member Author

kachick commented Dec 24, 2024

@booxter Thank you for your reviewing. 🙏

I don't have confidence that wrapping long URLs and logs will be better or not in the commit message. So keeping now. But I can modify commit messages if required. Any suggestions welcome.

However running nixpkgs-review always fails for the x86_64-linux and pnpm_9.fetchDeps step with hash mismatched. I don't know how to fix this behaviors. 🙇

I can not reproduce in my device, however github hosted ubuntu-24.04 runner always returns different hash for fetchDeps
@kachick
Copy link
Member Author

kachick commented Dec 27, 2024

I have no idea how to fix the hash mismatch, at least this year. Sorry for closing this PR 🙇.

@kachick kachick closed this Dec 27, 2024
@kachick kachick deleted the update-podman-desktop branch December 27, 2024 14:29
@kachick kachick restored the update-podman-desktop branch January 24, 2025 09:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants