So I went through the process of merging three PRs and I have a few questions because I don’t want to step on anyone’s toes. Right now I just manually cherry-picked the changes from each fork/PR and then rewrote the author to preserve the information who put in the work to add something new. I then want to run the generate.sh
for each commit. It’s now running as I’m writing this and I have no idea if this will take hours or days on my measly AMD Ryzen 7 1700.
The pragmatic alternative would be to just take the changes from all PRs, add them as a single commit, run generate.sh
once, and maybe refer to all authors in the commit message? But I don’t know GitHub well enough to determine if either of these two options will properly preserve the commit in e.g., people’s dashboards and just in case someone really cares about having their commits to Nixpkgs properly reflected there, I thought I’d ask first.
I would have created a PR so you can see the changes but like I said generate is still running. The gist is (without the generated stuff)
nixpkgs-master (master↑3|✔) $ git shortlog --max-count=3
Changlin Li (1):
nodePackages.inliner: init at 1.13.1
Teodoro Freund (1):
Added the makam package to the nodePackages
Tobias Mayer (1):
nodePackages.clubhouse-cli: init at 2.1.0
diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix
index 4ef3de0bb4e..c86bc964fd6 100644
--- a/pkgs/development/node-packages/default.nix
+++ b/pkgs/development/node-packages/default.nix
@@ -73,6 +73,14 @@ 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 ]}
+ patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 "$out/lib/node_modules/makam/makam-bin-linux64"
+ '';
+ };
+
mirakurun = super.mirakurun.override rec {
nativeBuildInputs = with pkgs; [ makeWrapper ];
postInstall = let
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 77b398caeec..8cd631cf070 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -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"
TL;DR: I really want to help I just want to make sure I do it in the right way before automating anything.