summary refs log tree commit diff
path: root/nixos/modules/services/computing
diff options
context:
space:
mode:
authorMarkus Kowalewski <markus.kowalewski@gmail.com>2018-05-26 11:51:45 +0200
committerMarkus Kowalewski <markus.kowalewski@gmail.com>2018-06-02 00:18:29 +0200
commit8026127e47398df660cc818d6266a552ecca8c1c (patch)
tree250d8389c721eb7d21e6993b30404f75b51146bf /nixos/modules/services/computing
parentb7e91f096a46c5e3d3b699ff54bbb1b0bcd5e847 (diff)
downloadnixlib-8026127e47398df660cc818d6266a552ecca8c1c.tar
nixlib-8026127e47398df660cc818d6266a552ecca8c1c.tar.gz
nixlib-8026127e47398df660cc818d6266a552ecca8c1c.tar.bz2
nixlib-8026127e47398df660cc818d6266a552ecca8c1c.tar.lz
nixlib-8026127e47398df660cc818d6266a552ecca8c1c.tar.xz
nixlib-8026127e47398df660cc818d6266a552ecca8c1c.tar.zst
nixlib-8026127e47398df660cc818d6266a552ecca8c1c.zip
slurm: add freeipmi, readline, libssh2, fix hwloc
* add freeipmi to get power meter readings
* readline support for scontrol
* libssh2 support for X11 supporta
* Add note to enableSrunX11 in module
* fix hwloc support (was detected by configure)
Diffstat (limited to 'nixos/modules/services/computing')
-rw-r--r--nixos/modules/services/computing/slurm/slurm.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 02c0aabe0a74..cf7fc8c75c1f 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -134,6 +134,8 @@ in
           from within an interactive session or a batch job. This activates the
           slurm-spank-x11 module. Note that this option also enables
           'services.openssh.forwardX11' on the client.
+
+          This option requires slurm to be compiled without native X11 support.
         '';
       };