pkgs: update nixpkgs to 1614b96a

garlic/apps/bigsort/default.nix

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

garlic/apps/bigsort/genseq.nix

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

garlic/apps/bigsort/shuffle.nix

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

garlic/apps/fwi/default.nix

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

garlic/apps/fwi/params.nix

@@ -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

garlic/apps/hpccg/default.nix

@@ -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 {

garlic/apps/ifsker/default.nix

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

garlic/apps/lulesh/default.nix

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

garlic/apps/miniamr/default.nix

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

garlic/apps/nbody/default.nix

@@ -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 {

garlic/apps/saiph/default.nix

@@ -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 {

garlic/doc/ug.ms

@@ -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 = {

garlic/exp/bigsort/genseq.nix

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

garlic/exp/bigsort/shuffle.nix

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

garlic/exp/bigsort/sort.nix

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

garlic/exp/cn6/nbody.nix

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

garlic/exp/cn6/timediff.nix

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

garlic/exp/creams/granularity.nix

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

garlic/exp/creams/granularity16.nix

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

garlic/exp/creams/size.nix

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

garlic/exp/creams/ss.nix

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

garlic/exp/examples/granularity.nix

@@ -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.

garlic/exp/fwi/common.nix

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

garlic/exp/fwi/granularity.nix

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

garlic/exp/fwi/io.nix

@@ -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 {};

garlic/exp/fwi/reuse.nix

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

garlic/exp/fwi/ss.nix

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

garlic/exp/heat/granularity.nix

@@ -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

garlic/exp/hpcg/common.nix

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

garlic/exp/hpcg/gen.nix

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

garlic/exp/hpcg/granularity.nix

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

garlic/exp/hpcg/scaling.nix

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

garlic/exp/hpcg/size.nix

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

garlic/exp/lulesh/test.nix

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

garlic/exp/nbody/common.nix

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

garlic/exp/nbody/granularity.nix

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

garlic/exp/nbody/numa.nix

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

garlic/exp/nbody/old/granularity-oss.nix

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

garlic/exp/nbody/old/nblocks.nix

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

garlic/exp/nbody/old/scaling.nix

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

garlic/exp/nbody/old/strong-scaling-oss.nix

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

garlic/exp/nbody/old/weak-scaling-mpi.nix

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

garlic/exp/nbody/old/weak-scaling-oss.nix

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

garlic/exp/nbody/ss.nix

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

garlic/exp/osu/bw.nix

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

garlic/exp/osu/eager.nix

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

garlic/exp/osu/impi.nix

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

garlic/exp/osu/latency.nix

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

garlic/exp/osu/mtu.nix

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

garlic/exp/saiph/granularity.nix

@@ -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

garlic/exp/saiph/ss.nix

@@ -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

garlic/exp/slurm/cpu.nix

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

garlic/exp/slurm/exit1.nix

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

garlic/exp/slurm/sigsegv.nix

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

garlic/pp/merge.nix

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

garlic/pp/rplot.nix

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

garlic/stages/experiment.nix

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

garlic/stages/sbatch.nix

@@ -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

garlic/stages/unit.nix

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

garlic/stdexp.nix

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

garlic/tools.nix

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