nodePackages: init multiple packages

This commit combines several individual PRs which would have resulted in
merge conflicts in the generated JSON files. Instead, the "generate.sh"
script is only ran once.

Due to "makam" not building on MacOS in the form it was originally added
in the PR I made some adjustments to this diff.

List of added packages:

- nodePackages.clubhouse-cli: init at 2.1.0
- nodePackages.makam: init at 0.7.17
- nodePackages.inliner: init at 1.13.1
- nodePackages.sass: init at 1.27.0
- nodePackages.undollar: init at 1.0.0

Co-authoring is used to preserve contributions.

Co-authored-by: Changlin Li <mail@changlinli.com>
Co-authored-by: Pasquale <p3dimaria@hotmail.it>
Co-authored-by: Teodoro Freund <teodoro.freund@tweag.io>
Co-authored-by: Tobias Mayer <tobim@fastmail.fm>
Co-authored-by: vladki <vlad@kirillov.im>
This commit is contained in:
Florian Beeres 2020-10-15 16:10:18 +02:00
parent ee813768c0
commit b1b63b66c9
3 changed files with 3543 additions and 1947 deletions

View file

@ -73,6 +73,18 @@ let
nativeBuildInputs = drv.nativeBuildInputs or [] ++ [ pkgs.psc-package self.pulp ];
});
makam = super.makam.override {
buildInputs = [ pkgs.nodejs pkgs.makeWrapper ];
postFixup = ''
wrapProgram "$out/bin/makam" --prefix PATH : ${stdenv.lib.makeBinPath [ pkgs.nodejs ]}
${
if stdenv.isLinux
then "patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 \"$out/lib/node_modules/makam/makam-bin-linux64\""
else ""
}
'';
};
mirakurun = super.mirakurun.override rec {
nativeBuildInputs = with pkgs; [ makeWrapper ];
postInstall = let

View file

@ -18,6 +18,7 @@
, "browserify"
, "castnow"
, "clean-css-cli"
, "clubhouse-cli"
, "coc-css"
, "coc-emmet"
, "coc-eslint"
@ -82,6 +83,7 @@
, "gitmoji-cli"
, "graphql-cli"
, "grunt-cli"
, "makam"
, "gtop"
, "gulp"
, "gulp-cli"
@ -90,6 +92,7 @@
, "htmlhint"
, "http-server"
, "hueadm"
, "inliner"
, "imapnotify"
, "indium"
, "insect"
@ -161,6 +164,7 @@
, "rollup"
, { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" }
, "s3http"
, "sass"
, "semver"
, "serve"
, "serverless"
@ -201,6 +205,7 @@
, "typescript"
, "typescript-language-server"
, "uglify-js"
, "undollar"
, "ungit"
, "vega-cli"
, "vega-lite"

File diff suppressed because it is too large Load diff