Skip to content

mpssh: init at 1.3.3#62662

Closed
ktf wants to merge 2 commits intoNixOS:masterfrom
ktf:master
Closed

mpssh: init at 1.3.3#62662
ktf wants to merge 2 commits intoNixOS:masterfrom
ktf:master

Conversation

@ktf
Copy link
Contributor

@ktf ktf commented Jun 4, 2019

Motivation for this change

New package.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jun 4, 2019
Copy link
Member

@mmahut mmahut left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few cosmetic suggestions, other it works as expected.

  • reviewed the diff and commit messages
  • made sure ofBorg eval
  • run nix-review without any failures
  • run and tested the binaries

@ktf
Copy link
Contributor Author

ktf commented Jun 4, 2019

Fixed as suggested. Thank you for the prompt review.

@ktf
Copy link
Contributor Author

ktf commented Jun 5, 2019

I think I've addressed all the comments. New commit force pushed.

buildInputs = [ openssh ];

postPatch = ''
substituteInPlace Makefile --replace /usr/local $out
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


postPatch = ''
substituteInPlace Makefile --replace /usr/local $out
substituteInPlace Makefile --replace "-o root" ""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps use a patch, it will make it easier to notice when the substitution no longer applies

patches = [
  # Do not install as root
  (fetchpatch {
    url = https://github.com/ndenev/mpssh/commit/3cbb868b6fdf8dff9ab86868510c0455ad1ec1b3.patch;
    sha256 = "0000000000000000000000000000000000000000000000000000000000000000";
  })
];

substituteInPlace Makefile --replace "-o root" ""
'';

makeFlags = "CC=cc LD=cc BIN=$(out)/bin SSHPATH=${openssh}/bin/ssh SCPPATH=${openssh}/bin/scp";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please make this a list: #45886


makeFlags = "CC=cc LD=cc BIN=$(out)/bin SSHPATH=${openssh}/bin/ssh SCPPATH=${openssh}/bin/scp";

meta = {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is usually nicer to use with stdenv.lib here, so that it does not need to be repeated in meta.

Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>
@mmahut
Copy link
Member

mmahut commented Aug 9, 2019

Do you mind squashing your commits?

@aanderse
Copy link
Member

aanderse commented Sep 1, 2019

@ktf are you able to address the above comments and continue with this PR?

@stale
Copy link

stale bot commented Jun 1, 2020

Thank you for your contributions.
This has been automatically marked as stale because it has had no activity for 180 days.
If this is still important to you, we ask that you leave a comment below. Your comment can be as simple as "still important to me". This lets people see that at least one person still cares about this. Someone will have to do this at most twice a year if there is no other activity.
Here are suggestions that might help resolve this more quickly:

  1. Search for maintainers and people that previously touched the
    related code and @ mention them in a comment.
  2. Ask on the NixOS Discourse. 3. Ask on the #nixos channel on
    irc.freenode.net.

@stale stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 1, 2020
@ktf ktf closed this Jul 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants