diff --git a/bsc/babeltrace/default.nix b/bsc/babeltrace/default.nix
index 973820a0..185fdafe 100644
--- a/bsc/babeltrace/default.nix
+++ b/bsc/babeltrace/default.nix
@@ -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;
diff --git a/bsc/clsync/default.nix b/bsc/clsync/default.nix
index 4c2a80d6..77adccef 100644
--- a/bsc/clsync/default.nix
+++ b/bsc/clsync/default.nix
@@ -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;
diff --git a/bsc/cn6/default.nix b/bsc/cn6/default.nix
index 4fcc74d4..5e3eaf50 100644
--- a/bsc/cn6/default.nix
+++ b/bsc/cn6/default.nix
@@ -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));
diff --git a/bsc/extrae/default.nix b/bsc/extrae/default.nix
index 1519a452..88a2f422 100644
--- a/bsc/extrae/default.nix
+++ b/bsc/extrae/default.nix
@@ -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)
diff --git a/bsc/fftw/default.nix b/bsc/fftw/default.nix
index 71971c30..84fb1a89 100644
--- a/bsc/fftw/default.nix
+++ b/bsc/fftw/default.nix
@@ -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;
diff --git a/bsc/groff/default.nix b/bsc/groff/default.nix
index a3397b4e..1b27039f 100644
--- a/bsc/groff/default.nix
+++ b/bsc/groff/default.nix
@@ -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;
diff --git a/bsc/libpsm2/default.nix b/bsc/libpsm2/default.nix
index cf590107..e75e8d76 100644
--- a/bsc/libpsm2/default.nix
+++ b/bsc/libpsm2/default.nix
@@ -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 ];
diff --git a/bsc/lmbench/default.nix b/bsc/lmbench/default.nix
index c86c2224..676556ee 100644
--- a/bsc/lmbench/default.nix
+++ b/bsc/lmbench/default.nix
@@ -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;
   };
 }
diff --git a/bsc/mpich/default.nix b/bsc/mpich/default.nix
index 87abe121..36bee859 100644
--- a/bsc/mpich/default.nix
+++ b/bsc/mpich/default.nix
@@ -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 = ''
diff --git a/bsc/nanos6/default.nix b/bsc/nanos6/default.nix
index d8ed4756..50fe368c 100644
--- a/bsc/nanos6/default.nix
+++ b/bsc/nanos6/default.nix
@@ -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";
diff --git a/bsc/nanos6/git.nix b/bsc/nanos6/git.nix
index 37f3be31..794f9fac 100644
--- a/bsc/nanos6/git.nix
+++ b/bsc/nanos6/git.nix
@@ -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";
diff --git a/bsc/nix/default.nix b/bsc/nix/default.nix
index 78c5c3e1..d31b3c3e 100644
--- a/bsc/nix/default.nix
+++ b/bsc/nix/default.nix
@@ -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" ];
       };
 
diff --git a/bsc/nix/static.nix b/bsc/nix/static.nix
index 8dd10fca..1d4965cd 100644
--- a/bsc/nix/static.nix
+++ b/bsc/nix/static.nix
@@ -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;
   });
 
diff --git a/bsc/openmpi/default.nix b/bsc/openmpi/default.nix
index 093eb9a5..b1aede57 100644
--- a/bsc/openmpi/default.nix
+++ b/bsc/openmpi/default.nix
@@ -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.";
diff --git a/bsc/openmpi/with-slurm.nix b/bsc/openmpi/with-slurm.nix
index f987c006..687cb169 100644
--- a/bsc/openmpi/with-slurm.nix
+++ b/bsc/openmpi/with-slurm.nix
@@ -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.";
diff --git a/bsc/osu/default.nix b/bsc/osu/default.nix
index 539a4c0f..d8bf07f8 100644
--- a/bsc/osu/default.nix
+++ b/bsc/osu/default.nix
@@ -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;
   };
 }
diff --git a/bsc/paraver/default.nix b/bsc/paraver/default.nix
index e8ae3e80..0876daea 100644
--- a/bsc/paraver/default.nix
+++ b/bsc/paraver/default.nix
@@ -1,5 +1,6 @@
 {
   stdenv
+, lib
 , fetchFromGitHub
 , boost
 , libxml2
@@ -13,7 +14,7 @@
 , enableMouseLabel ? false
 }:
 
