Skip to content

Commit 5aa530f

Browse files
vcunatvcunat
committedMay 19, 2017
Merge branch 'master' into staging
A few thousand rebuilds from master.
2 parents cbdcc20 + 2f22bbe commit 5aa530f

File tree

30 files changed

+1455
-1299
lines changed

30 files changed

+1455
-1299
lines changed
 

‎lib/maintainers.nix

+1
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@
196196
garrison = "Jim Garrison <jim@garrison.cc>";
197197
gavin = "Gavin Rogers <gavin@praxeology.co.uk>";
198198
gebner = "Gabriel Ebner <gebner@gebner.org>";
199+
georgewhewell = "George Whewell <georgerw@gmail.com>";
199200
gilligan = "Tobias Pflug <tobias.pflug@gmail.com>";
200201
giogadi = "Luis G. Torres <lgtorres42@gmail.com>";
201202
gleber = "Gleb Peregud <gleber.p@gmail.com>";

‎nixos/modules/hardware/video/displaylink.nix

+16-11
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
{ config, lib, ... }:
1+
{ config, lib, pkgs, ... }:
22

33
with lib;
44

55
let
66

77
enabled = elem "displaylink" config.services.xserver.videoDrivers;
88

9-
displaylink = config.boot.kernelPackages.displaylink;
9+
evdi = config.boot.kernelPackages.evdi;
10+
11+
displaylink = pkgs.displaylink.override {
12+
inherit evdi;
13+
};
1014

1115
in
1216

1317
{
1418

1519
config = mkIf enabled {
1620

17-
boot.extraModulePackages = [ displaylink ];
18-
19-
boot.kernelModules = [ "evdi" ];
21+
boot.extraModulePackages = [ evdi ];
2022

2123
# Those are taken from displaylink-installer.sh and from Arch Linux AUR package.
2224

23-
services.udev.extraRules = ''
24-
ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="17e9", ATTR{bNumInterfaces}=="*5", TAG+="uaccess"
25-
'';
25+
services.udev.packages = [ displaylink ];
2626

2727
powerManagement.powerDownCommands = ''
2828
#flush any bytes in pipe
@@ -32,18 +32,22 @@ in
3232
echo "S" > /tmp/PmMessagesPort_in
3333
3434
#wait until suspend of DisplayLinkManager finish
35-
read -n 1 -t 10 SUSPEND_RESULT < /tmp/PmMessagesPort_out
35+
if [ -f /tmp/PmMessagesPort_out ]; then
36+
#wait until suspend of DisplayLinkManager finish
37+
read -n 1 -t 10 SUSPEND_RESULT < /tmp/PmMessagesPort_out
38+
fi
3639
'';
3740

3841
powerManagement.resumeCommands = ''
3942
#resume DisplayLinkManager
4043
echo "R" > /tmp/PmMessagesPort_in
4144
'';
4245

43-
systemd.services.displaylink = {
46+
systemd.services.dlm = {
4447
description = "DisplayLink Manager Service";
4548
after = [ "display-manager.service" ];
46-
wantedBy = [ "graphical.target" ];
49+
conflicts = [ "getty@tty7.service" ];
50+
path = [ pkgs.kmod ];
4751

4852
serviceConfig = {
4953
ExecStart = "${displaylink}/bin/DisplayLinkManager";
@@ -53,6 +57,7 @@ in
5357

5458
preStart = ''
5559
mkdir -p /var/log/displaylink
60+
modprobe evdi
5661
'';
5762
};
5863

‎nixos/modules/module-list.nix

+1
Original file line numberDiff line numberDiff line change
@@ -614,6 +614,7 @@
614614
./services/x11/window-managers/windowlab.nix
615615
./services/x11/window-managers/wmii.nix
616616
./services/x11/window-managers/xmonad.nix
617+
./services/x11/xautolock.nix
617618
./services/x11/xbanish.nix
618619
./services/x11/xfs.nix
619620
./services/x11/xserver.nix

‎nixos/modules/services/networking/miredo.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ in
2020

2121
services.miredo = {
2222

23-
enable = mkEnableOption "Whether miredo should be run on startup.";
23+
enable = mkEnableOption "the Miredo IPv6 tunneling service.";
2424

2525
package = mkOption {
2626
type = types.package;

‎nixos/modules/services/x11/xautolock.nix

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{ config, lib, pkgs, ... }:
2+
3+
with lib;
4+
5+
let
6+
cfg = config.services.xserver.xautolock;
7+
in
8+
{
9+
options = {
10+
services.xserver.xautolock = {
11+
enable = mkEnableOption "xautolock";
12+
enableNotifier = mkEnableOption "xautolock.notify" // {
13+
description = ''
14+
Whether to enable the notifier feature of xautolock.
15+
This publishes a notification before the autolock.
16+
'';
17+
};
18+
19+
time = mkOption {
20+
default = 15;
21+
type = types.int;
22+
23+
description = ''
24+
Idle time to wait until xautolock locks the computer.
25+
'';
26+
};
27+
28+
locker = mkOption {
29+
default = "xlock"; # default according to `man xautolock`
30+
example = "i3lock -i /path/to/img";
31+
type = types.string;
32+
33+
description = ''
34+
The script to use when locking the computer.
35+
'';
36+
};
37+
38+
notify = mkOption {
39+
default = 10;
40+
type = types.int;
41+
42+
description = ''
43+
Time (in seconds) before the actual lock when the notification about the pending lock should be published.
44+
'';
45+
};
46+
47+
notifier = mkOption {
48+
default = "notify-send 'Locking in 10 seconds'";
49+
type = types.string;
50+
51+
description = ''
52+
Notification script to be used to warn about the pending autolock.
53+
'';
54+
};
55+
};
56+
};
57+
58+
config = mkIf cfg.enable {
59+
environment.systemPackages = with pkgs; [ xautolock ];
60+
61+
services.xserver.displayManager.sessionCommands = with builtins; with pkgs; ''
62+
${xautolock}/bin/xautolock \
63+
${concatStringsSep " \\\n" ([
64+
"-time ${toString(cfg.time)}"
65+
"-locker ${cfg.locker}"
66+
] ++ optional cfg.enableNotifier (concatStringsSep " " [
67+
"-notify ${toString(cfg.notify)}"
68+
"-notifier \"${cfg.notifier}\""
69+
]))} &
70+
'';
71+
};
72+
}

‎pkgs/applications/editors/nano/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ let
2020

2121
in stdenv.mkDerivation rec {
2222
name = "nano-${version}";
23-
version = "2.8.2";
23+
version = "2.8.3";
2424

2525
src = fetchurl {
2626
url = "mirror://gnu/nano/${name}.tar.xz";
27-
sha256 = "1q5rxkvsv974085xrd2k11ffazadabcb9cnpfra0shmj71xqlgh2";
27+
sha256 = "0m8g1f1c09kjmy7w6dxq30yw373nsv1ylj7986xyv4a0jddybf32";
2828
};
2929

3030
nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

‎pkgs/applications/kde/fetch.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
WGET_ARGS=( http://download.kde.org/stable/applications/17.04.0/ -A '*.tar.xz' )
1+
WGET_ARGS=( http://download.kde.org/stable/applications/17.04.1/ -A '*.tar.xz' )

0 commit comments

Comments
 (0)
Please sign in to comment.