commit 068c0e3c956eb0738beb212b6331a59c4fec7df5 · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-2405.section.md

···

       209
       209
        
       

     

       210
       210
        
       - [isolate](https://github.com/ioi/isolate), a sandbox for securely executing untrusted programs. Available as [security.isolate](#opt-security.isolate.enable).

     

       211
       211
        
       

     

       212
       212
       +
       - [ydotool](https://github.com/ReimuNotMoe/ydotool), a generic command-line automation tool now has a module. Available as [programs.ydotool](#opt-programs.ydotool.enable).

     

       213
       213
       +
       

     

       212
       214
        
       - [private-gpt](https://github.com/zylon-ai/private-gpt), a service to interact with your documents using the power of LLMs, 100% privately, no data leaks. Available as [services.private-gpt](#opt-services.private-gpt.enable).

     

       213
       215
        
       

     

       214
       216
        
       - [keto](https://www.ory.sh/keto/), a permission & access control server, the first open source implementation of ["Zanzibar: Google's Consistent, Global Authorization System"](https://research.google/pubs/zanzibar-googles-consistent-global-authorization-system/).

nixos/modules/module-list.nix

···

       308
       308
        
         ./programs/xwayland.nix

     

       309
       309
        
         ./programs/yabar.nix

     

       310
       310
        
         ./programs/yazi.nix

     

       311
       311
       +
         ./programs/ydotool.nix

     

       311
       312
        
         ./programs/yubikey-touch-detector.nix

     

       312
       313
        
         ./programs/zmap.nix

     

       313
       314
        
         ./programs/zsh/oh-my-zsh.nix

+83

nixos/modules/programs/ydotool.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       let

     

       8
       8
       +
         cfg = config.programs.ydotool;

     

       9
       9
       +
       in

     

       10
       10
       +
       {

     

       11
       11
       +
         meta = {

     

       12
       12
       +
           maintainers = with lib.maintainers; [ quantenzitrone ];

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         options.programs.ydotool = {

     

       16
       16
       +
           enable = lib.mkEnableOption ''

     

       17
       17
       +
             ydotoold system service and install ydotool.

     

       18
       18
       +
             Add yourself to the 'ydotool' group to be able to use it.

     

       19
       19
       +
           '';

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         config = lib.mkIf cfg.enable {

     

       23
       23
       +
           users.groups.ydotool = { };

     

       24
       24
       +
       

     

       25
       25
       +
           systemd.services.ydotoold = {

     

       26
       26
       +
             description = "ydotoold - backend for ydotool";

     

       27
       27
       +
             wantedBy = [ "multi-user.target" ];

     

       28
       28
       +
             partOf = [ "multi-user.target" ];

     

       29
       29
       +
             serviceConfig = {

     

       30
       30
       +
               Group = "ydotool";

     

       31
       31
       +
               RuntimeDirectory = "ydotoold";

     

       32
       32
       +
               RuntimeDirectoryMode = "0750";

     

       33
       33
       +
               ExecStart = "${lib.getExe' pkgs.ydotool "ydotoold"} --socket-path=/run/ydotoold/socket --socket-perm=0660";

     

       34
       34
       +
       

     

       35
       35
       +
               # hardening

     

       36
       36
       +
       

     

       37
       37
       +
               ## allow access to uinput

     

       38
       38
       +
               DeviceAllow = [ "/dev/uinput" ];

     

       39
       39
       +
               DevicePolicy = "closed";

     

       40
       40
       +
       

     

       41
       41
       +
               ## allow creation of unix sockets

     

       42
       42
       +
               RestrictAddressFamilies = [ "AF_UNIX" ];

     

       43
       43
       +
       

     

       44
       44
       +
               CapabilityBoundingSet = "";

     

       45
       45
       +
               IPAddressDeny = "any";

     

       46
       46
       +
               LockPersonality = true;

     

       47
       47
       +
               MemoryDenyWriteExecute = true;

     

       48
       48
       +
               NoNewPrivileges = true;

     

       49
       49
       +
               PrivateNetwork = true;

     

       50
       50
       +
               PrivateTmp = true;

     

       51
       51
       +
               PrivateUsers = true;

     

       52
       52
       +
               ProcSubset = "pid";

     

       53
       53
       +
               ProtectClock = true;

     

       54
       54
       +
               ProtectControlGroups = true;

     

       55
       55
       +
               ProtectHome = true;

     

       56
       56
       +
               ProtectHostname = true;

     

       57
       57
       +
               ProtectKernelLogs = true;

     

       58
       58
       +
               ProtectKernelModules = true;

     

       59
       59
       +
               ProtectKernelTunables = true;

     

       60
       60
       +
               ProtectProc = "invisible";

     

       61
       61
       +
               ProtectSystem = "strict";

     

       62
       62
       +
               ProtectUser = true;

     

       63
       63
       +
               RestrictNamespaces = true;

     

       64
       64
       +
               RestrictRealtime = true;

     

       65
       65
       +
               RestrictSUIDSGID = true;

     

       66
       66
       +
               SystemCallArchitectures = "native";

     

       67
       67
       +
               SystemCallFilter = [

     

       68
       68
       +
                 "@system-service"

     

       69
       69
       +
                 "~@privileged"

     

       70
       70
       +
                 "~@resources"

     

       71
       71
       +
               ];

     

       72
       72
       +
               UMask = "0077";

     

       73
       73
       +
       

     

       74
       74
       +
               # -> systemd-analyze security score 0.7 SAFE 😀

     

       75
       75
       +
             };

     

       76
       76
       +
           };

     

       77
       77
       +
       

     

       78
       78
       +
           environment.variables = {

     

       79
       79
       +
             YDOTOOL_SOCKET = "/run/ydotoold/socket";

     

       80
       80
       +
           };

     

       81
       81
       +
           environment.systemPackages = with pkgs; [ ydotool ];

     

       82
       82
       +
         };

     

       83
       83
       +
       }

nixos/tests/all-tests.nix

···

       1040
       1040
        
         xterm = handleTest ./xterm.nix {};

     

       1041
       1041
        
         xxh = handleTest ./xxh.nix {};

     

       1042
       1042
        
         yabar = handleTest ./yabar.nix {};

     

       1043
       1043
       +
         ydotool = handleTest ./ydotool.nix {};

     

       1043
       1044
        
         yggdrasil = handleTest ./yggdrasil.nix {};

     

       1044
       1045
        
         zammad = handleTest ./zammad.nix {};

     

       1045
       1046
        
         zeronet-conservancy = handleTest ./zeronet-conservancy.nix {};

+115

nixos/tests/ydotool.nix

···

       1
       1
       +
       import ./make-test-python.nix (

     

       2
       2
       +
         { pkgs, lib, ... }:

     

       3
       3
       +
         let

     

       4
       4
       +
           textInput = "This works.";

     

       5
       5
       +
           inputBoxText = "Enter input";

     

       6
       6
       +
           inputBox = pkgs.writeShellScript "zenity-input" ''

     

       7
       7
       +
             ${lib.getExe pkgs.gnome.zenity} --entry --text '${inputBoxText}:' > /tmp/output &

     

       8
       8
       +
           '';

     

       9
       9
       +
         in

     

       10
       10
       +
         {

     

       11
       11
       +
           name = "ydotool";

     

       12
       12
       +
       

     

       13
       13
       +
           meta = {

     

       14
       14
       +
             maintainers = with lib.maintainers; [

     

       15
       15
       +
               OPNA2608

     

       16
       16
       +
               quantenzitrone

     

       17
       17
       +
             ];

     

       18
       18
       +
           };

     

       19
       19
       +
       

     

       20
       20
       +
           nodes = {

     

       21
       21
       +
             headless =

     

       22
       22
       +
               { config, ... }:

     

       23
       23
       +
               {

     

       24
       24
       +
                 imports = [ ./common/user-account.nix ];

     

       25
       25
       +
       

     

       26
       26
       +
                 users.users.alice.extraGroups = [ "ydotool" ];

     

       27
       27
       +
       

     

       28
       28
       +
                 programs.ydotool.enable = true;

     

       29
       29
       +
       

     

       30
       30
       +
                 services.getty.autologinUser = "alice";

     

       31
       31
       +
               };

     

       32
       32
       +
       

     

       33
       33
       +
             x11 =

     

       34
       34
       +
               { config, ... }:

     

       35
       35
       +
               {

     

       36
       36
       +
                 imports = [

     

       37
       37
       +
                   ./common/user-account.nix

     

       38
       38
       +
                   ./common/auto.nix

     

       39
       39
       +
                   ./common/x11.nix

     

       40
       40
       +
                 ];

     

       41
       41
       +
       

     

       42
       42
       +
                 users.users.alice.extraGroups = [ "ydotool" ];

     

       43
       43
       +
       

     

       44
       44
       +
                 programs.ydotool.enable = true;

     

       45
       45
       +
       

     

       46
       46
       +
                 test-support.displayManager.auto = {

     

       47
       47
       +
                   enable = true;

     

       48
       48
       +
                   user = "alice";

     

       49
       49
       +
                 };

     

       50
       50
       +
       

     

       51
       51
       +
                 services.xserver.windowManager.dwm.enable = true;

     

       52
       52
       +
                 services.displayManager.defaultSession = lib.mkForce "none+dwm";

     

       53
       53
       +
               };

     

       54
       54
       +
       

     

       55
       55
       +
             wayland =

     

       56
       56
       +
               { config, ... }:

     

       57
       57
       +
               {

     

       58
       58
       +
                 imports = [ ./common/user-account.nix ];

     

       59
       59
       +
       

     

       60
       60
       +
                 services.cage = {

     

       61
       61
       +
                   enable = true;

     

       62
       62
       +
                   user = "alice";

     

       63
       63
       +
                 };

     

       64
       64
       +
       

     

       65
       65
       +
                 programs.ydotool.enable = true;

     

       66
       66
       +
       

     

       67
       67
       +
                 services.cage.program = inputBox;

     

       68
       68
       +
               };

     

       69
       69
       +
           };

     

       70
       70
       +
       

     

       71
       71
       +
           enableOCR = true;

     

       72
       72
       +
       

     

       73
       73
       +
           testScript =

     

       74
       74
       +
             { nodes, ... }:

     

       75
       75
       +
             ''

     

       76
       76
       +
               def as_user(cmd: str):

     

       77
       77
       +
                 """

     

       78
       78
       +
                 Return a shell command for running a shell command as a specific user.

     

       79
       79
       +
                 """

     

       80
       80
       +
                 return f"sudo -u alice -i {cmd}"

     

       81
       81
       +
       

     

       82
       82
       +
               start_all()

     

       83
       83
       +
       

     

       84
       84
       +
               # Headless

     

       85
       85
       +
               headless.wait_for_unit("multi-user.target")

     

       86
       86
       +
               headless.wait_for_text("alice")

     

       87
       87
       +
               headless.succeed(as_user("ydotool type 'echo ${textInput} > /tmp/output'")) # text input

     

       88
       88
       +
               headless.succeed(as_user("ydotool key 28:1 28:0")) # text input

     

       89
       89
       +
               headless.screenshot("headless_input")

     

       90
       90
       +
               headless.wait_for_file("/tmp/output")

     

       91
       91
       +
               headless.wait_until_succeeds("grep '${textInput}' /tmp/output") # text input

     

       92
       92
       +
       

     

       93
       93
       +
               # X11

     

       94
       94
       +
               x11.wait_for_x()

     

       95
       95
       +
               x11.execute(as_user("${inputBox}"))

     

       96
       96
       +
               x11.wait_for_text("${inputBoxText}")

     

       97
       97
       +
               x11.succeed(as_user("ydotool type '${textInput}'")) # text input

     

       98
       98
       +
               x11.screenshot("x11_input")

     

       99
       99
       +
               x11.succeed(as_user("ydotool mousemove -a 400 110")) # mouse input

     

       100
       100
       +
               x11.succeed(as_user("ydotool click 0xC0")) # mouse input

     

       101
       101
       +
               x11.wait_for_file("/tmp/output")

     

       102
       102
       +
               x11.wait_until_succeeds("grep '${textInput}' /tmp/output") # text input

     

       103
       103
       +
       

     

       104
       104
       +
               # Wayland

     

       105
       105
       +
               wayland.wait_for_unit("graphical.target")

     

       106
       106
       +
               wayland.wait_for_text("${inputBoxText}")

     

       107
       107
       +
               wayland.succeed("ydotool type '${textInput}'") # text input

     

       108
       108
       +
               wayland.screenshot("wayland_input")

     

       109
       109
       +
               wayland.succeed("ydotool mousemove -a 100 100") # mouse input

     

       110
       110
       +
               wayland.succeed("ydotool click 0xC0") # mouse input

     

       111
       111
       +
               wayland.wait_for_file("/tmp/output")

     

       112
       112
       +
               wayland.wait_until_succeeds("grep '${textInput}' /tmp/output") # text input

     

       113
       113
       +
             '';

     

       114
       114
       +
         }

     

       115
       115
       +
       )

+49

pkgs/by-name/yd/ydotool/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         cmake,

     

       6
       6
       +
         scdoc,

     

       7
       7
       +
         util-linux,

     

       8
       8
       +
         xorg,

     

       9
       9
       +
         nixosTests,

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       stdenv.mkDerivation (finalAttrs: {

     

       13
       13
       +
         pname = "ydotool";

     

       14
       14
       +
         version = "1.0.4";

     

       15
       15
       +
       

     

       16
       16
       +
         src = fetchFromGitHub {

     

       17
       17
       +
           owner = "ReimuNotMoe";

     

       18
       18
       +
           repo = "ydotool";

     

       19
       19
       +
           rev = "v${finalAttrs.version}";

     

       20
       20
       +
           hash = "sha256-MtanR+cxz6FsbNBngqLE+ITKPZFHmWGsD1mBDk0OVng=";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       23
       23
       +
         postPatch = ''

     

       24
       24
       +
           substituteInPlace Daemon/ydotoold.c \

     

       25
       25
       +
             --replace "/usr/bin/xinput" "${xorg.xinput}/bin/xinput"

     

       26
       26
       +
           substituteInPlace Daemon/ydotool.service.in \

     

       27
       27
       +
             --replace "/usr/bin/kill" "${util-linux}/bin/kill"

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         strictDeps = true;

     

       31
       31
       +
         nativeBuildInputs = [

     

       32
       32
       +
           cmake

     

       33
       33
       +
           scdoc

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         passthru.tests.basic = nixosTests.ydotool;

     

       37
       37
       +
       

     

       38
       38
       +
         meta = {

     

       39
       39
       +
           description = "Generic Linux command-line automation tool";

     

       40
       40
       +
           homepage = "https://github.com/ReimuNotMoe/ydotool";

     

       41
       41
       +
           license = lib.licenses.agpl3Plus;

     

       42
       42
       +
           mainProgram = "ydotool";

     

       43
       43
       +
           maintainers = with lib.maintainers; [

     

       44
       44
       +
             willibutz

     

       45
       45
       +
             kraem

     

       46
       46
       +
           ];

     

       47
       47
       +
           platforms = lib.platforms.linux;

     

       48
       48
       +
         };

     

       49
       49
       +
       })

-31

pkgs/tools/wayland/ydotool/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, scdoc, util-linux, xorg }:

     

       2
       2
       -
       

     

       3
       3
       -
       stdenv.mkDerivation rec {

     

       4
       4
       -
         pname = "ydotool";

     

       5
       5
       -
         version = "1.0.4";

     

       6
       6
       -
       

     

       7
       7
       -
         src = fetchFromGitHub {

     

       8
       8
       -
           owner = "ReimuNotMoe";

     

       9
       9
       -
           repo = "ydotool";

     

       10
       10
       -
           rev = "v${version}";

     

       11
       11
       -
           hash = "sha256-MtanR+cxz6FsbNBngqLE+ITKPZFHmWGsD1mBDk0OVng=";

     

       12
       12
       -
         };

     

       13
       13
       -
       

     

       14
       14
       -
         postPatch = ''

     

       15
       15
       -
           substituteInPlace Daemon/ydotoold.c \

     

       16
       16
       -
             --replace "/usr/bin/xinput" "${xorg.xinput}/bin/xinput"

     

       17
       17
       -
           substituteInPlace Daemon/ydotool.service.in \

     

       18
       18
       -
             --replace "/usr/bin/kill" "${util-linux}/bin/kill"

     

       19
       19
       -
         '';

     

       20
       20
       -
       

     

       21
       21
       -
         strictDeps = true;

     

       22
       22
       -
         nativeBuildInputs = [ cmake scdoc ];

     

       23
       23
       -
       

     

       24
       24
       -
         meta = with lib; {

     

       25
       25
       -
           homepage = "https://github.com/ReimuNotMoe/ydotool";

     

       26
       26
       -
           description = "Generic Linux command-line automation tool";

     

       27
       27
       -
           license = licenses.agpl3Plus;

     

       28
       28
       -
           maintainers = with maintainers; [ willibutz kraem ];

     

       29
       29
       -
           platforms = with platforms; linux;

     

       30
       30
       -
         };

     

       31
       31
       -
       }

-2

pkgs/top-level/all-packages.nix

···

       4765
       4765
        
       

     

       4766
       4766
        
         wtype = callPackage ../tools/wayland/wtype { };

     

       4767
       4767
        
       

     

       4768
       4768
       -
         ydotool = callPackage ../tools/wayland/ydotool { };

     

       4769
       4769
       -
       

     

       4770
       4768
        
         cambalache = callPackage ../development/tools/cambalache { };

     

       4771
       4769
        
       

     

       4772
       4770
        
         cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { };