Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rset: init at 2.1 #120595

Merged
merged 1 commit into from May 3, 2021
Merged

rset: init at 2.1 #120595

merged 1 commit into from May 3, 2021

Conversation

cstrahan
Copy link
Contributor

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@r-rmcgibbo
Copy link

r-rmcgibbo commented Apr 25, 2021

Result of nixpkgs-review pr 120595 at e17b57a run on x86_64-linux 1

1 package built successfully:
  • rset
1 suggestion:
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/admin/rset/default.nix:12:15:

       |
    12 |   patches = [ ./paths.patch ];
       |               ^
    

Result of nixpkgs-review pr 120595 at e17b57a run on aarch64-linux 1

1 package built successfully:
  • rset
1 suggestion:
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/admin/rset/default.nix:12:15:

       |
    12 |   patches = [ ./paths.patch ];
       |               ^
    

Comment on lines +16 to +19
--replace @ssh@ ${openssh}/bin/ssh \
--replace @miniquark@ $out/bin/miniquark \
--replace @rinstall@ $out/bin/rinstall \
--replace @rsub@ $out/bin/rsub
Copy link
Member

Choose a reason for hiding this comment

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

Can we also just replace the bare binary names or does this cause issues?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It would be easy to over-replace, and there are cases like this where we need to patch anyway:

https://github.com/NixOS/nixpkgs/pull/120595/files#diff-00160293b5e7505f1d8a5f2bfd51a9d22acaceb39e66e785996f4342e4e3fdcdR104

I think, at that point, might as well patch the other binary names so they can be safely, selectively replaced.

@lukegb lukegb merged commit 2f06f57 into NixOS:master May 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants