Merge pull request #249879 from dotlambda/carto-buildNpmPackage
carto: use buildNpmPackage
This commit is contained in:
commit
cf970f13ab
|
@ -27,7 +27,10 @@
|
|||
npmInstallHook = makeSetupHook
|
||||
{
|
||||
name = "npm-install-hook";
|
||||
propagatedBuildInputs = [ buildPackages.makeWrapper ];
|
||||
propagatedBuildInputs = with buildPackages; [
|
||||
installShellFiles
|
||||
makeWrapper
|
||||
];
|
||||
substitutions = {
|
||||
hostNode = "${nodejs}/bin/node";
|
||||
jq = "${buildPackages.jq}/bin/jq";
|
||||
|
|
|
@ -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"
|
||||
done < <(@jq@ --raw-output '(.man | type) as $typ | if $typ == "string" then .man
|
||||
elif $typ == "list" then .man | join("\n")
|
||||
else "invalid type " + $typ | halt_error end' "${npmWorkspace-.}/package.json")
|
||||
|
|
|
@ -49,6 +49,7 @@ mapAliases {
|
|||
balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31
|
||||
bibtex-tidy = pkgs.bibtex-tidy; # added 2023-07-30
|
||||
bitwarden-cli = pkgs.bitwarden-cli; # added 2023-07-25
|
||||
inherit (pkgs) carto; # added 2023-08-17
|
||||
castnow = pkgs.castnow; # added 2023-07-30
|
||||
eask = pkgs.eask; # added 2023-08-17
|
||||
inherit (pkgs.elmPackages) elm-test;
|
||||
|
|
|
@ -41,7 +41,6 @@
|
|||
, "browser-sync"
|
||||
, "btc-rpc-explorer"
|
||||
, "carbon-now-cli"
|
||||
, "carto"
|
||||
, "cdk8s-cli"
|
||||
, "cdktf-cli"
|
||||
, "clean-css-cli"
|
||||
|
|
89
pkgs/development/node-packages/node-packages.nix
generated
89
pkgs/development/node-packages/node-packages.nix
generated
|
@ -90994,95 +90994,6 @@ in
|
|||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
carto = nodeEnv.buildNodePackage {
|
||||
name = "carto";
|
||||
packageName = "carto";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/carto/-/carto-1.2.0.tgz";
|
||||
sha512 = "WMWMOJGgBiKddgYpOs8Q1+wBb3oJCWtXKHh2TTCVjIo1MyfzVOLBXFE8zKPNkQUR4rmqi/SDaSwYQ5QT/YhjuQ==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."ansi-regex-3.0.1"
|
||||
sources."argparse-1.0.10"
|
||||
sources."camelcase-5.3.1"
|
||||
sources."chroma-js-1.3.7"
|
||||
sources."cliui-4.1.0"
|
||||
sources."code-point-at-1.1.0"
|
||||
sources."cross-spawn-6.0.5"
|
||||
sources."decamelize-1.2.0"
|
||||
sources."end-of-stream-1.4.4"
|
||||
sources."esprima-4.0.1"
|
||||
sources."execa-1.0.0"
|
||||
sources."find-up-3.0.0"
|
||||
sources."get-caller-file-1.0.3"
|
||||
sources."get-stream-4.1.0"
|
||||
sources."hsluv-0.0.3"
|
||||
sources."invert-kv-2.0.0"
|
||||
sources."is-fullwidth-code-point-1.0.0"
|
||||
sources."is-stream-1.1.0"
|
||||
sources."isexe-2.0.0"
|
||||
sources."js-yaml-3.12.2"
|
||||
sources."lcid-2.0.0"
|
||||
sources."locate-path-3.0.0"
|
||||
sources."lodash-4.17.21"
|
||||
sources."map-age-cleaner-0.1.3"
|
||||
sources."mapnik-reference-8.10.0"
|
||||
sources."mem-4.3.0"
|
||||
sources."mimic-fn-2.1.0"
|
||||
sources."nice-try-1.0.5"
|
||||
sources."npm-run-path-2.0.2"
|
||||
sources."number-is-nan-1.0.1"
|
||||
sources."once-1.4.0"
|
||||
sources."os-locale-3.1.0"
|
||||
sources."p-defer-1.0.0"
|
||||
sources."p-finally-1.0.0"
|
||||
sources."p-is-promise-2.1.0"
|
||||
sources."p-limit-2.3.0"
|
||||
sources."p-locate-3.0.0"
|
||||
sources."p-try-2.2.0"
|
||||
sources."path-exists-3.0.0"
|
||||
sources."path-key-2.0.1"
|
||||
sources."pump-3.0.0"
|
||||
sources."require-directory-2.1.1"
|
||||
sources."require-main-filename-1.0.1"
|
||||
sources."semver-5.6.0"
|
||||
sources."set-blocking-2.0.0"
|
||||
sources."shebang-command-1.2.0"
|
||||
sources."shebang-regex-1.0.0"
|
||||
sources."signal-exit-3.0.7"
|
||||
sources."sprintf-js-1.0.3"
|
||||
(sources."string-width-2.1.1" // {
|
||||
dependencies = [
|
||||
sources."is-fullwidth-code-point-2.0.0"
|
||||
];
|
||||
})
|
||||
sources."strip-ansi-4.0.0"
|
||||
sources."strip-eof-1.0.0"
|
||||
sources."which-1.3.1"
|
||||
sources."which-module-2.0.1"
|
||||
(sources."wrap-ansi-2.1.0" // {
|
||||
dependencies = [
|
||||
sources."ansi-regex-2.1.1"
|
||||
sources."string-width-1.0.2"
|
||||
sources."strip-ansi-3.0.1"
|
||||
];
|
||||
})
|
||||
sources."wrappy-1.0.2"
|
||||
sources."y18n-4.0.3"
|
||||
sources."yargs-12.0.5"
|
||||
sources."yargs-parser-11.1.1"
|
||||
];
|
||||
buildInputs = globalBuildInputs;
|
||||
meta = {
|
||||
description = "Mapnik Stylesheet Compiler";
|
||||
homepage = "https://github.com/mapbox/carto#readme";
|
||||
license = "Apache-2.0";
|
||||
};
|
||||
production = true;
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
};
|
||||
cdk8s-cli = nodeEnv.buildNodePackage {
|
||||
name = "cdk8s-cli";
|
||||
packageName = "cdk8s-cli";
|
||||
|
|
29
pkgs/development/tools/carto/default.nix
Normal file
29
pkgs/development/tools/carto/default.nix
Normal file
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "carto";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mapbox";
|
||||
repo = "carto";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TylMgb2EI52uFmVeMJiQltgNCSh6MutFwUjsYC7gfEA=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-8M9hze71bQWhyxcXeI/EOr0SQ+tx8Lb9LfvnGxYYo0A=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/mapbox/carto/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Mapnik stylesheet compiler";
|
||||
homepage = "https://github.com/mapbox/carto";
|
||||
license = lib.licenses.asl20;
|
||||
mainProgram = "carto";
|
||||
maintainers = with lib.maintainers; [ Luflosi ];
|
||||
};
|
||||
}
|
|
@ -18750,6 +18750,8 @@ with pkgs;
|
|||
|
||||
cadre = callPackage ../development/tools/cadre { };
|
||||
|
||||
carto = callPackage ../development/tools/carto { };
|
||||
|
||||
catnip = callPackage ../tools/audio/catnip { };
|
||||
|
||||
catnip-gtk4 = callPackage ../tools/audio/catnip-gtk4 { };
|
||||
|
|
Loading…
Reference in a new issue