pkgs: update nixpkgs to 1614b96a

This commit is contained in:
2022-09-01 16:27:29 +02:00
parent e57107024e
commit b60698b791
87 changed files with 229 additions and 146 deletions

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";

View File

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

View File

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

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);

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

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 {

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 {

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 {

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" ]);

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 {

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 {