rarias/bscpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsc/babeltrace/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils, swig4, python3 }:
{ stdenv, lib, fetchurl, pkgconfig, glib, libuuid, popt, elfutils, swig4, python3 }:
stdenv.mkDerivation rec {
name = "babeltrace-1.5.8";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib libuuid popt elfutils swig4 python3 ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Command-line tool and library to read and convert LTTng tracefiles";
homepage = "https://www.efficios.com/babeltrace";
license = licenses.mit;

2
bsc/clsync/default.nix
View File

@ -43,7 +43,7 @@ in stdenv.mkDerivation {
enableParallelBuilding = true;
meta = with stdenv.lib; {
meta = with lib; {
description = "File live sync daemon based on inotify/kqueue/bsm (Linux, FreeBSD), written in GNU C";
homepage = "https://github.com/clsync/clsync";
license = licenses.gpl3Plus;

3
bsc/cn6/default.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, babeltrace2
, pkg-config
, uthash
@ -9,7 +10,7 @@
, tampi ? null
}:
with stdenv.lib;
with lib;
assert (enableTest -> (mpi != null));
assert (enableTest -> (clangOmpss2 != null));

19
bsc/extrae/default.nix
View File

@ -1,4 +1,5 @@
{ stdenv
, lib
, fetchFromGitHub
, boost
, libdwarf
@ -50,9 +51,9 @@ stdenv.mkDerivation rec {
xml2
which
libxml2.dev
python37Packages.sphinx
#python37Packages.sphinx
]
++ stdenv.lib.optional stdenv.cc.isClang llvmPackages.openmp;
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
preConfigure = ''
configureFlagsArray=(
@ -79,13 +80,15 @@ stdenv.mkDerivation rec {
# Install the manuals only by hand, as we don't want to pull the complete
# LaTeX world
postBuild = ''
make -C docs man
'';
postInstall = ''
installManPage docs/builds/man/*/*
'';
# FIXME: sphinx is broken
#postBuild = ''
# make -C docs man
#'';
#
#postInstall = ''
# installManPage docs/builds/man/*/*
#'';
# ++ (
# if (openmp)

2
bsc/fftw/default.nix
View File

@ -48,7 +48,7 @@ stdenv.mkDerivation {
checkInputs = [ perl ];
meta = with stdenv.lib; {
meta = with lib; {
description = "Fastest Fourier Transform in the West library";
homepage = "http://www.fftw.org/";
license = licenses.gpl2Plus;

28
bsc/groff/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl
{ stdenv, lib, fetchurl, perl
, ghostscript #for postscript and html output
, psutils, netpbm #for html output
, buildPackages
@ -22,18 +22,18 @@ stdenv.mkDerivation rec {
./0001-Fix-cross-compilation-by-looking-for-ar.patch
];
postPatch = stdenv.lib.optionalString (psutils != null) ''
postPatch = lib.optionalString (psutils != null) ''
substituteInPlace src/preproc/html/pre-html.cpp \
--replace "psselect" "${psutils}/bin/psselect"
'' + stdenv.lib.optionalString (netpbm != null) ''
'' + lib.optionalString (netpbm != null) ''
substituteInPlace src/preproc/html/pre-html.cpp \
--replace "pnmcut" "${stdenv.lib.getBin netpbm}/bin/pnmcut" \
--replace "pnmcrop" "${stdenv.lib.getBin netpbm}/bin/pnmcrop" \
--replace "pnmtopng" "${stdenv.lib.getBin netpbm}/bin/pnmtopng"
--replace "pnmcut" "${lib.getBin netpbm}/bin/pnmcut" \
--replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \
--replace "pnmtopng" "${lib.getBin netpbm}/bin/pnmtopng"
substituteInPlace tmac/www.tmac.in \
--replace "pnmcrop" "${stdenv.lib.getBin netpbm}/bin/pnmcrop" \
--replace "pngtopnm" "${stdenv.lib.getBin netpbm}/bin/pngtopnm" \
--replace "@PNMTOPS_NOSETPAGE@" "${stdenv.lib.getBin netpbm}/bin/pnmtops -nosetpage"
--replace "pnmcrop" "${lib.getBin netpbm}/bin/pnmcrop" \
--replace "pngtopnm" "${lib.getBin netpbm}/bin/pngtopnm" \
--replace "@PNMTOPS_NOSETPAGE@" "${lib.getBin netpbm}/bin/pnmtops -nosetpage"
'';
buildInputs = [ ghostscript psutils netpbm perl ];
@ -46,13 +46,13 @@ stdenv.mkDerivation rec {
# have to pass "--with-appresdir", too.
configureFlags = [
"--without-x"
] ++ stdenv.lib.optionals (ghostscript != null) [
] ++ lib.optionals (ghostscript != null) [
"--with-gs=${ghostscript}/bin/gs"
] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
"ac_cv_path_PERL=${buildPackages.perl}/bin/perl"
];
makeFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
makeFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
# Trick to get the build system find the proper 'native' groff
# http://www.mail-archive.com/bug-groff@gnu.org/msg01335.html
"GROFF_BIN_PATH=${buildPackages.groff}/bin"
@ -100,11 +100,11 @@ stdenv.mkDerivation rec {
substituteInPlace $out/bin/grog \
--replace $out/lib/groff/grog $out/lib/groff/grog
'' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
'' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
find $out/ -type f -print0 | xargs --null sed -i 's|${buildPackages.perl}|${perl}|'
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://www.gnu.org/software/groff/";
description = "GNU Troff, a typesetting package that reads plain text and produces formatted output";
license = licenses.gpl3Plus;

4
bsc/libpsm2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, numactl, pkgconfig }:
{ stdenv, lib, fetchFromGitHub, numactl, pkgconfig }:
let
version = "11.2.185";
@ -34,7 +34,7 @@ stdenv.mkDerivation {
rmdir $out/usr
'';
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://github.com/intel/opa-psm2";
description = "The PSM2 library supports a number of fabric media and stacks";
license = with licenses; [ gpl2 bsd3 ];

2
bsc/lmbench/default.nix
View File

@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
description = "lmbench";
homepage = "http://www.bitmover.com/lmbench/";
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
platforms = lib.platforms.all;
};
}

7
bsc/mpich/default.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, fetchurl
, perl
, gfortran
@ -9,7 +10,7 @@
, enableDebug ? false
}:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "mpich";
@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
sed -i 's:CXX="g++":CXX=${stdenv.cc}/bin/g++:' $out/bin/mpicxx
sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort
''
+ stdenv.lib.optionalString (!stdenv.isDarwin) ''
+ lib.optionalString (!stdenv.isDarwin) ''
# /tmp/nix-build... ends up in the RPATH, fix it manually
for entry in $out/bin/mpichversion $out/bin/mpivars; do
echo "fix rpath: $entry"
@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
done
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Implementation of the Message Passing Interface (MPI) standard";
longDescription = ''

3
bsc/nanos6/default.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, fetchFromGitHub
, automake
, autoconf
@ -20,7 +21,7 @@
assert enableJemalloc -> (jemalloc != null);
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "nanos6";

3
bsc/nanos6/git.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, automake
, autoconf
, libtool
@ -19,7 +20,7 @@
, gitBranch ? "master"
}:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
pname = "nanos6";

6
bsc/nix/default.nix
View File

@ -140,9 +140,9 @@ common =
environments.
'';
homepage = "https://nixos.org/";
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.unix;
license = lib.licenses.lgpl2Plus;
maintainers = [ lib.maintainers.eelco ];
platforms = lib.platforms.unix;
outputsToInstall = [ "out" "man" ];
};

8
bsc/nix/static.nix
View File

@ -146,9 +146,9 @@ common =
environments.
'';
homepage = "https://nixos.org/";
license = stdenv.lib.licenses.lgpl2Plus;
maintainers = [ stdenv.lib.maintainers.eelco ];
platforms = stdenv.lib.platforms.unix;
license = lib.licenses.lgpl2Plus;
maintainers = [ lib.maintainers.eelco ];
platforms = lib.platforms.unix;
outputsToInstall = [ "out" "man" ];
};
@ -191,7 +191,7 @@ in rec {
};
inherit storeDir stateDir confDir boehmgc;
} // stdenv.lib.optionalAttrs stdenv.cc.isClang {
} // lib.optionalAttrs stdenv.cc.isClang {
stdenv = llvmPackages_6.stdenv;
});

6
bsc/openmpi/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl
{ stdenv, lib, fetchurl, fetchpatch, gfortran, perl, libnl
, rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin
, libpsm2, libfabric, pmix, pmi2, ucx
@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
pname = "openmpi";
inherit version;
src = with stdenv.lib.versions; fetchurl {
src = with lib.versions; fetchurl {
url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
sha256 = "1i0slg2dxjdgw513aml1n9dsbdxn2fimi2b5712d5r9z4ar4xqj7";
};
@ -105,7 +105,7 @@ in stdenv.mkDerivation rec {
inherit cudaSupport cudatoolkit;
};
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://www.open-mpi.org/";
description = "Open source MPI-3 implementation";
longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";

6
bsc/openmpi/with-slurm.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, gfortran, perl, libnl
{ stdenv, lib, fetchurl, fetchpatch, gfortran, perl, libnl
, rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin
, libpsm2, libfabric
@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
pname = "openmpi";
inherit version;
src = with stdenv.lib.versions; fetchurl {
src = with lib.versions; fetchurl {
url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
sha256 = "00zxcw99gr5n693cmcmn4f6a47vx1ywna895p0x7p163v37gw0hl";
};
@ -102,7 +102,7 @@ in stdenv.mkDerivation rec {
inherit cudaSupport cudatoolkit;
};
meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://www.open-mpi.org/";
description = "Open source MPI-3 implementation";
longDescription = "The Open MPI Project is an open source MPI-3 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";

2
bsc/osu/default.nix
View File

@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
description = "OSU Micro-Benchmarks";
homepage = http://mvapich.cse.ohio-state.edu/benchmarks/;
maintainers = [ ];
platforms = stdenv.lib.platforms.all;
platforms = lib.platforms.all;
};
}

3
bsc/paraver/default.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, fetchFromGitHub
, boost
, libxml2
@ -13,7 +14,7 @@
, enableMouseLabel ? false
}:
with stdenv.lib;
with lib;
let
wx = wxGTK28;

6
bsc/perf/default.nix
View File

@ -47,7 +47,7 @@ stdenv.mkDerivation {
buildInputs = [
elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl
libopcodes python3 perl babeltrace
] ++ stdenv.lib.optional withGtk gtk2
] ++ lib.optional withGtk gtk2
++ (if (versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]);
# Note: we don't add elfutils to buildInputs, since it provides a
@ -78,7 +78,7 @@ stdenv.mkDerivation {
meta = {
homepage = "https://perf.wiki.kernel.org/";
description = "Linux tools to profile with performance counters";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
maintainers = with lib.maintainers; [viric];
platforms = with lib.platforms; linux;
};
}

4
bsc/pmix/pmix2.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, perl, autoconf, automake
{ stdenv, lib, fetchFromGitHub, perl, autoconf, automake
, libtool, flex, libevent, hwloc, munge, zlib
} :
@ -37,7 +37,7 @@ in stdenv.mkDerivation {
enableParallelBuilding = true;
meta = with stdenv.lib; {
meta = with lib; {
description = "Process Management Interface for HPC environments";
homepage = "https://openpmix.github.io/";
license = licenses.bsd3;

4
bsc/rdma-core/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, docutils
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, docutils
, pandoc, ethtool, iproute, libnl, udev, python, perl
, makeWrapper
} :
@ -48,7 +48,7 @@ in stdenv.mkDerivation {
rm -rf $out/sbin
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "RDMA Core Userspace Libraries and Daemons";
homepage = "https://github.com/linux-rdma/rdma-core";
license = licenses.gpl2;

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;

8
bsc/vite/default.nix
View File

@ -13,7 +13,7 @@
, otf ? null
}:
with stdenv.lib;
with lib;
# ViTE 1.1 has several bugs, so use the SVN version.
let
@ -76,8 +76,8 @@ stdenv.mkDerivation rec {
'';
homepage = "http://vite.gforge.inria.fr/";
license = stdenv.lib.licenses.cecill20;
maintainers = with stdenv.lib.maintainers; [ ];
platforms = stdenv.lib.platforms.linux;
license = lib.licenses.cecill20;
maintainers = with lib.maintainers; [ ];
platforms = lib.platforms.linux;
};
}

11
bsc/vtk/default.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, fetchurl
, cmake
, libGLU
@ -13,10 +14,10 @@
, mpi ? null
}:
with stdenv.lib;
with lib;
let
os = stdenv.lib.optionalString;
os = lib.optionalString;
majorVersion = "8.2";
minorVersion = "0";
version = "${majorVersion}.${minorVersion}";
@ -69,8 +70,8 @@ stdenv.mkDerivation rec {
meta = {
description = "Open source libraries for 3D computer graphics, image processing and visualization";
homepage = "https://www.vtk.org/";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
platforms = with stdenv.lib.platforms; unix;
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ knedlsepp ];
platforms = with lib.platforms; unix;
};
}

10
default.nix
View File

@ -1,14 +1,16 @@
let
bscOverlay = import ./overlay.nix;
commit = "1614b96a68dd210919865abe78bda56b501eb1ef";
# Pin the nixpkgs
nixpkgsPath = builtins.fetchTarball {
# Descriptive name to make the store path easier to identify
name = "nixos-20.09";
# Commit hash for nixos-20.09 as of 2021-01-11
url = "https://github.com/nixos/nixpkgs/archive/41dddb1283733c4993cb6be9573d5cef937c1375.tar.gz";
name = "nixpkgs-${commit}";
# Commit hash for nixpkgs as of 2021-09-01
url = "https://github.com/nixos/nixpkgs/archive/${commit}.tar.gz";
# Hash obtained using `nix-prefetch-url --unpack <url>`
sha256 = "1blbidbmxhaxar2x76nz72bazykc5yxi0algsbrhxgrsvijs4aiw";
sha256 = "17c4a6cg0xmnp6hl76h8fvxglngh66s8nfm3qq2iqv6iay4a92qz";
};
pkgs = import nixpkgsPath {

3
garlic/apps/bigsort/default.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, cc
, nanos6 ? null
, mcxx ? null
@ -7,7 +8,7 @@
, gitBranch
}:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
name = "bigsort";

3
garlic/apps/bigsort/genseq.nix
View File

@ -1,10 +1,11 @@
{
stdenv
, lib
, cc
, mpi
}:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
name = "genseq";

3
garlic/apps/bigsort/shuffle.nix
View File

@ -1,10 +1,11 @@
{
stdenv
, lib
, cc
, mpi
}:
with stdenv.lib;
with lib;
stdenv.mkDerivation rec {
name = "shuffle";

3
garlic/apps/fwi/default.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, mpi ? null
, tampi ? null
, mcxx ? null
@ -10,7 +11,7 @@
, garlicTools
}:
with stdenv.lib;
with lib;
assert !(tampi != null && mcxx == null);

3
garlic/apps/fwi/params.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, nz ? 200
, nx ? 200
, ny ? 500
@ -8,7 +9,7 @@
, garlicTools
}:
with stdenv.lib;
with lib;
with builtins;
let

