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

[Backport release-24.05] Heroic Games Launcher: 2.14.1 -> 2.15.1 #337312

Merged
merged 2 commits into from
Aug 28, 2024

Conversation

github-actions[bot]
Copy link
Contributor

Bot-based backport to release-24.05, triggered by a label in #335737.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

Fixes #327153

(cherry picked from commit 2a5496d)
(cherry picked from commit a7c9a1c)
@emilazy
Copy link
Member

emilazy commented Aug 25, 2024

@ofborg build heroic

@emilazy
Copy link
Member

emilazy commented Aug 25, 2024

Depends on backport of #278800 and #331638.

@emilazy
Copy link
Member

emilazy commented Aug 25, 2024

@ofborg eval
@ofborg build heroic

@emilazy
Copy link
Member

emilazy commented Aug 25, 2024

Oh, this might be painful 🫠

@emilazy
Copy link
Member

emilazy commented Aug 25, 2024

@aidalgol Do we have to use pnpm here? I guess it’s an upstream change? It seems like it might be quite painful to backport the machinery to 24.05. Maybe we’ll just have to leave this behind a knownVulnerabilities warning on 24.05, but that would be unfortunate.

@emilazy
Copy link
Member

emilazy commented Aug 25, 2024

Or maybe it’s not so bad after all: #337344

Building an entire Electron to see if this works after that.

@emilazy
Copy link
Member

emilazy commented Aug 26, 2024

@ofborg build heroic

@emilazy
Copy link
Member

emilazy commented Aug 26, 2024

@ofborg eval

@emilazy
Copy link
Member

emilazy commented Aug 26, 2024

FWIW this builds fine, but I’d like someone else to check it before merging.

@aidalgol
Copy link
Contributor

Do we have to use pnpm here? I guess it’s an upstream change?

Yes, it was an upstream change.

FWIW this builds fine, but I’d like someone else to check it before merging.

I just checked out the branch for this PR and tried building heroic, and it looks like comet-gog is missing.

error: evaluation aborted with the following error message: 'lib.customisation.callPackageWith: Function called without required argument "comet-gog" at /home/aidan/src/nixpkgs/pkgs/games/heroic/default.nix:12'

I'm not sure why this didn't cause ofborg-eval to fail.

@emilazy
Copy link
Member

emilazy commented Aug 27, 2024

I backported comet-gog and the entire pnpm machinery in separate PRs. You’ll have to rebase this branch on the latest release-24.05 to be able to build it. ofborg goes off what the tree will be after merging, rather than the HEAD of the PR branch.

@emilazy emilazy mentioned this pull request Aug 27, 2024
13 tasks
Copy link
Contributor

@aidalgol aidalgol left a comment

Choose a reason for hiding this comment

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

Builds and runs OK for me.

@emilazy emilazy merged commit 513ddbc into release-24.05 Aug 28, 2024
23 of 25 checks passed
@pbsds pbsds deleted the backport-335737-to-release-24.05 branch August 29, 2024 01:49
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.

2 participants