carto: use buildNpmPackage #249879
Merged
carto: use buildNpmPackage #249879
Conversation
This file contains 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
delroth
approved these changes
Aug 18, 2023
There was a problem hiding this comment.
Tested:
- Builds fine on x86_64-linux
--versionworks- Diff with previous version:
The output from this PR has aEDIT: that's mybin/carto, which is a good improvement.findinvocation not following symlinks, ignore :)- However the man page isn't properly copied to
share/man/carto.1anymore. That's likely abuildNpmPackagebug/missing feature? I don't really see that as a major issue though.
12 tasks
dotlambda
force-pushed
the
carto-buildNpmPackage
branch
from
3c205bc
to
1d6cde5
Compare
dotlambda
commented
Aug 19, 2023
| @@ -25,8 +25,7 @@ npmInstallHook() { | |||
| else "invalid type " + $typ | halt_error end' "${npmWorkspace-.}/package.json") | |||
|
|
|||
| while IFS= read -r man; do | |||
| mkdir -p "$out/share/man" | |||
| ln -s "$packageOut/$man" "$out/share/man" | |||
| installManPage "$packageOut/$man" | |||
There was a problem hiding this comment.
This isn't quite accurate either. According to https://docs.npmjs.com/cli/v9/configuring-npm/package-json/#man we're supposed to modify the name of the man page. That would be easiest to do if we modify installManPage to accept the man page name as an optional argument.
There was a problem hiding this comment.
TIL about "installManPage", thanks! No objection to leaving that bug for now, it's still better than the previous or current status and I don't want to block this particular PR on the man page question.
delroth
approved these changes
Aug 19, 2023
Luflosi
reviewed
Aug 19, 2023
| description = "Fast CSS-like map stylesheets"; | ||
| homepage = "https://github.com/mapbox/carto"; | ||
| license = lib.licenses.asl20; | ||
| mainProgram = "carto"; |
There was a problem hiding this comment.
Both the package and the binary it provides are called "carto", right? In this case you should remove mainProgram as it is unnecessary.
Suggested change
| mainProgram = "carto"; |
dotlambda
force-pushed
the
carto-buildNpmPackage
branch
from
1d6cde5
to
96e5dce
Compare
|
Result of 1 package marked as broken and skipped:
6 packages failed to build:
150 packages built:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description of changes
See #229475
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)cc @Luflosi who originally packaged it in #187891