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.

Sign up for GitHub

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

Jump to bottom

nixos/i2pd: get rid of unnecessary shell script #156706

Merged
merged 1 commit into from
Feb 1, 2022
Merged

nixos/i2pd: get rid of unnecessary shell script #156706

merged 1 commit into from
Feb 1, 2022

Conversation

Luflosi
Copy link
Contributor

@Luflosi Luflosi commented Jan 25, 2022

Motivation for this change

I think calling i2pd directly in ExecStart is much nicer than having an extra shell script for no reason. It's also easier to see what's going on when looking at the generated systemd unit file.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 25, 2022
@Luflosi
Copy link
Contributor Author

Luflosi commented Jan 25, 2022

/marvin opt-in
/status needs_reviewer

@marvin-mk2 marvin-mk2 bot added the marvin This PR was reviewed by Marvin, a discontinued bot: https://github.com/timokau/marvin-mk2 label Jan 25, 2022
@marvin-mk2
Copy link

marvin-mk2 bot commented Jan 25, 2022

Hi! I'm an experimental bot. My goal is to guide this PR through its stages, hopefully ending with a merge. You can read up on the usage here.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 labels Jan 25, 2022
@marvin-mk2 marvin-mk2 bot requested a review from timokau January 29, 2022 10:20
timokau
timokau requested changes Jan 31, 2022
View reviewed changes
Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

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

Looks mostly good, I left some minor feedback.

nixos/modules/services/networking/i2pd.nix Outdated Show resolved Hide resolved
nixos/modules/services/networking/i2pd.nix Outdated Show resolved Hide resolved
@Luflosi
nixos/i2pd: get rid of unnecessary shell script
fd6d59f 
I think calling i2pd directly in `ExecStart` is much nicer than having an extra shell script for no reason. It's also easier to see what's going on when looking at the generated systemd unit file.
@Luflosi Luflosi requested a review from timokau January 31, 2022 22:23
timokau
timokau approved these changes Jan 31, 2022
View reviewed changes
Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

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

Thanks :)

@timokau timokau merged commit c395fe1 into NixOS:master Feb 1, 2022
@Luflosi Luflosi deleted the i2pd-remove-script branch February 1, 2022 10:57
@Luflosi Luflosi mentioned this pull request Mar 19, 2022
Merged
13 tasks
Luflosi added a commit to Luflosi/nixpkgs that referenced this pull request Mar 24, 2022
@Luflosi
nixos/ipfs: improve how the commandline flags are generated
46ab18e 
Use `utils.escapeSystemdExecArgs` instead of relying on the exact way in which `toString` formats a list.
In NixOS#156706 (comment) a suggestion was made and then implemented to replace `toString` with `concatStringsSep " "`.
@pennae then suggested to use `utils.escapeSystemdExecArgs` instead in NixOS#164846 (comment).
pennae pushed a commit that referenced this pull request Mar 24, 2022
@Luflosi @pennae
nixos/ipfs: improve how the commandline flags are generated
ec41505 
Use `utils.escapeSystemdExecArgs` instead of relying on the exact way in which `toString` formats a list.
In #156706 (comment) a suggestion was made and then implemented to replace `toString` with `concatStringsSep " "`.
@pennae then suggested to use `utils.escapeSystemdExecArgs` instead in #164846 (comment).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timokau timokau timokau approved these changes

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 1-10 awaiting_reviewer marvin This PR was reviewed by Marvin, a discontinued bot: https://github.com/timokau/marvin-mk2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Luflosi @timokau