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

Jump to bottom

nixos/systemd: Use a proper type for unit paths #75510

Merged
merged 1 commit into from Jun 18, 2020
Merged

nixos/systemd: Use a proper type for unit paths #75510

merged 1 commit into from Jun 18, 2020

Conversation

dasJ
Copy link
Member

@dasJ dasJ commented Dec 11, 2019

Motivation for this change

Idk if this breaks anything, and I also have no idea which tests to run on ofborg for that…

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 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @edolstra because you wrote the original code

@dasJ
Copy link
Member Author

dasJ commented Dec 11, 2019

@GrahamcOfBorg test systemd

Uses systemd.services.prepare-kexec.path:
@GrahamcOfBorg test kexec

@dasJ dasJ mentioned this pull request Dec 23, 2019
Closed
16 tasks
@stale
Copy link

stale bot commented Jun 18, 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 18, 2020
@dasJ
Copy link
Member Author

dasJ commented Jun 18, 2020

Bruh.

@stale stale bot removed the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jun 18, 2020
@dasJ dasJ requested a review from Lassulus June 18, 2020 19:36
@NixOS NixOS deleted a comment from dasJ Jun 18, 2020
@flokli
Copy link
Contributor

flokli commented Jun 18, 2020

Hm, I only meant to edit my own comment, which suggested something silly, not delete the whole comment thread, sorry. Also it seems github swallowed my answer as well :-/

I'm not sure if there isn't anything setting this option to a static path, but in that case, we can probably change this be a list of str or package - I think only pointing it to packages is fine, and I want to know of obscure usecases where it needs to be different ;-)

@flokli flokli merged commit c1e7366 into NixOS:master Jun 18, 2020
@flokli
Copy link
Contributor

flokli commented Jun 18, 2020

I got a pointer on IRC that some modules add "/run/wrappers" there to add /run/wrappers/bininto unit paths$PATH` (the IPFS module for example).

Will file a PR shortly.

flokli added a commit to flokli/nixpkgs that referenced this pull request Jun 18, 2020
@flokli
nixos/systemd: allow str in systemd.services.<name>.path
1c9e02b 
Turns out, NixOS#75510 was too restrictive.

We also need to allow str here, as some modules set this to
"/run/wrappers" to bring `/run/wrappers/bin` into $PATH of a unit.
@flokli flokli mentioned this pull request Jun 18, 2020
Merged
10 tasks
@ajs124 ajs124 deleted the systemd-path-type branch June 18, 2020 22:25
@dasJ dasJ mentioned this pull request Jun 19, 2020
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ma27 Ma27 Ma27 approved these changes

@Lassulus Lassulus Awaiting requested review from Lassulus

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dasJ @flokli @Ma27