Skip to content

navidrome: Use npmConfig and fetchNpmDeps#229953

Merged
mweinelt merged 1 commit intoNixOS:masterfrom
mweinelt:navidrome-build-ui
May 22, 2023
Merged

navidrome: Use npmConfig and fetchNpmDeps#229953
mweinelt merged 1 commit intoNixOS:masterfrom
mweinelt:navidrome-build-ui

Conversation

@mweinelt
Copy link
Member

@mweinelt mweinelt commented May 4, 2023 •
edited
Loading

Simplifies the moving parts we need to keep around by a lot.

Fixes navidrome wrt #229910.

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.11 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.

@ofborg ofborg bot requested review from aciceri and squalus May 4, 2023 19:55
@ofborg ofborg bot added 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. labels May 4, 2023
@mweinelt mweinelt mentioned this pull request May 4, 2023
Merged
12 tasks
@mweinelt mweinelt force-pushed the navidrome-build-ui branch 3 times, most recently from 89483f3 to 404558d Compare May 5, 2023 00:07
@mweinelt mweinelt marked this pull request as ready for review May 5, 2023 00:07
@mweinelt mweinelt force-pushed the navidrome-build-ui branch from 404558d to 46c1df2 Compare May 5, 2023 00:20
squalus
squalus approved these changes May 5, 2023
View reviewed changes
Copy link
Member

@squalus squalus left a comment

Choose a reason for hiding this comment

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

Awesome. The update script will need to be updated as well.

@mweinelt mweinelt force-pushed the navidrome-build-ui branch from 46c1df2 to 0a5bdbc Compare May 5, 2023 00:45
@mweinelt
Copy link
Member Author

mweinelt commented May 5, 2023

Awesome. The update script will need to be updated as well.

That should be fairly simple. This change is pure gold.

 pkgs/servers/misc/navidrome/default.nix             |    23 +-
 pkgs/servers/misc/navidrome/ui/default.nix          |    27 -
 pkgs/servers/misc/navidrome/ui/node-composition.nix |    17 -
 pkgs/servers/misc/navidrome/ui/node-env.nix         |   686 ------
 pkgs/servers/misc/navidrome/ui/node-packages.nix    | 15094 -------------------------------------------------------------------------------------------------------------------------------
 pkgs/servers/misc/navidrome/update.nix              |    28 -
 6 files changed, 18 insertions(+), 15857 deletions(-)

@mweinelt
Copy link
Member Author

mweinelt commented May 5, 2023 •
edited
Loading

Not quite yet. Unfortunately nix-update does not update the npmDepsHash. Will probably have to splice the two builds into one.

Tomorrow-ish.

@mweinelt mweinelt marked this pull request as draft May 5, 2023 00:57
@ofborg ofborg bot requested a review from squalus May 5, 2023 02:28
@mweinelt
Copy link
Member Author

mweinelt commented May 6, 2023

Waiting for feedback on https://github.com/NixOS/nixpkgs/pull/230092/files#r1186722499

@mweinelt mweinelt force-pushed the navidrome-build-ui branch from be713df to 46b313c Compare May 7, 2023 00:24
@mweinelt
Copy link
Member Author

mweinelt commented May 7, 2023

Used the workaround from the mentioned PR to demonstrate that the overall approach works.

@mweinelt mweinelt force-pushed the navidrome-build-ui branch from 46b313c to 895eb06 Compare May 10, 2023 11:38
@mweinelt mweinelt mentioned this pull request May 10, 2023
Merged
12 tasks
@mweinelt mweinelt force-pushed the navidrome-build-ui branch 2 times, most recently from d6fdeda to f2e0ce0 Compare May 10, 2023 15:53
@mweinelt mweinelt changed the title navidrome: Use buildNpmPackage for UI build navidrome: Use npmConfig and fetchNpmDeps May 10, 2023
@mweinelt mweinelt force-pushed the navidrome-build-ui branch 2 times, most recently from 441a616 to 487b9be Compare May 17, 2023 21:39
@mweinelt

This comment was marked as outdated.

Sign in to view
@mweinelt
Copy link
Member Author

mweinelt commented May 17, 2023

The build works like this, but the update script likely requires #230991 to work.

@mweinelt mweinelt force-pushed the navidrome-build-ui branch from 487b9be to 183b2fd Compare May 21, 2023 23:00
@mweinelt
Copy link
Member Author

mweinelt commented May 21, 2023 •
edited
Loading

This has currently picked #230991, the update script works. Thanks for the help @lilyinstarlight!

@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. and removed 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 22, 2023
@mweinelt
navidrome: Use npmConfigHook and fetchNpmDeps for the UI bits
8dd18f6 
Simplifies the moving parts we need to keep around by a lot.

This also obsoletes the custom update script, because nix-update can
handle all hashes we use in this package.
@mweinelt mweinelt force-pushed the navidrome-build-ui branch from 183b2fd to 8dd18f6 Compare May 22, 2023 01:59
@mweinelt mweinelt marked this pull request as ready for review May 22, 2023 02:00
@ofborg ofborg bot added 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. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels May 22, 2023
@mweinelt mweinelt merged commit b18427f into NixOS:master May 22, 2023
@mweinelt mweinelt deleted the navidrome-build-ui branch May 22, 2023 20:13
@github-actions github-actions bot mentioned this pull request May 22, 2023
Merged
1 task
@github-actions
Copy link
Contributor

github-actions bot commented May 22, 2023

Successfully created backport PR for release-23.05:

@NukaDuka NukaDuka mentioned this pull request Jul 31, 2023
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@aciceri aciceri Awaiting requested review from aciceri

@squalus squalus Awaiting requested review from squalus

Assignees

No one assigned

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@mweinelt @squalus