varcila/bscpkgs
1
0
Fork 0
forked from rarias/bscpkgs
Code Pull Requests Activity

pkgs: update nixpkgs to 1614b96a

Browse Source
This commit is contained in:
Rodrigo Arias
2022-09-01 16:27:29 +02:00
parent e57107024e
commit b60698b791
87 changed files with 229 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bsc/slurm/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl
{ stdenv, lib, fetchFromGitHub, pkgconfig, libtool, curl
, python, munge, perl, pam, openssl
, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
, readline, freeipmi, libssh2, xorg
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
prePatch = stdenv.lib.optional enableX11 ''
prePatch = lib.optional enableX11 ''
substituteInPlace src/common/x11_util.c \
--replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"'
'';
@@ -39,9 +39,9 @@ stdenv.mkDerivation rec {
libmysqlclient ncurses gtk2
lua hwloc numactl readline freeipmi
pmix
] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
] ++ lib.optionals enableX11 [ libssh2 xorg.xauth ];
configureFlags = with stdenv.lib;
configureFlags = with lib;
[ "--with-munge=${munge}"
"--with-ssl=${openssl.dev}"
"--with-hwloc=${hwloc.dev}"
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
meta = with lib; {
homepage = http://www.schedmd.com/;
description = "Simple Linux Utility for Resource Management";
platforms = platforms.linux;

10
bsc/slurm/pmi2.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, libtool, curl
{ stdenv, lib, fetchFromGitHub, pkgconfig, libtool, curl
, python, munge, perl, pam, openssl
, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl
, readline, freeipmi, libssh2, xorg
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" ];
prePatch = stdenv.lib.optional enableX11 ''
prePatch = lib.optional enableX11 ''
substituteInPlace src/common/x11_util.c \
--replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"'
'';
@@ -39,9 +39,9 @@ stdenv.mkDerivation rec {
libmysqlclient ncurses gtk2
lua hwloc numactl readline freeipmi
pmix
] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
] ++ lib.optionals enableX11 [ libssh2 xorg.xauth ];
configureFlags = with stdenv.lib;
configureFlags = with lib;
[ "--with-munge=${munge}"
"--with-ssl=${openssl.dev}"
"--with-hwloc=${hwloc.dev}"
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
meta = with lib; {
homepage = http://www.schedmd.com/;
description = "Simple Linux Utility for Resource Management";
platforms = platforms.linux;