3
garlic/apps/hpccg/default.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, icc
, mpi ? null
, tampi ? null
@ -11,7 +12,7 @@
assert !(tampi != null && mcxx == null);
with stdenv.lib;
with lib;
let
gitSource = garlicTools.fetchGarlicApp {

3
garlic/apps/ifsker/default.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, mpi
, gfortran
, tampi
@ -10,7 +11,7 @@
, garlicTools
}:
with stdenv.lib;
with lib;
let
gitSource = garlicTools.fetchGarlicApp {

3
garlic/apps/lulesh/default.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, impi
, mcxx
, icc
@ -9,7 +10,7 @@
, garlicTools
}:
with stdenv.lib;
with lib;
let
gitSource = garlicTools.fetchGarlicApp {

3
garlic/apps/miniamr/default.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, tampi
, clangOmpss2
, mpi
@ -8,7 +9,7 @@
, variant
}:
with stdenv.lib;
with lib;
assert (assertOneOf "variant" variant [ "openmp" "openmp-tasks" "ompss-2" ]);

3
garlic/apps/nbody/default.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, cc
, mpi ? null
, tampi ? null
@ -13,7 +14,7 @@
assert !(tampi != null && mcxx == null);
with stdenv.lib;
with lib;
let
gitSource = garlicTools.fetchGarlicApp {

5
garlic/apps/saiph/default.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, nanos6
, mpi
, tampi
@ -33,8 +34,8 @@ assert enableManualDist -> (nbgx != null);
assert enableManualDist -> (nbgy != null);
assert enableManualDist -> (nbgz != null);
with stdenv.lib;
with stdenv.lib.versions;
with lib;
with lib.versions;
let
gitSource = garlicTools.fetchGarlicApp {

6
garlic/doc/ug.ms
View File

@ -1076,7 +1076,7 @@ produce the execution pipeline when built. The experiment file describes
a function (which is typical in nix) and takes as argument an
attribute set with some common packages, tools and options:
.CS
{ stdenv, bsc, stdexp, targetMachine, stages, garlicTools }:
{ stdenv, lib, bsc, stdexp, targetMachine, stages, garlicTools }:
.CE
The
.I bsc
@ -1344,8 +1344,8 @@ stdexp.genExperiment { inherit configs pipeline; }
.CE
The complete example experiment can be shown here:
.CS
{ stdenv, stdexp, bsc, targetMachine, stages }:
with stdenv.lib;
{ stdenv, lib, stdexp, bsc, targetMachine, stages }:
with lib;
let
# Initial variable configuration
varConf = {

3
garlic/exp/bigsort/genseq.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -9,7 +10,7 @@
, strace
}:
with stdenv.lib;
with lib;
# Ensure the arguments are strings, to avoid problems with large numbers
assert (isString n);

3
garlic/exp/bigsort/shuffle.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -11,7 +12,7 @@
, resultFromTrebuchet
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/bigsort/sort.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -9,7 +10,7 @@
, inputTre
}:
with stdenv.lib;
with lib;
let
varConf = { }; # Not used

3
garlic/exp/cn6/nbody.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, pkgs
@ -10,7 +11,7 @@
, enableHWC ? false
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/cn6/timediff.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, pkgs
@ -10,7 +11,7 @@
, enableHWC ? false
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/creams/granularity.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -8,7 +9,7 @@
, enableExtended ? false
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/creams/granularity16.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -8,7 +9,7 @@
, enableExtended ? false
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/creams/size.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -8,7 +9,7 @@
, enableExtended ? false
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/creams/ss.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -8,7 +9,7 @@
, enableExtended ? false
}:
with stdenv.lib;
with lib;
with garlicTools;
let

