pkgs.slurm-llnl-full: Add full variant of slurm-llnl

Add a variant of slurm-llnl that includes sview (based on gtk).
pkgs.slurm-llnl also gains the ncurses-based smap tool.

+10 -9
+7 -8
pkgs/servers/computing/slurm/default.nix
··· 1 - { stdenv, fetchurl, python, munge, perl, pam, openssl, mysql }: 2 - 3 - #TODO: add sview support based on gtk2 4 5 stdenv.mkDerivation rec { 6 name = "slurm-llnl-${version}"; ··· 11 sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1"; 12 }; 13 14 - buildInputs = [ python munge perl pam openssl mysql.lib ]; 15 16 - configureFlags = '' 17 - --with-munge=${munge} 18 - --with-ssl=${openssl} 19 - ''; 20 21 preConfigure = '' 22 substituteInPlace ./doc/html/shtml2html.py --replace "/usr/bin/env python" "${python.interpreter}"
··· 1 + { stdenv, fetchurl, pkgconfig, curl, python, munge, perl, pam, openssl, 2 + ncurses, mysql, gtk }: 3 4 stdenv.mkDerivation rec { 5 name = "slurm-llnl-${version}"; ··· 10 sha256 = "05si1cn7zivggan25brsqfdw0ilvrlnhj96pwv16dh6vfkggzjr1"; 11 }; 12 13 + buildInputs = [ pkgconfig curl python munge perl pam openssl mysql.lib ncurses gtk ]; 14 15 + configureFlags = 16 + [ "--with-munge=${munge}" 17 + "--with-ssl=${openssl}" 18 + ] ++ stdenv.lib.optional (gtk == null) "--disable-gtktest"; 19 20 preConfigure = '' 21 substituteInPlace ./doc/html/shtml2html.py --replace "/usr/bin/env python" "${python.interpreter}"
+3 -1
pkgs/top-level/all-packages.nix
··· 9556 9557 storm = callPackage ../servers/computing/storm { }; 9558 9559 - slurm-llnl = callPackage ../servers/computing/slurm { }; 9560 9561 tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { }; 9562
··· 9556 9557 storm = callPackage ../servers/computing/storm { }; 9558 9559 + slurm-llnl = callPackage ../servers/computing/slurm { gtk = null; }; 9560 + 9561 + slurm-llnl-full = appendToName "full" (callPackage ../servers/computing/slurm { }); 9562 9563 tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { }; 9564