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

rmfakecloud: 0.0.21 -> 0.0.23 #358324

Merged
merged 2 commits into from
Feb 5, 2025
Merged

rmfakecloud: 0.0.21 -> 0.0.23 #358324

merged 2 commits into from
Feb 5, 2025

Conversation

martinetd
Copy link
Member

Things done

  • fix regression in 0.0.21 for old remarkable tablet versions (see Unable to Sync ddvk/rmfakecloud#330 )

  • fix build with new UI... tested it appears to work ok

  • 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.

nodejs
pnpm_9.configHook
];

meta = with lib; {
description = "Only the webui files for rmfakecloud";
homepage = "https://ddvk.github.io/rmfakecloud/";
license = licenses.agpl3Only;
Copy link
Member

Choose a reason for hiding this comment

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

maintainers missing

Copy link
Member Author

Choose a reason for hiding this comment

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

That derivation cannot be eused as is so I'd ather remove all the meta fluff instead (it's a build dep of rmfakecloud itself which has maintainers)

Is that ok?

Copy link
Member

Choose a reason for hiding this comment

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

No, you should rather inherit the meta attributes that the two share from rmfakecloud.

Copy link
Member Author

Choose a reason for hiding this comment

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

That'd inherit the mainProgram attribute, I'm not sure we want that.. Well wouldn't matter if nobody uses it except for cp I guess.

Anyway, I've managed to build the go module with pnpm inside after trying again (not sure why it didn't find the deps last time I tried), it's gone.
Hopefully that'll allow the update bot to build updates automatically next time, I was thinking it had troubles updating hashes in two separate files in lockstep.

@martinetd
Copy link
Member Author

fudge, ofborg is getting the same error I was initially getting with Error: 'pnpmDeps' must be set when using pnpmConfigHook.

So it must only have been working locally because I had my store pre-populated with something from the successful build... I'll just drop the last commit for now because this is @$#@%@ supposed to be a bug fix release and I've already sunk way too much time into it than I should have.
If someone wants to look the "bring pnpmDeps in the go module" commit is available at https://github.com/martinetd/nixpkgs/commits/rmfakecloud_gopnpm/

@martinetd
Copy link
Member Author

(This works with workaround given in #358844 and (almost) makes the update script work, so going with the "merge everything in one file" version)

0.0.22
- fix regression in 0.0.21 for old remarkable tablet versions
(see ddvk/rmfakecloud#330 )
- fix build with new UI...

0.0.23
- fix other regression with 0.0.22...
This avoids maintaining an artificial derivation for the web UI,
and hopefully will allow the auto-update bot to make PRs for further
updates
@martinetd martinetd changed the title rmfakecloud: 0.0.21 -> 0.0.22 rmfakecloud: 0.0.21 -> 0.0.23 Nov 30, 2024
@malte-v
Copy link
Contributor

malte-v commented Feb 1, 2025

Is this ready to be merged? Would be happy to pick it up if there still is work to be done

@martinetd
Copy link
Member Author

Yes, aside of the detail that the go module indirectly depends on the pnpm one (meaning autoupgrade won't work) this is all in working order as far as I'm concerned

@misuzu misuzu merged commit ae662f0 into NixOS:master Feb 5, 2025
40 checks passed
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.

4 participants