7
garlic/exp/examples/granularity.nix
View File

@ -6,6 +6,7 @@
# following keys:
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -13,11 +14,11 @@
, garlicTools
}:
# We import in the scope the content of the `stdenv.lib` attribute, which
# We import in the scope the content of the `lib` attribute, which
# contain useful functions like `toString`, which will be used later. This is
# handy to avoid writting `stdenv.lib.tostring`.
# handy to avoid writting `lib.tostring`.
with stdenv.lib;
with lib;
# We also have some functions specific to the garlic benchmark which we import
# as well. Take a look at the garlic/tools.nix file for more details.

3
garlic/exp/fwi/common.nix
View File

@ -1,11 +1,12 @@
{
stdenv
, lib
, stdexp
, bsc
, stages
}:
with stdenv.lib;
with lib;
# Common definitions used by fwi experiments
rec {

3
garlic/exp/fwi/granularity.nix
View File

@ -2,6 +2,7 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -10,7 +11,7 @@
, callPackage
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/fwi/io.nix
View File

@ -7,6 +7,7 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -15,7 +16,7 @@
, enableExtended ? false
}:
with stdenv.lib;
with lib;
let
common = callPackage ./common.nix {};

3
garlic/exp/fwi/reuse.nix
View File

@ -20,6 +20,7 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -27,7 +28,7 @@
, callPackage
}:
with stdenv.lib;
with lib;
let

