forked from rarias/jungle
Compare commits
9 Commits
enableStri
...
4545fbf08f
| Author | SHA1 | Date | |
|---|---|---|---|
|
4545fbf08f
|
|||
|
4e64f54c0f
|
|||
|
71628cc9ea
|
|||
|
0bd4c83330
|
|||
|
97cbf5e30e
|
|||
|
14ac26e2c8
|
|||
|
bc74b7d42b
|
|||
|
547d4f9315
|
|||
|
3f46d04b20
|
@@ -1,10 +1,10 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, config, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
vim wget git htop tmux pciutils tcpdump ripgrep nix-index nixos-option
|
vim wget git htop tmux pciutils tcpdump ripgrep nix-index nixos-option
|
||||||
nix-diff ipmitool freeipmi ethtool lm_sensors cmake gnumake file tree
|
nix-diff ipmitool freeipmi ethtool lm_sensors cmake gnumake file tree
|
||||||
ncdu perf ldns pv
|
ncdu config.boot.kernelPackages.perf ldns pv
|
||||||
# From jungle overlay
|
# From jungle overlay
|
||||||
osumb nixgen
|
osumb nixgen
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -30,8 +30,7 @@ let
|
|||||||
amd-uprof-driver = _prev.callPackage ./pkgs/amd-uprof/driver.nix { };
|
amd-uprof-driver = _prev.callPackage ./pkgs/amd-uprof/driver.nix { };
|
||||||
});
|
});
|
||||||
lmbench = callPackage ./pkgs/lmbench/default.nix { };
|
lmbench = callPackage ./pkgs/lmbench/default.nix { };
|
||||||
# Broken and unmantained
|
mcxx = callPackage ./pkgs/mcxx/default.nix { };
|
||||||
# mcxx = callPackage ./pkgs/mcxx/default.nix { };
|
|
||||||
meteocat-exporter = prev.callPackage ./pkgs/meteocat-exporter/default.nix { };
|
meteocat-exporter = prev.callPackage ./pkgs/meteocat-exporter/default.nix { };
|
||||||
mpi = final.mpich; # Set MPICH as default
|
mpi = final.mpich; # Set MPICH as default
|
||||||
mpich = callPackage ./pkgs/mpich/default.nix { mpich = prev.mpich; };
|
mpich = callPackage ./pkgs/mpich/default.nix { mpich = prev.mpich; };
|
||||||
@@ -49,7 +48,6 @@ let
|
|||||||
osumb = callPackage ./pkgs/osu/default.nix { };
|
osumb = callPackage ./pkgs/osu/default.nix { };
|
||||||
ovni = callPackage ./pkgs/ovni/default.nix { };
|
ovni = callPackage ./pkgs/ovni/default.nix { };
|
||||||
ovniGit = final.ovni.override { useGit = true; };
|
ovniGit = final.ovni.override { useGit = true; };
|
||||||
papi = callPackage ./pkgs/papi/default.nix { papi = prev.papi; };
|
|
||||||
paraverKernel = callPackage ./pkgs/paraver/kernel.nix { };
|
paraverKernel = callPackage ./pkgs/paraver/kernel.nix { };
|
||||||
prometheus-slurm-exporter = prev.callPackage ./pkgs/slurm-exporter/default.nix { };
|
prometheus-slurm-exporter = prev.callPackage ./pkgs/slurm-exporter/default.nix { };
|
||||||
#pscom = callPackage ./pkgs/parastation/pscom.nix { }; # Unmaintaned
|
#pscom = callPackage ./pkgs/parastation/pscom.nix { }; # Unmaintaned
|
||||||
|
|||||||
@@ -47,7 +47,6 @@ in
|
|||||||
inherit version;
|
inherit version;
|
||||||
src = uprofSrc;
|
src = uprofSrc;
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
strictDeps = true;
|
|
||||||
phases = [ "installPhase" "fixupPhase" ];
|
phases = [ "installPhase" "fixupPhase" ];
|
||||||
nativeBuildInputs = [ autoPatchelfHook radare2 ];
|
nativeBuildInputs = [ autoPatchelfHook radare2 ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|||||||
@@ -18,9 +18,8 @@ in stdenv.mkDerivation {
|
|||||||
set +x
|
set +x
|
||||||
'';
|
'';
|
||||||
hardeningDisable = [ "pic" "format" ];
|
hardeningDisable = [ "pic" "format" ];
|
||||||
strictDeps = true;
|
|
||||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||||
patches = [ ./makefile.patch ./hrtimer.patch ./remove-wr-rdmsrq.patch ];
|
patches = [ ./makefile.patch ./hrtimer.patch ];
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
"KERNEL_VERSION=${kernel.modDirVersion}"
|
"KERNEL_VERSION=${kernel.modDirVersion}"
|
||||||
"KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
"KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
diff --git a/inc/PwrProfAsm.h b/inc/PwrProfAsm.h
|
|
||||||
index d77770a..c93a0e9 100644
|
|
||||||
--- a/inc/PwrProfAsm.h
|
|
||||||
+++ b/inc/PwrProfAsm.h
|
|
||||||
@@ -347,6 +347,7 @@
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+/*
|
|
||||||
#define rdmsrq(msr,val1,val2,val3,val4) ({ \
|
|
||||||
__asm__ __volatile__( \
|
|
||||||
"rdmsr\n" \
|
|
||||||
@@ -362,6 +363,7 @@
|
|
||||||
:"c"(msr), "a"(val1), "d"(val2), "S"(val3), "D"(val4) \
|
|
||||||
); \
|
|
||||||
})
|
|
||||||
+*/
|
|
||||||
|
|
||||||
#define rdmsrpw(msr,val1,val2,val3,val4) ({ \
|
|
||||||
__asm__ __volatile__( \
|
|
||||||
@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
|
|||||||
];
|
];
|
||||||
hardeningDisable = [ "all" ];
|
hardeningDisable = [ "all" ];
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://gitlab.pm.bsc.es/rarias/bench6";
|
homepage = "https://gitlab.pm.bsc.es/rarias/bench6";
|
||||||
|
|||||||
@@ -16,8 +16,6 @@ stdenv.mkDerivation {
|
|||||||
};
|
};
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://github.com/rodarima/bigotes";
|
homepage = "https://github.com/rodarima/bigotes";
|
||||||
description = "Versatile benchmark tool";
|
description = "Versatile benchmark tool";
|
||||||
|
|||||||
@@ -10,13 +10,10 @@
|
|||||||
stdenv.mkDerivation (finalAttrs: {
|
stdenv.mkDerivation (finalAttrs: {
|
||||||
name = "cudainfo";
|
name = "cudainfo";
|
||||||
src = ./.;
|
src = ./.;
|
||||||
strictDeps = true;
|
|
||||||
nativeBuildInputs = [
|
|
||||||
cudatoolkit # Required for nvcc
|
|
||||||
autoAddDriverRunpath
|
|
||||||
];
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
cudatoolkit # Required for nvcc
|
||||||
(lib.getOutput "static" cudaPackages.cuda_cudart) # Required for -lcudart_static
|
(lib.getOutput "static" cudaPackages.cuda_cudart) # Required for -lcudart_static
|
||||||
|
autoAddDriverRunpath
|
||||||
];
|
];
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
@@ -26,7 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||||||
name = "cudainfo-test";
|
name = "cudainfo-test";
|
||||||
requiredSystemFeatures = [ "cuda" ];
|
requiredSystemFeatures = [ "cuda" ];
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
strictDeps = true;
|
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
finalAttrs.finalPackage # The cudainfo package from above
|
finalAttrs.finalPackage # The cudainfo package from above
|
||||||
strace # When it fails, it will show the trace
|
strace # When it fails, it will show the trace
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
#, python3Packages
|
#, python3Packages
|
||||||
, installShellFiles
|
, installShellFiles
|
||||||
, symlinkJoin
|
, symlinkJoin
|
||||||
, enablePapi ? true
|
, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
patches = [ ./rdma-core.patch ./max-mem.patch ];
|
patches = [ ./rdma-core.patch ./max-mem.patch ];
|
||||||
|
|
||||||
|
|||||||
@@ -128,7 +128,6 @@ let
|
|||||||
|
|
||||||
phases = [ "installPhase" "fixupPhase" ];
|
phases = [ "installPhase" "fixupPhase" ];
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
strictDeps = true;
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/{bin,etc,lib,include}
|
mkdir -p $out/{bin,etc,lib,include}
|
||||||
mkdir -p $out/share/man
|
mkdir -p $out/share/man
|
||||||
@@ -180,7 +179,6 @@ let
|
|||||||
];
|
];
|
||||||
phases = [ "installPhase" "fixupPhase" ];
|
phases = [ "installPhase" "fixupPhase" ];
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
autoPatchelfIgnoreMissingDeps = [ "libhwloc.so.5" ];
|
autoPatchelfIgnoreMissingDeps = [ "libhwloc.so.5" ];
|
||||||
|
|
||||||
@@ -224,7 +222,6 @@ let
|
|||||||
];
|
];
|
||||||
phases = [ "installPhase" "fixupPhase" ];
|
phases = [ "installPhase" "fixupPhase" ];
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
autoPatchelfIgnoreMissingDeps = [ "libsycl.so.6" ];
|
autoPatchelfIgnoreMissingDeps = [ "libsycl.so.6" ];
|
||||||
|
|
||||||
@@ -292,7 +289,6 @@ let
|
|||||||
phases = [ "installPhase" "fixupPhase" ];
|
phases = [ "installPhase" "fixupPhase" ];
|
||||||
|
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/{bin,lib,include}
|
mkdir -p $out/{bin,lib,include}
|
||||||
@@ -381,7 +377,6 @@ let
|
|||||||
phases = [ "installPhase" "fixupPhase" ];
|
phases = [ "installPhase" "fixupPhase" ];
|
||||||
|
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/{bin,lib}
|
mkdir -p $out/{bin,lib}
|
||||||
@@ -419,13 +414,14 @@ let
|
|||||||
wrapIntel = { cc, mygcc, extraBuild ? "", extraInstall ? "" }:
|
wrapIntel = { cc, mygcc, extraBuild ? "", extraInstall ? "" }:
|
||||||
let
|
let
|
||||||
targetConfig = stdenv.targetPlatform.config;
|
targetConfig = stdenv.targetPlatform.config;
|
||||||
|
gccVersion = builtins.concatStringsSep "." (lib.take 3 (builtins.splitVersion mygcc.version));
|
||||||
in (wrapCCWith {
|
in (wrapCCWith {
|
||||||
cc = cc;
|
cc = cc;
|
||||||
extraBuildCommands = ''
|
extraBuildCommands = ''
|
||||||
echo "-isystem ${cc}/include" >> $out/nix-support/cc-cflags
|
echo "-isystem ${cc}/include" >> $out/nix-support/cc-cflags
|
||||||
echo "-isystem ${cc}/include/intel64" >> $out/nix-support/cc-cflags
|
echo "-isystem ${cc}/include/intel64" >> $out/nix-support/cc-cflags
|
||||||
|
|
||||||
echo "-L${mygcc.cc}/lib/gcc/${targetConfig}/${mygcc.version}" >> $out/nix-support/cc-ldflags
|
echo "-L${mygcc.cc}/lib/gcc/${targetConfig}/${gccVersion}" >> $out/nix-support/cc-ldflags
|
||||||
echo "-L${mygcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags
|
echo "-L${mygcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags
|
||||||
echo "-L${intel-compiler-shared}/lib" >> $out/nix-support/cc-ldflags
|
echo "-L${intel-compiler-shared}/lib" >> $out/nix-support/cc-ldflags
|
||||||
echo "-L${cc}/lib" >> $out/nix-support/cc-ldflags
|
echo "-L${cc}/lib" >> $out/nix-support/cc-ldflags
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ in stdenv.mkDerivation {
|
|||||||
inherit (source) src version;
|
inherit (source) src version;
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
CC = "clang";
|
CC = "clang";
|
||||||
|
|||||||
@@ -39,9 +39,7 @@ stdenv.mkDerivation rec {
|
|||||||
perl
|
perl
|
||||||
pkg-config
|
pkg-config
|
||||||
python3
|
python3
|
||||||
];
|
] ++ lib.optionals enableNosv [
|
||||||
|
|
||||||
buildInputs = lib.optionals enableNosv [
|
|
||||||
nosv
|
nosv
|
||||||
] ++ lib.optionals enableOvni [
|
] ++ lib.optionals enableOvni [
|
||||||
ovni
|
ovni
|
||||||
@@ -56,7 +54,6 @@ stdenv.mkDerivation rec {
|
|||||||
dontStrip = enableDebug;
|
dontStrip = enableDebug;
|
||||||
|
|
||||||
separateDebugInfo = true;
|
separateDebugInfo = true;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DLIBOMP_OMPD_SUPPORT=OFF"
|
"-DLIBOMP_OMPD_SUPPORT=OFF"
|
||||||
@@ -74,28 +71,6 @@ stdenv.mkDerivation rec {
|
|||||||
rm -f $out/libllvmrt/libomp.*
|
rm -f $out/libllvmrt/libomp.*
|
||||||
'';
|
'';
|
||||||
|
|
||||||
doInstallCheck = true;
|
|
||||||
# There are not cmake flags to force nOS-V, it enables it when found through
|
|
||||||
# pkg-config. If enableNosv is set, but we fail to find it at build time,
|
|
||||||
# the build will succeed but won't use nOS-V (libompv won't be created).
|
|
||||||
# This is a sanity check to ensure that after install we have the proper
|
|
||||||
# files.
|
|
||||||
installCheckPhase =
|
|
||||||
if enableNosv then
|
|
||||||
''
|
|
||||||
test -f $out/lib/libompv.so
|
|
||||||
test -f $out/libllvmrt/libompv.so
|
|
||||||
test ! -f $out/lib/libomp.so
|
|
||||||
test ! -f $out/libllvmrt/libomp.so
|
|
||||||
''
|
|
||||||
else
|
|
||||||
''
|
|
||||||
test -f $out/lib/libomp.so
|
|
||||||
test -f $out/libllvmrt/libomp.so
|
|
||||||
test ! -f $out/lib/libompv.so
|
|
||||||
test ! -f $out/libllvmrt/libompv.so
|
|
||||||
'';
|
|
||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
inherit nosv;
|
inherit nosv;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
|
|||||||
hardeningDisable = [ "all" ];
|
hardeningDisable = [ "all" ];
|
||||||
|
|
||||||
enableParallelBuilding = false;
|
enableParallelBuilding = false;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
preBuild = ''
|
preBuild = ''
|
||||||
makeFlagsArray+=(
|
makeFlagsArray+=(
|
||||||
|
|||||||
@@ -65,7 +65,6 @@ stdenv.mkDerivation rec {
|
|||||||
];
|
];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
broken = true;
|
|
||||||
homepage = "https://github.com/bsc-pm/mcxx";
|
homepage = "https://github.com/bsc-pm/mcxx";
|
||||||
description = "C/C++/Fortran source-to-source compilation infrastructure aimed at fast prototyping";
|
description = "C/C++/Fortran source-to-source compilation infrastructure aimed at fast prototyping";
|
||||||
maintainers = with lib.maintainers.bsc; [ rpenacob ];
|
maintainers = with lib.maintainers.bsc; [ rpenacob ];
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ python3Packages.buildPythonApplication {
|
|||||||
src = ./.;
|
src = ./.;
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
build-system = with python3Packages; [
|
build-system = with python3Packages; [
|
||||||
setuptools
|
setuptools
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ in mpich.overrideAttrs (old: {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
hardeningDisable = [ "all" ];
|
hardeningDisable = [ "all" ];
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
meta = old.meta // {
|
meta = old.meta // {
|
||||||
maintainers = old.meta.maintainers ++ (with lib.maintainers.bsc; [ rarias ]);
|
maintainers = old.meta.maintainers ++ (with lib.maintainers.bsc; [ rarias ]);
|
||||||
|
|||||||
@@ -1,67 +0,0 @@
|
|||||||
diff --git a/m4/papi.m4 b/m4/papi.m4
|
|
||||||
--- a/m4/papi.m4
|
|
||||||
+++ b/m4/papi.m4
|
|
||||||
@@ -24,12 +24,13 @@ AC_DEFUN([AC_CHECK_PAPI],
|
|
||||||
else
|
|
||||||
PKG_CHECK_MODULES(
|
|
||||||
[papi],
|
|
||||||
- [papi],
|
|
||||||
+ [papi >= 5.6.0],
|
|
||||||
[
|
|
||||||
AC_MSG_CHECKING([the PAPI installation prefix])
|
|
||||||
AC_MSG_RESULT([retrieved from pkg-config])
|
|
||||||
papi_CPPFLAGS="${papi_CFLAGS}"
|
|
||||||
ac_use_papi=yes
|
|
||||||
+ ac_papi_version_correct=yes
|
|
||||||
], [
|
|
||||||
AC_MSG_CHECKING([the PAPI installation prefix])
|
|
||||||
AC_MSG_RESULT([not available])
|
|
||||||
@@ -67,27 +68,29 @@ AC_DEFUN([AC_CHECK_PAPI],
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x"${ac_use_papi}" = x"yes" ; then
|
|
||||||
- if test x"${ac_cv_use_papi_prefix}" != x"" ; then
|
|
||||||
- papiBinary=${ac_cv_use_papi_prefix}/bin/papi_version
|
|
||||||
- else
|
|
||||||
- papiBinary=papi_version
|
|
||||||
- fi
|
|
||||||
- papiVersion=`$papiBinary | sed 's/[[^0-9.]]*\([[0-9.]]*\).*/\1/'`
|
|
||||||
+ if test x"${ac_papi_version_correct}" != x"yes" ; then
|
|
||||||
+ if test x"${ac_cv_use_papi_prefix}" != x"" ; then
|
|
||||||
+ papiBinary=${ac_cv_use_papi_prefix}/bin/papi_version
|
|
||||||
+ else
|
|
||||||
+ papiBinary=papi_version
|
|
||||||
+ fi
|
|
||||||
+ papiVersion=`$papiBinary | sed 's/[[^0-9.]]*\([[0-9.]]*\).*/\1/'`
|
|
||||||
|
|
||||||
- AX_COMPARE_VERSION(
|
|
||||||
- [[${papiVersion}]],
|
|
||||||
- [[ge]],
|
|
||||||
- [[5.6.0]],
|
|
||||||
- [[ac_papi_version_correct=yes]],
|
|
||||||
- [[ac_papi_version_correct=no]]
|
|
||||||
- )
|
|
||||||
+ AX_COMPARE_VERSION(
|
|
||||||
+ [[${papiVersion}]],
|
|
||||||
+ [[ge]],
|
|
||||||
+ [[5.6.0]],
|
|
||||||
+ [[ac_papi_version_correct=yes]],
|
|
||||||
+ [[ac_papi_version_correct=no]]
|
|
||||||
+ )
|
|
||||||
|
|
||||||
- if test x"${ac_papi_version_correct}" != x"yes" ; then
|
|
||||||
- AC_MSG_ERROR([PAPI version must be >= 5.6.0.])
|
|
||||||
- ac_use_papi=no
|
|
||||||
- else
|
|
||||||
- AC_MSG_CHECKING([if the PAPI version >= 5.6.0.])
|
|
||||||
- AC_MSG_RESULT([${ac_papi_version_correct}])
|
|
||||||
+ if test x"${ac_papi_version_correct}" != x"yes" ; then
|
|
||||||
+ AC_MSG_ERROR([PAPI version must be >= 5.6.0.])
|
|
||||||
+ ac_use_papi=no
|
|
||||||
+ else
|
|
||||||
+ AC_MSG_CHECKING([if the PAPI version >= 5.6.0.])
|
|
||||||
+ AC_MSG_RESULT([${ac_papi_version_correct}])
|
|
||||||
+ fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
, jemallocNanos6 ? null
|
, jemallocNanos6 ? null
|
||||||
, cachelineBytes ? 64
|
, cachelineBytes ? 64
|
||||||
, enableGlibcxxDebug ? false
|
, enableGlibcxxDebug ? false
|
||||||
, enablePapi ? true
|
, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
|
||||||
, useGit ? false
|
, useGit ? false
|
||||||
, gitUrl ? "ssh://git@bscpm04.bsc.es/nanos6/nanos6"
|
, gitUrl ? "ssh://git@bscpm04.bsc.es/nanos6/nanos6"
|
||||||
, gitBranch ? "master"
|
, gitBranch ? "master"
|
||||||
@@ -95,15 +95,16 @@ in
|
|||||||
dontStrip = enableDebug;
|
dontStrip = enableDebug;
|
||||||
separateDebugInfo = true;
|
separateDebugInfo = true;
|
||||||
|
|
||||||
strictDeps = true;
|
|
||||||
patches = [ ./check-papi-version-with-pkgconfig.patch ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoconf
|
autoconf
|
||||||
automake
|
automake
|
||||||
libtool
|
libtool
|
||||||
pkg-config
|
pkg-config
|
||||||
];
|
|
||||||
|
# TODO: papi_version is needed for configure:
|
||||||
|
# ./configure: line 27378: papi_version: command not found
|
||||||
|
# This probably breaks cross-compilation
|
||||||
|
] ++ lib.optionals enablePapi [ papi ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
boost
|
boost
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ stdenv.mkDerivation {
|
|||||||
version = "0.0.1";
|
version = "0.0.1";
|
||||||
src = ./nixgen;
|
src = ./nixgen;
|
||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
strictDeps = true;
|
|
||||||
phases = [ "installPhase" ];
|
phases = [ "installPhase" ];
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
|
|||||||
makeFlags = [ "DESTDIR=$(out)" ];
|
makeFlags = [ "DESTDIR=$(out)" ];
|
||||||
preBuild = "env";
|
preBuild = "env";
|
||||||
dontPatchShebangs = true;
|
dontPatchShebangs = true;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "https://gitlab.pm.bsc.es/rarias/nixtools";
|
homepage = "https://gitlab.pm.bsc.es/rarias/nixtools";
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ in
|
|||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
separateDebugInfo = true;
|
separateDebugInfo = true;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-nosv=${nosv}"
|
"--with-nosv=${nosv}"
|
||||||
|
|||||||
@@ -1,68 +0,0 @@
|
|||||||
diff --git a/m4/papi.m4 b/m4/papi.m4
|
|
||||||
index de905848..fa3db9a1 100644
|
|
||||||
--- a/m4/papi.m4
|
|
||||||
+++ b/m4/papi.m4
|
|
||||||
@@ -24,12 +24,13 @@ AC_DEFUN([AC_CHECK_PAPI],
|
|
||||||
else
|
|
||||||
PKG_CHECK_MODULES(
|
|
||||||
[papi],
|
|
||||||
- [papi],
|
|
||||||
+ [papi >= 5.6.0],
|
|
||||||
[
|
|
||||||
AC_MSG_CHECKING([the PAPI installation prefix])
|
|
||||||
AC_MSG_RESULT([retrieved from pkg-config])
|
|
||||||
papi_CFLAGS="${papi_CFLAGS}"
|
|
||||||
ac_use_papi=yes
|
|
||||||
+ ac_papi_version_correct=yes
|
|
||||||
], [
|
|
||||||
AC_MSG_CHECKING([the PAPI installation prefix])
|
|
||||||
AC_MSG_RESULT([not available])
|
|
||||||
@@ -67,27 +68,29 @@ AC_DEFUN([AC_CHECK_PAPI],
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x"${ac_use_papi}" = x"yes" ; then
|
|
||||||
- if test x"${ac_cv_use_papi_prefix}" != x"" ; then
|
|
||||||
- papiBinary=${ac_cv_use_papi_prefix}/bin/papi_version
|
|
||||||
- else
|
|
||||||
- papiBinary=papi_version
|
|
||||||
- fi
|
|
||||||
- papiVersion=`$papiBinary | sed 's/[[^0-9.]]*\([[0-9.]]*\).*/\1/'`
|
|
||||||
+ if test x"${ac_papi_version_correct}" != x"yes" ; then
|
|
||||||
+ if test x"${ac_cv_use_papi_prefix}" != x"" ; then
|
|
||||||
+ papiBinary=${ac_cv_use_papi_prefix}/bin/papi_version
|
|
||||||
+ else
|
|
||||||
+ papiBinary=papi_version
|
|
||||||
+ fi
|
|
||||||
+ papiVersion=`$papiBinary | sed 's/[[^0-9.]]*\([[0-9.]]*\).*/\1/'`
|
|
||||||
|
|
||||||
- AX_COMPARE_VERSION(
|
|
||||||
- [[${papiVersion}]],
|
|
||||||
- [[ge]],
|
|
||||||
- [[5.6.0]],
|
|
||||||
- [[ac_papi_version_correct=yes]],
|
|
||||||
- [[ac_papi_version_correct=no]]
|
|
||||||
- )
|
|
||||||
+ AX_COMPARE_VERSION(
|
|
||||||
+ [[${papiVersion}]],
|
|
||||||
+ [[ge]],
|
|
||||||
+ [[5.6.0]],
|
|
||||||
+ [[ac_papi_version_correct=yes]],
|
|
||||||
+ [[ac_papi_version_correct=no]]
|
|
||||||
+ )
|
|
||||||
|
|
||||||
- if test x"${ac_papi_version_correct}" != x"yes" ; then
|
|
||||||
- AC_MSG_ERROR([PAPI version must be >= 5.6.0.])
|
|
||||||
- ac_use_papi=no
|
|
||||||
- else
|
|
||||||
- AC_MSG_CHECKING([if the PAPI version >= 5.6.0.])
|
|
||||||
- AC_MSG_RESULT([${ac_papi_version_correct}])
|
|
||||||
+ if test x"${ac_papi_version_correct}" != x"yes" ; then
|
|
||||||
+ AC_MSG_ERROR([PAPI version must be >= 5.6.0.])
|
|
||||||
+ ac_use_papi=no
|
|
||||||
+ else
|
|
||||||
+ AC_MSG_CHECKING([if the PAPI version >= 5.6.0.])
|
|
||||||
+ AC_MSG_RESULT([${ac_papi_version_correct}])
|
|
||||||
+ fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
, numactl
|
, numactl
|
||||||
, hwloc
|
, hwloc
|
||||||
, papi
|
, papi
|
||||||
, enablePapi ? true
|
, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
|
||||||
, cacheline ? 64 # bits
|
, cacheline ? 64 # bits
|
||||||
, ovni ? null
|
, ovni ? null
|
||||||
, useGit ? false
|
, useGit ? false
|
||||||
@@ -40,14 +40,12 @@ let
|
|||||||
|
|
||||||
source = if (useGit) then git else release;
|
source = if (useGit) then git else release;
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation rec {
|
||||||
pname = "nosv";
|
pname = "nosv";
|
||||||
inherit (source) src version;
|
inherit (source) src version;
|
||||||
hardeningDisable = [ "all" ];
|
hardeningDisable = [ "all" ];
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
separateDebugInfo = true;
|
separateDebugInfo = true;
|
||||||
strictDeps = true;
|
|
||||||
patches = [ ./check-papi-version-with-pkgconfig.patch ];
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-ovni=${ovni}"
|
"--with-ovni=${ovni}"
|
||||||
"CACHELINE_WIDTH=${toString cacheline}"
|
"CACHELINE_WIDTH=${toString cacheline}"
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
strictDeps = true;
|
|
||||||
nativeBuildInputs = [ mpiAll ];
|
nativeBuildInputs = [ mpiAll ];
|
||||||
buildInputs = [ mpiAll ];
|
buildInputs = [ mpiAll ];
|
||||||
hardeningDisable = [ "all" ];
|
hardeningDisable = [ "all" ];
|
||||||
|
|||||||
@@ -40,7 +40,6 @@ in
|
|||||||
inherit (source) src version;
|
inherit (source) src version;
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
separateDebugInfo = true;
|
separateDebugInfo = true;
|
||||||
strictDeps = true;
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs --build test/
|
patchShebangs --build test/
|
||||||
'';
|
'';
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
{
|
|
||||||
stdenv,
|
|
||||||
papi,
|
|
||||||
}:
|
|
||||||
|
|
||||||
if stdenv.hostPlatform == stdenv.buildPlatform then
|
|
||||||
papi
|
|
||||||
else
|
|
||||||
papi.overrideAttrs (old: {
|
|
||||||
configureFlags = (old.configureFlags or [ ]) ++ [
|
|
||||||
"--enable-perf_event_uncore=no"
|
|
||||||
"--with-sysdetect=no"
|
|
||||||
"--with-ffsll"
|
|
||||||
"--with-tls=__thread"
|
|
||||||
"--with-virtualtimer=clock_thread_cputime_id"
|
|
||||||
"--with-walltimer=clock_realtime"
|
|
||||||
"--with-perf-events"
|
|
||||||
"--with-CPU=${stdenv.hostPlatform.uname.processor}"
|
|
||||||
"--with-arch=${stdenv.hostPlatform.uname.processor}"
|
|
||||||
];
|
|
||||||
patches = (old.patches or [ ]) ++ [ ./fix-ar-cross.patch ];
|
|
||||||
})
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
diff --git a/sde_lib/Makefile b/sde_lib/Makefile
|
|
||||||
index 8518f92..90a9953 100644
|
|
||||||
--- a/sde_lib/Makefile
|
|
||||||
+++ b/sde_lib/Makefile
|
|
||||||
@@ -1,4 +1,5 @@
|
|
||||||
CC ?= gcc
|
|
||||||
+AR ?= ar
|
|
||||||
SDE_INC = -I. -I..
|
|
||||||
SDE_LD = -ldl -pthread
|
|
||||||
CFLAGS += -Wextra -Wall -O2
|
|
||||||
@@ -18,7 +19,7 @@ dynamic: $(DOBJS)
|
|
||||||
rm -f *_d.o
|
|
||||||
|
|
||||||
static: $(SOBJS)
|
|
||||||
- ar rs libsde.a $(SOBJS)
|
|
||||||
+ $(AR) rs libsde.a $(SOBJS)
|
|
||||||
rm -f *_s.o
|
|
||||||
|
|
||||||
clean:
|
|
||||||
@@ -47,7 +47,6 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
export CFLAGS="-O3"
|
export CFLAGS="-O3"
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ stdenv.mkDerivation rec {
|
|||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
export CFLAGS="-O3 -DPARALLEL_ENABLED"
|
export CFLAGS="-O3 -DPARALLEL_ENABLED"
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ buildGoModule rec {
|
|||||||
|
|
||||||
vendorHash = "sha256-A1dd9T9SIEHDCiVT2UwV6T02BSLh9ej6LC/2l54hgwI=";
|
vendorHash = "sha256-A1dd9T9SIEHDCiVT2UwV6T02BSLh9ej6LC/2l54hgwI=";
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Prometheus SLURM Exporter";
|
description = "Prometheus SLURM Exporter";
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
|
|||||||
};
|
};
|
||||||
hardeningDisable = [ "all" ];
|
hardeningDisable = [ "all" ];
|
||||||
dontStrip = true;
|
dontStrip = true;
|
||||||
strictDeps = true;
|
|
||||||
configureFlags = [ "--with-ovni=${ovni}" ];
|
configureFlags = [ "--with-ovni=${ovni}" ];
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
|
|||||||
pname = "tagaspi";
|
pname = "tagaspi";
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
separateDebugInfo = true;
|
separateDebugInfo = true;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
version = "2.0";
|
version = "2.0";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
|
|||||||
@@ -45,7 +45,6 @@ in stdenv.mkDerivation {
|
|||||||
inherit (source) src version;
|
inherit (source) src version;
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
separateDebugInfo = true;
|
separateDebugInfo = true;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
autoconf
|
autoconf
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ python3Packages.buildPythonApplication {
|
|||||||
src = ./.;
|
src = ./.;
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
strictDeps = true;
|
|
||||||
|
|
||||||
build-system = with python3Packages; [
|
build-system = with python3Packages; [
|
||||||
setuptools
|
setuptools
|
||||||
|
|||||||
@@ -23,6 +23,9 @@ in stdenv.mkDerivation {
|
|||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
dontConfigure = true;
|
dontConfigure = true;
|
||||||
|
|
||||||
|
# nOS-V requires access to /sys/devices to request NUMA information
|
||||||
|
requiredSystemFeatures = [ "sys-devices" ];
|
||||||
|
|
||||||
buildInputs = [ openmp ];
|
buildInputs = [ openmp ];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
|
|||||||
Reference in New Issue
Block a user