-
-
Notifications
You must be signed in to change notification settings - Fork 18.1k
mirakurun: use node 18 #233092
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
Merged
SuperSandro2000
merged 1 commit into
NixOS:master
from
midchildan:chore/mirakurun/node18
May 25, 2023
Merged
mirakurun: use node 18 #233092
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
pkgs/applications/video/mirakurun/fix-musl-detection.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| diff --git a/packages/crc32/index.js b/packages/crc32/index.js | ||
| index cdc7519..7b05930 100644 | ||
| --- a/packages/crc32/index.js | ||
| +++ b/packages/crc32/index.js | ||
| @@ -5,7 +5,7 @@ const { platform, arch } = process | ||
|
|
||
| let nativeBinding = null | ||
| let localFileExisted = false | ||
| -let isMusl = false | ||
| +let isMusl = @isMusl@ | ||
| let loadError = null | ||
|
|
||
| switch (platform) { | ||
| @@ -114,7 +114,6 @@ switch (platform) { | ||
| case 'linux': | ||
| switch (arch) { | ||
| case 'x64': | ||
| - isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl') | ||
| if (isMusl) { | ||
| localFileExisted = existsSync(join(__dirname, 'crc32.linux-x64-musl.node')) | ||
| try { | ||
| @@ -140,7 +139,6 @@ switch (platform) { | ||
| } | ||
| break | ||
| case 'arm64': | ||
| - isMusl = readFileSync('/usr/bin/ldd', 'utf8').includes('musl') | ||
| if (isMusl) { | ||
| localFileExisted = existsSync(join(__dirname, 'crc32.linux-arm64-musl.node')) | ||
| try { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| .Dd $Mdocdate$ | ||
| .Dt MIRAKURUN 1 | ||
| .Os | ||
| .Sh NAME | ||
| .Nm mirakurun | ||
| .Nd @DESCRIPTION@ | ||
| .Sh SYNOPSIS | ||
| .Nm | ||
| .Bk -words | ||
| .Op Ar command Op Ar args | ||
| .Ek | ||
| .Sh DESCRIPTION | ||
| .Nm | ||
| is a wrapper command for Mirakurun provided by Nix. It's actually a thin | ||
| wrapper around the | ||
| .Xr npm 1 | ||
| command line tool which you can use to invoke npm commands from the Mirakurun | ||
| project directory. The command line arguments are simply passed as-is to | ||
| .Xr npm 1 . | ||
| .Pp | ||
| On NixOS, it is strongly recommended that you enable the mirakurun module | ||
| instead of invoking this command directly to launch Mirakurun. On other | ||
| platforms, run | ||
| .Pp | ||
| .Dl $ mirakurun start | ||
| .Pp | ||
| to start Mirakurun. | ||
| .Sh FILES | ||
| .Bl -tag -width Ds -compact | ||
| .It Pa /etc/mirakurun | ||
| .Nm | ||
| configuration directory. | ||
| .El | ||
| .Sh EXAMPLES | ||
| Start Mirakurun. | ||
| .Pp | ||
| .Dl $ mirakurun start | ||
| .Pp | ||
| Start Mirakurun in development mode. | ||
| .Pp | ||
| .Dl $ mirakurun run debug | ||
| .Pp | ||
| .Sh SEE ALSO | ||
| .Xr npm 1 | ||
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We normally don't write man pages but use the nixos manual instead
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As noted in this document, the primary way of using Mirakurun is through the NixOS module. So the main document is in the options section of the NixOS manual, and this man page isn't something that I meant to prominently feature in the manual.
Additionally, this is mainly written for people who try to run the command directly and get confused. For that audience, it's not very clear at first that this is an Nix-provided command instead of something provided by upstream and I think it's natural to look in the man pages.