3
garlic/exp/fwi/ss.nix
View File

@ -4,6 +4,7 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -13,7 +14,7 @@
, enableExtended ? false
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/heat/granularity.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -15,7 +16,7 @@
# TODO: Finish HWC first
assert (enableHWC == false);
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/hpcg/common.nix
View File

@ -1,12 +1,13 @@
{
stdenv
, lib
, stdexp
, bsc
, stages
, callPackage
}:
with stdenv.lib;
with lib;
rec {

3
garlic/exp/hpcg/gen.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -8,7 +9,7 @@
, callPackage
}:
with stdenv.lib;
with lib;
with garlicTools;
rec {

3
garlic/exp/hpcg/granularity.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -8,7 +9,7 @@
, callPackage
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/hpcg/scaling.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -10,7 +11,7 @@
, enableStrong ? true
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/hpcg/size.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -8,7 +9,7 @@
, callPackage
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/lulesh/test.nix
View File

@ -1,12 +1,13 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
, stages
}:
with stdenv.lib;
with lib;
let

3
garlic/exp/nbody/common.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, stages
@ -7,7 +8,7 @@
, garlicTools
}:
with stdenv.lib;
with lib;
with garlicTools;
rec {

3
garlic/exp/nbody/granularity.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -8,7 +9,7 @@
, callPackage
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/nbody/numa.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -9,7 +10,7 @@
, callPackage
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/nbody/old/granularity-oss.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -7,7 +8,7 @@
, garlicTools
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/nbody/old/nblocks.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -19,7 +20,7 @@
, nblocks0 ? null
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/nbody/old/scaling.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -18,7 +19,7 @@
, nblocks0 ? null
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/nbody/old/strong-scaling-oss.nix
View File

@ -1,12 +1,13 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
, stages
}:
with stdenv.lib;
with lib;
let
# Initial variable configuration