-with stdenv.lib;
+with lib;
 
 let
   wx = wxGTK28;
diff --git a/bsc/perf/default.nix b/bsc/perf/default.nix
index cce96f3c..b4af2961 100644
--- a/bsc/perf/default.nix
+++ b/bsc/perf/default.nix
@@ -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;
   };
 }
diff --git a/bsc/pmix/pmix2.nix b/bsc/pmix/pmix2.nix
index 6598fced..612e0814 100644
--- a/bsc/pmix/pmix2.nix
+++ b/bsc/pmix/pmix2.nix
@@ -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;
diff --git a/bsc/rdma-core/default.nix b/bsc/rdma-core/default.nix
index 31c8de58..e3566f62 100644
--- a/bsc/rdma-core/default.nix
+++ b/bsc/rdma-core/default.nix
@@ -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;
diff --git a/bsc/slurm/default.nix b/bsc/slurm/default.nix
index a82a52f1..d65440e9 100644
--- a/bsc/slurm/default.nix
+++ b/bsc/slurm/default.nix
@@ -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;
diff --git a/bsc/slurm/pmi2.nix b/bsc/slurm/pmi2.nix
index 36f337f5..332ff02e 100644
--- a/bsc/slurm/pmi2.nix
+++ b/bsc/slurm/pmi2.nix
@@ -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;
diff --git a/bsc/vite/default.nix b/bsc/vite/default.nix
index f0a44c92..b40c8d5c 100644
--- a/bsc/vite/default.nix
+++ b/bsc/vite/default.nix
@@ -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;
   };
 }
diff --git a/bsc/vtk/default.nix b/bsc/vtk/default.nix
index 9bf9aa37..299fb6d9 100644
--- a/bsc/vtk/default.nix
+++ b/bsc/vtk/default.nix
@@ -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;
   };
 }
