commit b917a8760ef63d28cb23b76ecfe000e9b0bd1f3c · pyrox.dev/nixpkgs

+3 -3

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

···

       36
       36
        
       

     

       37
       37
        
             package = mkOption {

     

       38
       38
        
               type = types.package;

     

       39
       39
       -
               default = pkgs.slurm-llnl;

     

       40
       40
       -
               defaultText = "pkgs.slurm-llnl";

     

       41
       41
       -
               example = literalExample "pkgs.slurm-llnl-full";

     

       39
       39
       +
               default = pkgs.slurm;

     

       40
       40
       +
               defaultText = "pkgs.slurm";

     

       41
       41
       +
               example = literalExample "pkgs.slurm-full";

     

       42
       42
        
               description = ''

     

       43
       43
        
                 The package to use for slurm binaries.

     

       44
       44
        
               '';

+13 -8

pkgs/servers/computing/slurm/default.nix

···

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

     

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

     

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

     

       3
       3
        
       }:

     

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
       -
         name = "slurm-llnl-${version}";

     

       7
       7
       -
         version = "15-08-5-1";

     

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

     

       7
       7
       +
         version = "17.02.6";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
       -
           url = "https://github.com/SchedMD/slurm/archive/slurm-${version}.tar.gz";

     

       11
       11
       -
           sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1";

     

       10
       10
       +
           url = "https://www.schedmd.com/downloads/latest/slurm-17.02.6.tar.bz2";

     

       11
       11
       +
           sha256 = "1sp4xg15jc569r6dh61svgk2fmy3ndcgr5358yryajslf1w14mzh";

     

       12
       12
        
         };

     

       13
       13
        
       

     

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

     

       15
       15
        
       

     

       16
       16
       -
         nativeBuildInputs = [ pkgconfig ];

     

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

     

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

     

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

     

       19
       19
       +
         hardeningDisable = [ "bindnow" ];

     

       20
       20
       +
       

     

       21
       21
       +
         nativeBuildInputs = [ pkgconfig libtool ];

     

       17
       22
        
         buildInputs = [

     

       18
       23
        
           curl python munge perl pam openssl mysql.lib ncurses gtk2 lua hwloc numactl

     

       19
       24
        
         ];

     
···

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

     

       26
       31
        
       

     

       27
       32
        
         preConfigure = ''

     

       28
       28
       -
           substituteInPlace ./doc/html/shtml2html.py --replace "/usr/bin/env python" "${python.interpreter}"

     

       29
       29
       -
           substituteInPlace ./doc/man/man2html.py --replace "/usr/bin/env python" "${python.interpreter}"

     

       33
       33
       +
           patchShebangs ./doc/html/shtml2html.py

     

       34
       34
       +
           patchShebangs ./doc/man/man2html.py

     

       30
       35
        
         '';

     

       31
       36
        
       

     

       32
       37
        
         postInstall = ''

+2 -2

pkgs/top-level/all-packages.nix

···

       11485
       11485
        
       

     

       11486
       11486
        
         storm = callPackage ../servers/computing/storm { };

     

       11487
       11487
        
       

     

       11488
       11488
       -
         slurm-llnl = callPackage ../servers/computing/slurm { gtk2 = null; };

     

       11488
       11488
       +
         slurm = callPackage ../servers/computing/slurm { gtk2 = null; };

     

       11489
       11489
        
       

     

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

     

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

     

       11491
       11491
        
       

     

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

     

       11493
       11493