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

watchexec: darwin support #46311

Closed
wants to merge 4 commits into from
Closed

watchexec: darwin support #46311

wants to merge 4 commits into from

Conversation

nikitavoloboev
Copy link
Contributor

@nikitavoloboev nikitavoloboev commented Sep 7, 2018 •
edited

Motivation for this change

watchexec wasn't building correctly on macOS. With help of @LnL7 it does.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

gnidorah and others added 4 commits September 7, 2018 14:09
@nikitavoloboev
franz: switch to autoPatchelfHook
a7d5e67
@nikitavoloboev
maxx: switch to autoPatchelfHook
739b29d
@Ma27 @nikitavoloboev
nixos/xss-lock: add module (#40619)
9ab43df 
`xsslock` (which was originally packaged in 6cb1d1a)
is a simple screensaver which connects a given screen locker (e.g.
`i3lock`) with `logind`. Whenever `loginctl lock-sessions` is invoked
the locker will be used to lock the screen. This works with its power
management features (e.g. `lid switch`) as well, so the PC can be locked
automatically when the lid is closed.

The module can be used like this:

```
{
  services.xserver.enable = true;

  programs.xss-lock.enable = true;
  programs.xss-lock.lockerCommand = "i3lock";
}
```
@nikitavoloboev
watchexec: darwin support
a999c36
@nikitavoloboev
Copy link
Contributor Author

Anyone knows what I should to to remove the other 3 commits not made by me?

@Mic92
Copy link
Member

Mic92 commented Sep 7, 2018 •
edited

You probably want to create a new feature branch that only contains the watchexec update instead of having multiple unrelated changes for review.

@Mic92
Copy link
Member

Mic92 commented Sep 7, 2018 

git remote add upstream https://github.com/NixOS/nixpkgs
git fetch upstream master
git checkout upstream/master
git checkout -b watchexec
git cherry-pick a999c36b18a07a780f651d696c14ab701faf3d35
git push origin watchexec

And then create a new pull request from the watchexec branch.

@nikitavoloboev
Copy link
Contributor Author

Thank you @Mic92. New pr is #46313

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
2.status: merge conflict 6.topic: darwin Running or building packages on Darwin 6.topic: nixos 8.has: module (update) 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@nikitavoloboev @Mic92 @GrahamcOfBorg @Janik-Haag @Ma27