Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 971b5bea49d2
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bfb61a770929
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 17, 2018

  1. nixos/weechat: add setuid wrapper for `screen' to ensure true multius… 

    …er capabilities

Previously you either had to set the setuid bit yourself or workaround
`isSystemUser = true` (for a loginable shell) to access the weechat
screen.

`programs.screen` shouldn't do this by default to avoid taking too much
assumptions about the setup, however `services.weechat` explicitly
requires tihs.

See #45728

(cherry picked from commit 018573b)
    @Ma27
    Ma27 committed Oct 17, 2018
    Copy the full SHA
    bfb61a7 View commit details
Showing with 4 additions and 2 deletions.
  1. +3 −1 nixos/modules/services/misc/weechat.nix
  2. +1 −1 nixos/modules/services/misc/weechat.xml
4 changes: 3 additions & 1 deletion nixos/modules/services/misc/weechat.nix
View file
Original file line number Diff line number Diff line change
@@ -46,10 +46,12 @@ in
Group = "weechat";
RemainAfterExit = "yes";
};
script = "exec ${pkgs.screen}/bin/screen -Dm -S ${cfg.sessionName} ${cfg.binary}";
script = "exec ${config.security.wrapperDir}/screen -Dm -S ${cfg.sessionName} ${cfg.binary}";
wantedBy = [ "multi-user.target" ];
wants = [ "network.target" ];
};

security.wrappers.screen.source = "${pkgs.screen}/bin/screen";
};

meta.doc = ./weechat.xml;
2 changes: 1 addition & 1 deletion nixos/modules/services/misc/weechat.xml
View file
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@
</programlisting>
Now, the session can be re-attached like this:
<programlisting>
screen -r weechat-screen
screen -x weechat/weechat-screen
</programlisting>
</para>