commit 8026127e47398df660cc818d6266a552ecca8c1c · pyrox.dev/nixpkgs

nixos/modules/services/computing/slurm/slurm.nix

···

       134
        
                 from within an interactive session or a batch job. This activates the

     

       135
        
                 slurm-spank-x11 module. Note that this option also enables

     

       136
        
                 'services.openssh.forwardX11' on the client.

     

       0
        
       
     

       0
        
       
     

       137
        
               '';

     

       138
        
             };

     

       139

···

       134
        
                 from within an interactive session or a batch job. This activates the

     

       135
        
                 slurm-spank-x11 module. Note that this option also enables

     

       136
        
                 'services.openssh.forwardX11' on the client.

     

       137
       +
       

     

       138
       +
                 This option requires slurm to be compiled without native X11 support.

     

       139
        
               '';

     

       140
        
             };

     

       141

+20 -5

pkgs/servers/computing/slurm/default.nix

···

       1
       -
       { stdenv, fetchurl, pkgconfig, libtool, curl, python, munge, perl, pam, openssl

     

       0
        
       
     

       2
        
       , ncurses, mysql, gtk2, lua, hwloc, numactl

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       }:

     

       4
        
       

     

       5
        
       stdenv.mkDerivation rec {

     
···

       13
        
       

     

       14
        
         outputs = [ "out" "dev" ];

     

       15
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16
        
         # nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode'

     

       17
        
         # https://groups.google.com/forum/#!topic/slurm-devel/QHOajQ84_Es

     

       18
        
         # this doesn't fix tests completely at least makes slurmd to launch

     
···

       20
        
       

     

       21
        
         nativeBuildInputs = [ pkgconfig libtool ];

     

       22
        
         buildInputs = [

     

       23
       -
           curl python munge perl pam openssl mysql.connector-c ncurses gtk2 lua hwloc numactl

     

       24
       -
         ];

     

       0
        
       
     

       0
        
       
     

       25
        
       

     

       26
       -
         configureFlags =

     

       27
        
           [ "--with-munge=${munge}"

     

       28
        
             "--with-ssl=${openssl.dev}"

     

       0
        
       
     

       0
        
       
     

       29
        
             "--sysconfdir=/etc/slurm"

     

       30
       -
           ] ++ stdenv.lib.optional (gtk2 == null)  "--disable-gtktest";

     

       0
        
       
     

       0
        
       
     

       31
        
       

     

       32
        
         preConfigure = ''

     

       33
        
           patchShebangs ./doc/html/shtml2html.py

···

       1
       +
       { stdenv, fetchurl, pkgconfig, libtool, curl

     

       2
       +
       , python, munge, perl, pam, openssl

     

       3
        
       , ncurses, mysql, gtk2, lua, hwloc, numactl

     

       4
       +
       , readline, freeipmi, libssh2, xorg

     

       5
       +
       # enable internal X11 support via libssh2

     

       6
       +
       , enableX11 ? true

     

       7
        
       }:

     

       8
        
       

     

       9
        
       stdenv.mkDerivation rec {

     
···

       17
        
       

     

       18
        
         outputs = [ "out" "dev" ];

     

       19
        
       

     

       20
       +
         prePatch = stdenv.lib.optional enableX11 ''

     

       21
       +
           substituteInPlace src/common/x11_util.c \

     

       22
       +
               --replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"'

     

       23
       +
         '';

     

       24
       +
       

     

       25
        
         # nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode'

     

       26
        
         # https://groups.google.com/forum/#!topic/slurm-devel/QHOajQ84_Es

     

       27
        
         # this doesn't fix tests completely at least makes slurmd to launch

     
···

       29
        
       

     

       30
        
         nativeBuildInputs = [ pkgconfig libtool ];

     

       31
        
         buildInputs = [

     

       32
       +
           curl python munge perl pam openssl

     

       33
       +
             mysql.connector-c ncurses gtk2

     

       34
       +
             lua hwloc numactl readline freeipmi

     

       35
       +
         ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];

     

       36
        
       

     

       37
       +
         configureFlags = with stdenv.lib;

     

       38
        
           [ "--with-munge=${munge}"

     

       39
        
             "--with-ssl=${openssl.dev}"

     

       40
       +
             "--with-hwloc=${hwloc.dev}"

     

       41
       +
             "--with-freeipmi=${freeipmi}"

     

       42
        
             "--sysconfdir=/etc/slurm"

     

       43
       +
           ] ++ (optional (gtk2 == null)  "--disable-gtktest")

     

       44
       +
             ++ (optional enableX11 "--with-libssh2=${libssh2.dev}");

     

       45
       +
       

     

       46
        
       

     

       47
        
         preConfigure = ''

     

       48
        
           patchShebangs ./doc/html/shtml2html.py