Skip to content

Commit

Permalink
nodePackages: init multiple packages
Browse files Browse the repository at this point in the history
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 <[email protected]>
Co-authored-by: Pasquale <[email protected]>
Co-authored-by: Teodoro Freund <[email protected]>
Co-authored-by: Tobias Mayer <[email protected]>
Co-authored-by: vladki <[email protected]>
  • Loading branch information
6 people committed Oct 16, 2020
1 parent ee81376 commit b1b63b6
Show file tree
Hide file tree
Showing 3 changed files with 3,676 additions and 2,080 deletions.
12 changes: 12 additions & 0 deletions pkgs/development/node-packages/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions pkgs/development/node-packages/node-packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
, "browserify"
, "castnow"
, "clean-css-cli"
, "clubhouse-cli"
, "coc-css"
, "coc-emmet"
, "coc-eslint"
Expand Down Expand Up @@ -82,6 +83,7 @@
, "gitmoji-cli"
, "graphql-cli"
, "grunt-cli"
, "makam"
, "gtop"
, "gulp"
, "gulp-cli"
Expand All @@ -90,6 +92,7 @@
, "htmlhint"
, "http-server"
, "hueadm"
, "inliner"
, "imapnotify"
, "indium"
, "insect"
Expand Down Expand Up @@ -161,6 +164,7 @@
, "rollup"
, { "rust-analyzer-build-deps": "../../misc/vscode-extensions/rust-analyzer/build-deps" }
, "s3http"
, "sass"
, "semver"
, "serve"
, "serverless"
Expand Down Expand Up @@ -201,6 +205,7 @@
, "typescript"
, "typescript-language-server"
, "uglify-js"
, "undollar"
, "ungit"
, "vega-cli"
, "vega-lite"
Expand Down
Loading

0 comments on commit b1b63b6

Please sign in to comment.