diff --git a/default.nix b/default.nix
index 4c0c191c..32126218 100644
--- a/default.nix
+++ b/default.nix
@@ -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 {
diff --git a/garlic/apps/bigsort/default.nix b/garlic/apps/bigsort/default.nix
index c3f7d1b9..4e7dd3d4 100644
--- a/garlic/apps/bigsort/default.nix
+++ b/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";
 
diff --git a/garlic/apps/bigsort/genseq.nix b/garlic/apps/bigsort/genseq.nix
index 09adb25c..6036467f 100644
--- a/garlic/apps/bigsort/genseq.nix
+++ b/garlic/apps/bigsort/genseq.nix
@@ -1,10 +1,11 @@
 {
   stdenv
+, lib
 , cc
 , mpi
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   name = "genseq";
 
diff --git a/garlic/apps/bigsort/shuffle.nix b/garlic/apps/bigsort/shuffle.nix
index c19366e4..977d9114 100644
--- a/garlic/apps/bigsort/shuffle.nix
+++ b/garlic/apps/bigsort/shuffle.nix
@@ -1,10 +1,11 @@
 {
   stdenv
+, lib
 , cc
 , mpi
 }:
 
-with stdenv.lib;
+with lib;
 stdenv.mkDerivation rec {
   name = "shuffle";
 
diff --git a/garlic/apps/fwi/default.nix b/garlic/apps/fwi/default.nix
index d826e7f3..681509ad 100644
--- a/garlic/apps/fwi/default.nix
+++ b/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);
 
diff --git a/garlic/apps/fwi/params.nix b/garlic/apps/fwi/params.nix
index 8dce26b0..7fad46bb 100644
--- a/garlic/apps/fwi/params.nix
+++ b/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
diff --git a/garlic/apps/hpccg/default.nix b/garlic/apps/hpccg/default.nix
index 91937368..bb827a79 100644
--- a/garlic/apps/hpccg/default.nix
+++ b/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 {
diff --git a/garlic/apps/ifsker/default.nix b/garlic/apps/ifsker/default.nix
index 5ec28fa7..b5753645 100644
--- a/garlic/apps/ifsker/default.nix
+++ b/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 {
diff --git a/garlic/apps/lulesh/default.nix b/garlic/apps/lulesh/default.nix
index d5202c53..8f646827 100644
--- a/garlic/apps/lulesh/default.nix
+++ b/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 {
diff --git a/garlic/apps/miniamr/default.nix b/garlic/apps/miniamr/default.nix
index f005ead9..a014a73d 100644
--- a/garlic/apps/miniamr/default.nix
+++ b/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" ]);
 
diff --git a/garlic/apps/nbody/default.nix b/garlic/apps/nbody/default.nix
index f003261d..d5de8ce1 100644
--- a/garlic/apps/nbody/default.nix
+++ b/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 {
diff --git a/garlic/apps/saiph/default.nix b/garlic/apps/saiph/default.nix
index c09c1f7f..bb81c893 100644
--- a/garlic/apps/saiph/default.nix
+++ b/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 {
diff --git a/garlic/doc/ug.ms b/garlic/doc/ug.ms
index d826bd65..8b7c5790 100644
--- a/garlic/doc/ug.ms
+++ b/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 = {
diff --git a/garlic/exp/bigsort/genseq.nix b/garlic/exp/bigsort/genseq.nix
index 9348c3f1..99a59f19 100644
--- a/garlic/exp/bigsort/genseq.nix
+++ b/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);
diff --git a/garlic/exp/bigsort/shuffle.nix b/garlic/exp/bigsort/shuffle.nix
index 5d3b7b71..a841720a 100644
--- a/garlic/exp/bigsort/shuffle.nix
+++ b/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
diff --git a/garlic/exp/bigsort/sort.nix b/garlic/exp/bigsort/sort.nix
index 21e10b2f..2ae73e9e 100644
--- a/garlic/exp/bigsort/sort.nix
+++ b/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
diff --git a/garlic/exp/cn6/nbody.nix b/garlic/exp/cn6/nbody.nix
index f0a3c06d..e48018f0 100644
--- a/garlic/exp/cn6/nbody.nix
+++ b/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
diff --git a/garlic/exp/cn6/timediff.nix b/garlic/exp/cn6/timediff.nix
index ec20948d..7d2d42f7 100644
--- a/garlic/exp/cn6/timediff.nix
+++ b/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
diff --git a/garlic/exp/creams/granularity.nix b/garlic/exp/creams/granularity.nix
index 1a7c38db..3fab6388 100644
--- a/garlic/exp/creams/granularity.nix
+++ b/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
diff --git a/garlic/exp/creams/granularity16.nix b/garlic/exp/creams/granularity16.nix
index a43d2bb3..fa8dc6f7 100644
--- a/garlic/exp/creams/granularity16.nix
+++ b/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
diff --git a/garlic/exp/creams/size.nix b/garlic/exp/creams/size.nix
index 4fce9eea..dea3c8d0 100644
--- a/garlic/exp/creams/size.nix
+++ b/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
diff --git a/garlic/exp/creams/ss.nix b/garlic/exp/creams/ss.nix
index 0194decc..86723be4 100644
--- a/garlic/exp/creams/ss.nix
+++ b/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
diff --git a/garlic/exp/examples/granularity.nix b/garlic/exp/examples/granularity.nix
index 5425e54d..1c012440 100644
--- a/garlic/exp/examples/granularity.nix
+++ b/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.
diff --git a/garlic/exp/fwi/common.nix b/garlic/exp/fwi/common.nix
index dbd8442f..63e88de9 100644
--- a/garlic/exp/fwi/common.nix
+++ b/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 {
diff --git a/garlic/exp/fwi/granularity.nix b/garlic/exp/fwi/granularity.nix
index cb9e6ceb..15bc484a 100644
--- a/garlic/exp/fwi/granularity.nix
+++ b/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
diff --git a/garlic/exp/fwi/io.nix b/garlic/exp/fwi/io.nix
index 88bc97f8..0d107d71 100644
--- a/garlic/exp/fwi/io.nix
+++ b/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 {};
diff --git a/garlic/exp/fwi/reuse.nix b/garlic/exp/fwi/reuse.nix
index d907e0c8..9a725e20 100644
--- a/garlic/exp/fwi/reuse.nix
+++ b/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
 
diff --git a/garlic/exp/fwi/ss.nix b/garlic/exp/fwi/ss.nix
index 743ea483..c54370e7 100644
--- a/garlic/exp/fwi/ss.nix
+++ b/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
diff --git a/garlic/exp/heat/granularity.nix b/garlic/exp/heat/granularity.nix
index 5d4d01ee..8ebe5db5 100644
--- a/garlic/exp/heat/granularity.nix
+++ b/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
diff --git a/garlic/exp/hpcg/common.nix b/garlic/exp/hpcg/common.nix
index 6bc52759..a7c19e32 100644
--- a/garlic/exp/hpcg/common.nix
+++ b/garlic/exp/hpcg/common.nix
@@ -1,12 +1,13 @@
 {
   stdenv
+, lib
 , stdexp
 , bsc
 , stages
 , callPackage
 }:
 
-with stdenv.lib;
+with lib;
 
 rec {
 
diff --git a/garlic/exp/hpcg/gen.nix b/garlic/exp/hpcg/gen.nix
index 4f2b13bd..d34eccc3 100644
--- a/garlic/exp/hpcg/gen.nix
+++ b/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 {
diff --git a/garlic/exp/hpcg/granularity.nix b/garlic/exp/hpcg/granularity.nix
index a061142d..7c3d2a82 100644
--- a/garlic/exp/hpcg/granularity.nix
+++ b/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
diff --git a/garlic/exp/hpcg/scaling.nix b/garlic/exp/hpcg/scaling.nix
index ecd1b16f..afb1aeea 100644
--- a/garlic/exp/hpcg/scaling.nix
+++ b/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
diff --git a/garlic/exp/hpcg/size.nix b/garlic/exp/hpcg/size.nix
index 3d3b9a5a..1124323b 100644
--- a/garlic/exp/hpcg/size.nix
+++ b/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
diff --git a/garlic/exp/lulesh/test.nix b/garlic/exp/lulesh/test.nix
index 595be9d8..eb9b0788 100644
--- a/garlic/exp/lulesh/test.nix
+++ b/garlic/exp/lulesh/test.nix
@@ -1,12 +1,13 @@
 {
   stdenv
+, lib
 , stdexp
 , bsc
 , targetMachine
 , stages
 }:
 
-with stdenv.lib;
+with lib;
 
 let
 
diff --git a/garlic/exp/nbody/common.nix b/garlic/exp/nbody/common.nix
index 434bc581..85703328 100644
--- a/garlic/exp/nbody/common.nix
+++ b/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 {
diff --git a/garlic/exp/nbody/granularity.nix b/garlic/exp/nbody/granularity.nix
index 23baa266..4b59bae8 100644
--- a/garlic/exp/nbody/granularity.nix
+++ b/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
diff --git a/garlic/exp/nbody/numa.nix b/garlic/exp/nbody/numa.nix
index d4a3c28f..a860fdc6 100644
--- a/garlic/exp/nbody/numa.nix
+++ b/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
diff --git a/garlic/exp/nbody/old/granularity-oss.nix b/garlic/exp/nbody/old/granularity-oss.nix
index 1b1dd364..2dbe81c7 100644
--- a/garlic/exp/nbody/old/granularity-oss.nix
+++ b/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
diff --git a/garlic/exp/nbody/old/nblocks.nix b/garlic/exp/nbody/old/nblocks.nix
index 1c092e28..4e7dd94b 100644
--- a/garlic/exp/nbody/old/nblocks.nix
+++ b/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
diff --git a/garlic/exp/nbody/old/scaling.nix b/garlic/exp/nbody/old/scaling.nix
index 40ef4ed2..47fd2217 100644
--- a/garlic/exp/nbody/old/scaling.nix
+++ b/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
diff --git a/garlic/exp/nbody/old/strong-scaling-oss.nix b/garlic/exp/nbody/old/strong-scaling-oss.nix
index 9739fff9..2a6f7890 100644
--- a/garlic/exp/nbody/old/strong-scaling-oss.nix
+++ b/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
diff --git a/garlic/exp/nbody/old/weak-scaling-mpi.nix b/garlic/exp/nbody/old/weak-scaling-mpi.nix
index ecbd7687..e830a42f 100644
--- a/garlic/exp/nbody/old/weak-scaling-mpi.nix
+++ b/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
diff --git a/garlic/exp/nbody/old/weak-scaling-oss.nix b/garlic/exp/nbody/old/weak-scaling-oss.nix
index a96d708d..4c7e574f 100644
--- a/garlic/exp/nbody/old/weak-scaling-oss.nix
+++ b/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
diff --git a/garlic/exp/nbody/ss.nix b/garlic/exp/nbody/ss.nix
index 75ffa56b..d9ebf076 100644
--- a/garlic/exp/nbody/ss.nix
+++ b/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
diff --git a/garlic/exp/osu/bw.nix b/garlic/exp/osu/bw.nix
index 47671be9..e2c3f373 100644
--- a/garlic/exp/osu/bw.nix
+++ b/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
 
diff --git a/garlic/exp/osu/eager.nix b/garlic/exp/osu/eager.nix
index d1d89fe1..69ee9395 100644
--- a/garlic/exp/osu/eager.nix
+++ b/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
 
diff --git a/garlic/exp/osu/impi.nix b/garlic/exp/osu/impi.nix
index 71235604..97f62837 100644
--- a/garlic/exp/osu/impi.nix
+++ b/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
 
diff --git a/garlic/exp/osu/latency.nix b/garlic/exp/osu/latency.nix
index a59c0fad..f58eb604 100644
--- a/garlic/exp/osu/latency.nix
+++ b/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
 
diff --git a/garlic/exp/osu/mtu.nix b/garlic/exp/osu/mtu.nix
index ac58711c..ca99091f 100644
--- a/garlic/exp/osu/mtu.nix
+++ b/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
 
diff --git a/garlic/exp/saiph/granularity.nix b/garlic/exp/saiph/granularity.nix
index 6387bf64..30b9b28b 100644
--- a/garlic/exp/saiph/granularity.nix
+++ b/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
diff --git a/garlic/exp/saiph/ss.nix b/garlic/exp/saiph/ss.nix
index 4fbb24e9..5ddc47a7 100644
--- a/garlic/exp/saiph/ss.nix
+++ b/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
diff --git a/garlic/exp/slurm/cpu.nix b/garlic/exp/slurm/cpu.nix
index d7038b10..d2ee632f 100644
--- a/garlic/exp/slurm/cpu.nix
+++ b/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
diff --git a/garlic/exp/slurm/exit1.nix b/garlic/exp/slurm/exit1.nix
index 2feb3938..bf601361 100644
--- a/garlic/exp/slurm/exit1.nix
+++ b/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
diff --git a/garlic/exp/slurm/sigsegv.nix b/garlic/exp/slurm/sigsegv.nix
index db1830a7..b77f58be 100644
--- a/garlic/exp/slurm/sigsegv.nix
+++ b/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
diff --git a/garlic/pp/merge.nix b/garlic/pp/merge.nix
index 7f8919dc..03caaea6 100644
--- a/garlic/pp/merge.nix
+++ b/garlic/pp/merge.nix
@@ -1,10 +1,11 @@
 {
   stdenv
+, lib
 }:
 
 datasets:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation {
   name = "merged-dataset";
diff --git a/garlic/pp/rplot.nix b/garlic/pp/rplot.nix
index 28704d1a..df154da0 100644
--- a/garlic/pp/rplot.nix
+++ b/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 {
diff --git a/garlic/stages/experiment.nix b/garlic/stages/experiment.nix
index b50fdec6..19c0e45d 100644
--- a/garlic/stages/experiment.nix
+++ b/garlic/stages/experiment.nix
@@ -1,5 +1,6 @@
 {
   stdenv
+, lib
 , garlicTools
 }:
 
@@ -7,7 +8,7 @@
   units
 }:
 
-with stdenv.lib;
+with lib;
 with garlicTools;
 
 let
diff --git a/garlic/stages/sbatch.nix b/garlic/stages/sbatch.nix
index 40c2d683..34a3167f 100644
--- a/garlic/stages/sbatch.nix
+++ b/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
diff --git a/garlic/stages/unit.nix b/garlic/stages/unit.nix
index babf39ab..1af3f869 100644
--- a/garlic/stages/unit.nix
+++ b/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
diff --git a/garlic/stdexp.nix b/garlic/stdexp.nix
index 32139802..f06c1fba 100644
--- a/garlic/stdexp.nix
+++ b/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
diff --git a/garlic/tools.nix b/garlic/tools.nix
index 8d81213c..c092b554 100644
--- a/garlic/tools.nix
+++ b/garlic/tools.nix
@@ -1,8 +1,9 @@
 {
   stdenv
+, lib
 }:
 
-with stdenv.lib;
+with lib;
 
 let
   gen = rec {
diff --git a/overlay.nix b/overlay.nix
index 62413fd5..020c4dd2 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -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 {