3
garlic/exp/nbody/old/weak-scaling-mpi.nix
View File

@ -1,12 +1,13 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
, stages
}:
with stdenv.lib;
with lib;
let
# Initial variable configuration

3
garlic/exp/nbody/old/weak-scaling-oss.nix
View File

@ -1,12 +1,13 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
, stages
}:
with stdenv.lib;
with lib;
let
# Initial variable configuration

3
garlic/exp/nbody/ss.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -8,7 +9,7 @@
, callPackage
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/osu/bw.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -10,7 +11,7 @@
}:
with builtins;
with stdenv.lib;
with lib;
let

3
garlic/exp/osu/eager.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -7,7 +8,7 @@
}:
with builtins;
with stdenv.lib;
with lib;
let

3
garlic/exp/osu/impi.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -10,7 +11,7 @@
}:
with builtins;
with stdenv.lib;
with lib;
let

3
garlic/exp/osu/latency.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -11,7 +12,7 @@
}:
with builtins;
with stdenv.lib;
with lib;
let

3
garlic/exp/osu/mtu.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -7,7 +8,7 @@
}:
with builtins;
with stdenv.lib;
with lib;
let

3
garlic/exp/saiph/granularity.nix
View File

@ -26,6 +26,7 @@
# Common packages, tools and options
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -33,7 +34,7 @@
, garlicTools
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/saiph/ss.nix
View File

