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

utils.escapeSystemdPath: actually try to implement the specification #176115

Closed
wants to merge 1 commit into from
Closed

utils.escapeSystemdPath: actually try to implement the specification #176115

wants to merge 1 commit into from

Conversation

ajs124
Copy link
Member

@ajs124 ajs124 commented Jun 3, 2022

Description of changes

https://man.archlinux.org/man/systemd.unit.5#STRING_ESCAPING_FOR_INCLUSION_IN_UNIT_NAMES

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.11 Release Notes (or backporting 22.05 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.

@ajs124 ajs124 requested review from mweinelt and dasJ June 3, 2022 13:57
@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Jun 3, 2022
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jun 3, 2022
@ajs124 ajs124 force-pushed the fix/utils-escapeSystemdPath-root branch from 185e432 to d39a994 Compare June 3, 2022 15:54
@ajs124 ajs124 changed the title utils.escapeSystemdPath: fix escaping / utils.escapeSystemdPath: actually try to implement the specification Jun 3, 2022
@ajs124 ajs124 requested a review from edolstra June 3, 2022 16:02
RaitoBezarius
RaitoBezarius reviewed Jun 11, 2022
View reviewed changes
nixos/lib/utils.nix
(removePrefix "/" s);
(if s == "/"
then s
else removeSuffix "/" (removePrefix "/"
Copy link
Member

Choose a reason for hiding this comment

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

I wonder whether it's relevant to optimize the removeSuffix α (removePrefix α S) call into a trim α S which might be faster?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't see a trim function anywhere in lib/?

@ajs124 ajs124 mentioned this pull request Jun 12, 2022
Merged
13 tasks
@ajs124
Copy link
Member Author

ajs124 commented Jun 24, 2022

superseded by #177273

@ajs124 ajs124 closed this Jun 24, 2022
@ajs124 ajs124 deleted the fix/utils-escapeSystemdPath-root branch June 24, 2022 13:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RaitoBezarius RaitoBezarius RaitoBezarius left review comments

@mweinelt mweinelt Awaiting requested review from mweinelt

@dasJ dasJ Awaiting requested review from dasJ

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ajs124 @RaitoBezarius