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: allow str in systemd.services.<name>.path #91068

Merged
merged 1 commit into from Jun 18, 2020
Merged

nixos/systemd: allow str in systemd.services.<name>.path #91068

merged 1 commit into from Jun 18, 2020

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Jun 18, 2020

Turns out, #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.

Things done

Ran the ipfs tests (an example of it), and the systemd test.

  • 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.

@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.
cole-h
cole-h approved these changes Jun 18, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment •
edited

Choose a reason for hiding this comment

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

Thanks!

@cole-h
Copy link
Member

cole-h commented Jun 18, 2020 •
edited

Well, looks like that didn't work. One more time.

@ofborg test ipfs systemd

dasJ
dasJ approved these changes Jun 18, 2020
View reviewed changes
Copy link
Member

@dasJ dasJ left a comment

Choose a reason for hiding this comment

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

Oof, sorry for that oversight 👀

@flokli flokli merged commit 757ba19 into NixOS:master Jun 18, 2020
@flokli flokli deleted the nixos-systemd-unit-path-types branch June 18, 2020 22:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dasJ dasJ dasJ approved these changes

@cole-h cole-h cole-h approved these changes

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@flokli @cole-h @dasJ