commit 85ca8f121bdeab205658aa8e4f4b1932a8d4dc4f · pyrox.dev/nixpkgs

+25 -6

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

···

       6
       6
        
       

     

       7
       7
        
         cfg = config.services.slurm;

     

       8
       8
        
         # configuration file can be generated by http://slurm.schedmd.com/configurator.html

     

       9
       9
       -
         configFile = pkgs.writeText "slurm.conf" 

     

       9
       9
       +
         configFile = pkgs.writeText "slurm.conf"

     

       10
       10
        
           ''

     

       11
       11
        
             ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''}

     

       12
       12
        
             ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''}

     

       13
       13
        
             ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''}

     

       14
       14
        
             ${optionalString (cfg.partitionName != null) ''partitionName=${cfg.partitionName}''}

     

       15
       15
       +
             PlugStackConfig=${plugStackConfig}

     

       15
       16
        
             ${cfg.extraConfig}

     

       17
       17
       +
           '';

     

       18
       18
       +
       

     

       19
       19
       +
         plugStackConfig = pkgs.writeText "plugstack.conf"

     

       20
       20
       +
           ''

     

       21
       21
       +
             ${optionalString cfg.enableSrunX11 ''optional ${pkgs.slurm-spank-x11}/lib/x11.so''}

     

       16
       22
        
           '';

     

       17
       23
        
       in

     

       18
       24
        
       

     
···

       28
       34
        
               enable = mkEnableOption "slurm control daemon";

     

       29
       35
        
       

     

       30
       36
        
             };

     

       31
       31
       -
             

     

       37
       37
       +
       

     

       32
       38
        
             client = {

     

       33
       39
        
               enable = mkEnableOption "slurm rlient daemon";

     

       34
       40
        
       

     
···

       86
       92
        
               '';

     

       87
       93
        
             };

     

       88
       94
        
       

     

       95
       95
       +
             enableSrunX11 = mkOption {

     

       96
       96
       +
               default = false;

     

       97
       97
       +
               type = types.bool;

     

       98
       98
       +
               description = ''

     

       99
       99
       +
                 If enabled srun will accept the option "--x11" to allow for X11 forwarding

     

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

     

       101
       101
       +
                 slurm-spank-x11 module. Note that this requires 'services.openssh.forwardX11'

     

       102
       102
       +
                 to be enabled on the compute nodes.

     

       103
       103
       +
               '';

     

       104
       104
       +
             };

     

       105
       105
       +
       

     

       89
       106
        
             extraConfig = mkOption {

     

       90
       90
       -
               default = ""; 

     

       107
       107
       +
               default = "";

     

       91
       108
        
               type = types.lines;

     

       92
       109
        
               description = ''

     

       93
       110
        
                 Extra configuration options that will be added verbatim at

     
···

       134
       151
        
           environment.systemPackages = [ wrappedSlurm ];

     

       135
       152
        
       

     

       136
       153
        
           systemd.services.slurmd = mkIf (cfg.client.enable) {

     

       137
       137
       -
             path = with pkgs; [ wrappedSlurm coreutils ];

     

       154
       154
       +
             path = with pkgs; [ wrappedSlurm coreutils ]

     

       155
       155
       +
               ++ lib.optional cfg.enableSrunX11 slurm-spank-x11;

     

       138
       156
        
       

     

       139
       157
        
             wantedBy = [ "multi-user.target" ];

     

       140
       158
        
             after = [ "systemd-tmpfiles-clean.service" ];

     
···

       152
       170
        
           };

     

       153
       171
        
       

     

       154
       172
        
           systemd.services.slurmctld = mkIf (cfg.server.enable) {

     

       155
       155
       -
             path = with pkgs; [ wrappedSlurm munge coreutils ];

     

       156
       156
       -
             

     

       173
       173
       +
             path = with pkgs; [ wrappedSlurm munge coreutils ]

     

       174
       174
       +
               ++ lib.optional cfg.enableSrunX11 slurm-spank-x11;

     

       175
       175
       +
       

     

       157
       176
        
             wantedBy = [ "multi-user.target" ];

     

       158
       177
        
             after = [ "network.target" "munged.service" ];

     

       159
       178
        
             requires = [ "munged.service" ];

+39

pkgs/servers/computing/slurm-spank-x11/default.nix

···

       1
       1
       +
       { stdenv, fetchFromGitHub, slurm } :

     

       2
       2
       +
       let

     

       3
       3
       +
         version = "0.2.5";

     

       4
       4
       +
       in

     

       5
       5
       +
       stdenv.mkDerivation {

     

       6
       6
       +
         name = "slurm-spank-x11-${version}";

     

       7
       7
       +
         version = version;

     

       8
       8
       +
       

     

       9
       9
       +
         src = fetchFromGitHub {

     

       10
       10
       +
           owner = "hautreux";

     

       11
       11
       +
           repo = "slurm-spank-x11";

     

       12
       12
       +
           rev = version;

     

       13
       13
       +
           sha256 = "1dmsr7whxcxwnlvl1x4s3bqr5cr6q5ssb28vqi67w5hj4sshisry";

     

       14
       14
       +
         };

     

       15
       15
       +
       

     

       16
       16
       +
         buildPhase = ''

     

       17
       17
       +
             gcc -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" \

     

       18
       18
       +
                 -g -o slurm-spank-x11 slurm-spank-x11.c

     

       19
       19
       +
             gcc -I${slurm.dev}/include -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" -shared -fPIC \

     

       20
       20
       +
                 -g -o x11.so slurm-spank-x11-plug.c

     

       21
       21
       +
           '';

     

       22
       22
       +
       

     

       23
       23
       +
         installPhase = ''

     

       24
       24
       +
             mkdir -p $out/bin $out/lib

     

       25
       25
       +
             install -m 755 slurm-spank-x11 $out/bin

     

       26
       26
       +
             install -m 755 x11.so $out/lib

     

       27
       27
       +
           '';

     

       28
       28
       +
       

     

       29
       29
       +
         meta = with stdenv.lib; {

     

       30
       30
       +
           homepage = https://github.com/hautreux/slurm-spank-x11;

     

       31
       31
       +
           description = "Plugin for SLURM to allow for interactive X11 sessions";

     

       32
       32
       +
           platforms = platforms.linux;

     

       33
       33
       +
           license = licenses.gpl3;

     

       34
       34
       +
           maintainers = with maintainers; [ markuskowa ];

     

       35
       35
       +
         };

     

       36
       36
       +
       }

     

       37
       37
       +
       

     

       38
       38
       +
       

     

       39
       39
       +

pkgs/top-level/all-packages.nix

···

       12394
       12394
        
         slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { });

     

       12395
       12395
        
         slurm-llnl-full = slurm-full; # renamed July 2017

     

       12396
       12396
        
       

     

       12397
       12397
       +
         slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { };

     

       12398
       12398
       +
       

     

       12397
       12399
        
         systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };

     

       12398
       12400
        
       

     

       12399
       12401
        
         inherit (callPackages ../servers/http/tomcat { })