@ -27,6 +27,7 @@
# Common packages, tools and options
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -34,7 +35,7 @@
, garlicTools
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/slurm/cpu.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -7,7 +8,7 @@
, garlicTools
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/slurm/exit1.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -7,7 +8,7 @@
, garlicTools
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/exp/slurm/sigsegv.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, stdexp
, bsc
, targetMachine
@ -7,7 +8,7 @@
, garlicTools
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/pp/merge.nix
View File

@ -1,10 +1,11 @@
{
stdenv
, lib
}:
datasets:
with stdenv.lib;
with lib;
stdenv.mkDerivation {
name = "merged-dataset";

3
garlic/pp/rplot.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, rWrapper
, rPackages
, fontconfig
@ -22,7 +23,7 @@
, extraRPackages ? []
}:
with stdenv.lib;
with lib;
let
scalesPatched = with rPackages; buildRPackage {

3
garlic/stages/experiment.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, garlicTools
}:
@ -7,7 +8,7 @@
units
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/stages/sbatch.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, numactl
, slurm
, garlicTools
@ -26,7 +27,7 @@
, acctgFreq ? null
}:
with stdenv.lib;
with lib;
with garlicTools;
# sbatch fails silently if we pass garbage, so we assert the types here to avoid

3
garlic/stages/unit.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, bash
, writeText
}:
@ -9,7 +10,7 @@
, conf
}:
with stdenv.lib;
with lib;
with builtins;
let

3
garlic/stdexp.nix
View File

@ -1,5 +1,6 @@
{
stdenv
, lib
, config
, stages
, targetMachine
@ -11,7 +12,7 @@
, pp
}:
with stdenv.lib;
with lib;
with garlicTools;
let

3
garlic/tools.nix
View File

@ -1,8 +1,9 @@
{
stdenv
, lib
}:
with stdenv.lib;
with lib;
let
gen = rec {

12
overlay.nix
View File

@ -216,6 +216,18 @@ let
# Patched from upstream
# =================================================================
#libdwarf_insecure = super.libdwarf.overrideAttrs (old: {
# knownVulnerabilities = null;
#});
libdwarf = super.symlinkJoin {
name = "libdwarf";
paths = [
self.libdwarf.dev
self.libdwarf.lib
self.libdwarf.out
];
};
groff = callPackage ./bsc/groff/default.nix { };
fftw = callPackage ./bsc/fftw/default.nix { };
vtk = callPackage ./bsc/vtk/default.nix {