pkgs/tools: stdenv.lib -> lib

pkgs/tools/X11/arandr/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3Packages
+{ lib, stdenv, fetchurl, python3Packages
 , gobject-introspection, gsettings-desktop-schemas, gtk3
 , wrapGAppsHook, xrandr
 }:
@@ -34,7 +34,7 @@ in buildPythonApplication rec {
   meta = {
     homepage = "http://christian.amsuess.com/tools/arandr/";
     description = "A simple visual front end for XRandR";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.domenkozar ];
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.domenkozar ];
   };
 }

pkgs/tools/X11/autocutsel/default.nix

@@ -1,14 +1,14 @@
-{stdenv, fetchurl, libX11, libXaw}:
+{lib, stdenv, fetchurl, libX11, libXaw}:
 
 stdenv.mkDerivation rec {
   version = "0.10.0";
   pname = "autocutsel";
- 
+
   src = fetchurl {
     url = "https://github.com/sigmike/autocutsel/releases/download/${version}/${pname}-${version}.tar.gz";
     sha256 = "0gsys2dzh4az51ndcsabhlbbrjn2nm75lnjr45kg6r8sm8q66dx2";
   };
- 
+
   buildInputs = [ libX11 libXaw ];
   installPhase = ''
     mkdir -p $out/bin
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
     inherit version;
     homepage = "https://www.nongnu.org/autocutsel/";
     description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = with stdenv.lib.platforms; all;
+    license = lib.licenses.gpl2Plus;
+    platforms = with lib.platforms; all;
     updateWalker = true;
   };
 }

pkgs/tools/X11/ckbcomp/default.nix

@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "Compiles a XKB keyboard description to a keymap suitable for loadkeys";
     homepage = "https://salsa.debian.org/installer-team/console-setup";
     license = licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ dezgeg ];
+    maintainers = with lib.maintainers; [ dezgeg ];
     platforms = platforms.unix;
   };
 }

pkgs/tools/X11/go-sct/default.nix

@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "go-sct";
-  version = "20180605-${stdenv.lib.strings.substring 0 7 rev}";
+  version = "20180605-${lib.strings.substring 0 7 rev}";
   rev = "eb1e851f2d5017038d2b8e3653645c36d3a279f4";
 
   goPackagePath = "github.com/d4l3k/go-sct";

pkgs/tools/X11/icon-slicer/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkg-config, gdk-pixbuf, popt }:
+{ lib, stdenv, fetchurl, pkg-config, gdk-pixbuf, popt }:
 stdenv.mkDerivation rec {
   pname = "icon-slicer";
   version = "0.3";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ popt pkg-config ];
   buildInputs = [ gdk-pixbuf ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Utility for generating icon themes and libXcursor cursor themes";
     homepage = "https://www.freedesktop.org/wiki/Software/icon-slicer/";
     license = licenses.mit;

pkgs/tools/X11/nitrogen/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtkmm2 }:
+{ lib, stdenv, fetchurl, pkgconfig, glib, gtkmm2 }:
 
 let version = "1.6.1";
 in
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
       and settings are stored in a human-readable config file.
     '';
     homepage = "https://github.com/l3ib/nitrogen";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.auntie ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.auntie ];
   };
 }

pkgs/tools/X11/nx-libs/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo
+{ lib, stdenv, autoconf, automake, fetchFromGitHub, libgcc, libjpeg_turbo
 , libpng, libtool, libxml2, pkgconfig, which, xorg
 , libtirpc
 }:
@@ -41,8 +41,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "NX X server based on Xnest";
     homepage = "https://github.com/ArcticaProject/nx-libs";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ jD91mZM2 ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ jD91mZM2 ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/X11/obconf/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, libglade, openbox,
+{ lib, stdenv, fetchurl, pkgconfig, gtk2, libglade, openbox,
   imlib2, libstartup_notification, makeWrapper, libSM }:
 
 stdenv.mkDerivation rec {
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "GUI configuration tool for openbox";
     homepage = "http://openbox.org/wiki/ObConf";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.lhvwb ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.lhvwb ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/X11/ratmen/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, xorgproto, libX11}:
+{lib, stdenv, fetchurl, perl, xorgproto, libX11}:
 let
   s = # Generated upstream information
   rec {
@@ -25,9 +25,9 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = ''A minimalistic X11 menu creator'';
-    license = stdenv.lib.licenses.free ; # 9menu derivative with 9menu license
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.free ; # 9menu derivative with 9menu license
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     homepage = "http://www.update.uu.se/~zrajm/programs/";
     downloadPage = "http://www.update.uu.se/~zrajm/programs/ratmen/";
     updateWalker = true;

pkgs/tools/X11/run-scaled/default.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     mkdir -p $out/bin
     cp run_scaled $out/bin
     wrapProgram $out/bin/run_scaled --prefix PATH ":" \
-      ${stdenv.lib.makeBinPath [ bc xorgserver xpra xrandr ]}
+      ${lib.makeBinPath [ bc xorgserver xpra xrandr ]}
   '';
 
   meta = with lib; {

pkgs/tools/X11/runningx/default.nix

@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, libX11 }:
+{ lib, stdenv, fetchurl, pkgconfig, libX11 }:
 
 stdenv.mkDerivation {
   pname = "runningx";
   version = "1.0";
-  
+
   src = fetchurl {
     url = "http://www.fiction.net/blong/programs/mutt/autoview/RunningX.c";
     sha256 = "1mikkhrx6jsx716041qdy3nwjac08pxxvxyq2yablm8zg9hrip0d";
@@ -27,8 +27,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.fiction.net/blong/programs/mutt/";
     description = "A program for testing if X is running";
-    license = stdenv.lib.licenses.free;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.romildo ];
+    license = lib.licenses.free;
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.romildo ];
   };
 }

pkgs/tools/X11/screen-message/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3 }:
+{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, gtk3 }:
 
 stdenv.mkDerivation rec {
   pname = "screen-message";
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.joachim-breitner.de/en/projects#screen-message";
     description = "Displays a short text fullscreen in an X11 window";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.fpletz ];
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.fpletz ];
+    platforms = lib.platforms.unix;
   };
 }

pkgs/tools/X11/setroot/default.nix

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libX11 imlib2 ]
-    ++ stdenv.lib.optional enableXinerama libXinerama;
+    ++ lib.optional enableXinerama libXinerama;
 
   buildFlags = [ "CC=cc" (if enableXinerama then "xinerama=1" else "xinerama=0") ] ;
 

pkgs/tools/X11/skippy-xd/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchgit, xorgproto, libX11, libXft, libXcomposite, libXdamage
+{lib, stdenv, fetchgit, xorgproto, libX11, libXft, libXcomposite, libXdamage
 , libXext, libXinerama, libjpeg, giflib, pkgconfig
 }:
 let
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = ''Expose-style compositing-based standalone window switcher'';
-    license = stdenv.lib.licenses.gpl2Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2Plus ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/X11/sselp/default.nix

@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, libX11 }:
+{ lib, stdenv, fetchurl, libX11 }:
 
 stdenv.mkDerivation rec {
   version = "0.2";
   pname = "sselp";
- 
+
   src = fetchurl {
     url = "https://dl.suckless.org/tools/${pname}-${version}.tar.gz";
     sha256 = "08mqp00lrh1chdrbs18qr0xv63h866lkmfj87kfscwdm1vn9a3yd";
   };
- 
+
   buildInputs = [ libX11 ];
 
   patchPhase = ''
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://tools.suckless.org/sselp";
     description = "Prints the X selection to stdout, useful in scripts";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [stdenv.lib.maintainers.magnetophon ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = [lib.maintainers.magnetophon ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/X11/virtualgl/default.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    platforms = stdenv.lib.platforms.linux;
+    platforms = lib.platforms.linux;
     inherit (virtualglLib.meta) license;
   };
 }

pkgs/tools/X11/wayv/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, libX11}:
+{lib, stdenv, fetchFromGitHub, libX11}:
 stdenv.mkDerivation rec {
   pname = "wayv";
   version = "0.3";
@@ -24,9 +24,9 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "A gesture control for X11";
-    license = stdenv.lib.licenses.gpl2Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2Plus ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     homepage = "https://github.com/mikemb/wayV";
   };
 }

pkgs/tools/X11/wmctrl/default.nix

@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , libX11
 , glib
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://sites.google.com/site/tstyblo/wmctrl";
     description = "CLI tool to interact with EWMH/NetWM compatible X Window Managers";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = with stdenv.lib.platforms; all;
-    maintainers = [ stdenv.lib.maintainers.Anton-Latukha ];
+    license = lib.licenses.gpl2;
+    platforms = with lib.platforms; all;
+    maintainers = [ lib.maintainers.Anton-Latukha ];
   };
 
 }

pkgs/tools/X11/xannotate/default.nix

@@ -1,8 +1,8 @@
-{stdenv, fetchFromBitbucket, libX11}:
+{lib, stdenv, fetchFromBitbucket, libX11}:
 stdenv.mkDerivation rec {
   pname = "xannotate";
   version = "20150301";
-  
+
   src = fetchFromBitbucket {
     owner = "blais";
     repo = pname;
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "A tool to scribble over X windows";
-    license = stdenv.lib.licenses.gpl2Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2Plus ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     homepage = "https://bitbucket.org/blais/xannotate";
   };
 }

pkgs/tools/X11/xautomation/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libpng, libX11, libXext, libXi, libXtst }:
+{ lib, stdenv, fetchurl, pkgconfig, libpng, libX11, libXext, libXi, libXtst }:
 
 let version = "1.09"; in
 stdenv.mkDerivation {
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://www.hoopajoo.net/projects/xautomation.html";
     description = "Control X from the command line for scripts, and do \"visual scraping\" to find things on the screen";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ vaibhavsagar ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ vaibhavsagar ];
+    platforms = with lib.platforms; linux;
   };
 }

pkgs/tools/X11/xbanish/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, libX11, libXi, libXt, libXfixes, libXext}:
+{lib, stdenv, fetchFromGitHub, libX11, libXi, libXt, libXfixes, libXext}:
 
 stdenv.mkDerivation rec {
   version = "1.7";
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
       The name comes from ratpoison's "banish" command that sends the cursor to the
       corner of the screen.
     '';
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [stdenv.lib.maintainers.choochootrain];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.bsd3;
+    maintainers = [lib.maintainers.choochootrain];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/X11/xbindkeys-config/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }:
+{ lib, stdenv, fetchurl, gtk, pkgconfig, procps, makeWrapper, ... }:
 
 stdenv.mkDerivation rec {
   pname = "xbindkeys-config";
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://packages.debian.org/source/xbindkeys-config";
     description = "Graphical interface for configuring xbindkeys";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [benley];
-    platforms = with stdenv.lib.platforms; linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [benley];
+    platforms = with lib.platforms; linux;
   };
 
   patches = [ ./xbindkeys-config-patch1.patch ];

pkgs/tools/X11/xbindkeys/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libX11, guile }:
+{ lib, stdenv, fetchurl, pkgconfig, libX11, guile }:
 
 let version = "1.8.7"; in
 stdenv.mkDerivation {
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://www.nongnu.org/xbindkeys/xbindkeys.html";
     description = "Launch shell commands with your keyboard or your mouse under X Window";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [viric];
+    platforms = with lib.platforms; linux;
   };
 }

pkgs/tools/X11/xbrightness/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, imake, gccmakedep
+{ lib, stdenv, fetchurl, imake, gccmakedep
 , libX11, libXaw, libXext, libXmu, libXpm, libXxf86vm  }:
 
 stdenv.mkDerivation {
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   meta = {
     description = "X11 brigthness and gamma software control";
     homepage = "http://shallowsky.com/software";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/X11/xchainkeys/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11 }:
+{ lib, stdenv, fetchurl, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "xchainkeys-0.11";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://henning-bekel.de/xchainkeys/";
     description = "A standalone X11 program to create chained key bindings";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.unix;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/tools/X11/xdg-utils/default.nix

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   # just needed when built from git
   buildInputs = [ libxslt docbook_xml_dtd_412 docbook_xsl xmlto w3m ];
 
-  postInstall = stdenv.lib.optionalString mimiSupport ''
+  postInstall = lib.optionalString mimiSupport ''
     cp ${mimisrc}/xdg-open $out/bin/xdg-open
   '' + ''
     sed  '2s#.#\

pkgs/tools/X11/xdotool/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }:
+{ lib, stdenv, fetchurl, pkgconfig, libX11, perl, libXtst, xorgproto, libXi, libXinerama, libxkbcommon }:
 
 stdenv.mkDerivation rec {
   pname = "xdotool";
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.semicomplete.com/projects/xdotool/";
     description = "Fake keyboard/mouse input, window management, and more";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [viric];
+    platforms = with lib.platforms; linux;
   };
 }

pkgs/tools/X11/xinput_calibrator/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }:
+{ lib, stdenv, fetchurl, libXi, xorgproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }:
 
 stdenv.mkDerivation rec {
   pname = "xinput_calibrator";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/tias/xinput_calibrator";
     description = "A generic touchscreen calibration program for X.Org";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.flosse ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.flosse ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/X11/xloadimage/default.nix

@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl
 , libX11
 , libXt
@@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libX11 libXt
-  ] ++ stdenv.lib.optionals withJpegSupport [
+  ] ++ lib.optionals withJpegSupport [
     libjpeg
-  ] ++ stdenv.lib.optionals withPngSupport [
+  ] ++ lib.optionals withPngSupport [
     libpng
-  ] ++ stdenv.lib.optionals withTiffSupport [
+  ] ++ lib.optionals withTiffSupport [
     libtiff
   ];
 
@@ -80,9 +80,9 @@ stdenv.mkDerivation rec {
       zoom, brightening/darkening and merging.
     '';
 
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ andrew-d ];
-    platforms = stdenv.lib.platforms.linux;  # arbitrary choice
+    maintainers = with lib.maintainers; [ andrew-d ];
+    platforms = lib.platforms.linux;  # arbitrary choice
   };
 }

pkgs/tools/X11/xmacro/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11, libXtst, xorgproto, libXi }:
+{ lib, stdenv, fetchurl, libX11, libXtst, xorgproto, libXi }:
 
 stdenv.mkDerivation rec {
   pname = "xmacro";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libX11 libXtst xorgproto libXi ];
 
   meta = {
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2;
   };
 }

pkgs/tools/X11/xmousepasteblock/default.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Middle mouse button primary X selection/clipboard paste disabler";
     homepage = "https://github.com/milaq/XMousePasteBlock";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     maintainers = [ maintainers.petercommand ];
   };
 }

pkgs/tools/X11/xnee/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, libX11, xorgproto, libXext, libXtst
+{ fetchurl, lib, stdenv, libX11, xorgproto, libXext, libXtst
 , gtk2, libXi, pkgconfig, texinfo }:
 
 stdenv.mkDerivation rec {
@@ -45,11 +45,11 @@ stdenv.mkDerivation rec {
          "macros", retype a file.
       '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     homepage = "https://www.gnu.org/software/xnee/";
 
-    maintainers = with stdenv.lib.maintainers; [ ];
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
   };
 }

pkgs/tools/X11/xpointerbarrier/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, xorg, fetchgit }:
+{ lib, stdenv, xorg, fetchgit }:
 stdenv.mkDerivation rec {
   pname = "xpointerbarrier";
   version = "18.06";
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://uninformativ.de/git/xpointerbarrier";
     description = "Create X11 pointer barriers around your working area";
-    license = stdenv.lib.licenses.mit;
-    maintainers = [ stdenv.lib.maintainers.xzfc ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.xzfc ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/X11/xpra/default.nix

@@ -97,7 +97,7 @@ in buildPythonApplication rec {
       --set XPRA_INSTALL_PREFIX "$out"
       --set XPRA_COMMAND "$out/bin/xpra"
       --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib
-      --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]}
+      --prefix PATH : ${lib.makeBinPath [ getopt xorgserver xauth which util-linux pulseaudio ]}
     )
   '';
 

pkgs/tools/X11/xprintidle-ng/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, gnulib
+{ lib, stdenv, fetchFromGitHub, libX11, libXScrnSaver, libXext, gnulib
   , autoconf, automake, libtool, gettext, pkgconfig
   , git, perl, texinfo, help2man
 }:
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
     inherit  version;
     description = ''A command-line tool to print idle time from libXss'';
     homepage = "http://taktoa.me/xprintidle-ng/";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/X11/xrestop/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xorg, pkgconfig, ncurses }:
+{ lib, stdenv, fetchurl, xorg, pkgconfig, ncurses }:
 stdenv.mkDerivation {
 
   pname = "xrestop";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   buildInputs = [ xorg.libX11 xorg.libXres xorg.libXext ncurses ];
 
   meta = {
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.gpl2;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.gpl2;
   };
 }

pkgs/tools/X11/xwinmosaic/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gtk2, cmake, pkgconfig, libXdamage }:
+{ lib, stdenv, fetchFromGitHub, gtk2, cmake, pkgconfig, libXdamage }:
 
 stdenv.mkDerivation rec {
   version = "0.4.2";
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = ''X window switcher drawing a colourful grid'';
-    license = stdenv.lib.licenses.bsd2 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.bsd2 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/X11/xzoom/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11, libXext, libXt, imake, gccmakedep}:
+{ lib, stdenv, fetchurl, libX11, libXext, libXt, imake, gccmakedep}:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
   meta = {
     inherit version;
     description = "An X11 screen zoom tool";
-    license = stdenv.lib.licenses.free ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.free ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/admin/daemontools/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, bash, glibc, stdenv }:
+{ fetchurl, bash, glibc, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "daemontools-0.76";
@@ -34,11 +34,11 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    license = stdenv.lib.licenses.publicDomain;
+    license = lib.licenses.publicDomain;
     homepage = "https://cr.yp.to/daemontools.html";
     description = "A collection of tools for managing UNIX services";
 
-    maintainers = with stdenv.lib.maintainers; [ kevincox ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = with lib.maintainers; [ kevincox ];
+    platforms = lib.platforms.unix;
   };
 }

pkgs/tools/admin/dehydrated/default.nix

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/bin
     cp -a dehydrated $out/bin
-    wrapProgram "$out/bin/dehydrated" --prefix PATH : "${stdenv.lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}"
+    wrapProgram "$out/bin/dehydrated" --prefix PATH : "${lib.makeBinPath [ openssl coreutils gnused gnugrep diffutils curl gawk ]}"
     '';
 
   meta = with lib; {

pkgs/tools/admin/docker-credential-helpers/default.nix

@@ -13,9 +13,9 @@ buildGoPackage rec {
     sha256 = "0xgmwjva3j1s0cqkbajbamj13bgzh5jkf2ir54m9a7w8gjnsh6dx";
   };
 
-  nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
+  nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
 
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ libsecret ];
+  buildInputs = lib.optionals stdenv.isLinux [ libsecret ];
 
   buildPhase =
     if stdenv.isDarwin

pkgs/tools/admin/exoscale-cli/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   pname = "exoscale-cli";
@@ -27,7 +27,7 @@ buildGoPackage rec {
   meta = {
     description = "Command-line tool for everything at Exoscale: compute, storage, dns";
     homepage    = "https://github.com/exoscale/cli";
-    license     = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ dramaturg ];
+    license     = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dramaturg ];
   };
 }

pkgs/tools/admin/fbvnc/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub}:
+{lib, stdenv, fetchFromGitHub}:
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "fbvnc";
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Framebuffer VNC client";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.bsd3;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
     homepage = "https://github.com/zohead/fbvnc/";
   };
 }

pkgs/tools/admin/gtk-vnc/default.nix

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "bin" "man" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
     sha256 = "1060ws037v556rx1qhfrcg02859rscksrzr8fq11himdg4d1y6m8";
   };
 

pkgs/tools/admin/lxd/default.nix

@@ -46,7 +46,7 @@ buildGoPackage rec {
     # test binaries, code generation
     rm $out/bin/{deps,macaroon-identity,generate}
 
-    wrapProgram $out/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath (
+    wrapProgram $out/bin/lxd --prefix PATH : ${lib.makeBinPath (
       networkPkgs
       ++ [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute bash criu ]
       ++ [ (writeShellScriptBin "apparmor_parser" ''

pkgs/tools/admin/procs/default.nix

@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "13wfz0ig9dsl0h085rzlrx0dg9la957c50xyzjfxq1ybw2qr266b";
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+  buildInputs = lib.optional stdenv.isDarwin Security;
 
   meta = with lib; {
     description = "A modern replacement for ps written in Rust";

pkgs/tools/admin/sec/default.nix

@@ -1,4 +1,4 @@
-{ fetchFromGitHub, perl, stdenv }:
+{ fetchFromGitHub, perl, lib, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "sec-${meta.version}";
@@ -23,10 +23,10 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://simple-evcorr.github.io";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     description = "Simple Event Correlator";
-    maintainers = [ stdenv.lib.maintainers.tv ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ lib.maintainers.tv ];
+    platforms = lib.platforms.all;
     version = "2.8.3";
   };
 }

pkgs/tools/admin/ssl-cert-check/default.nix

@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp $pname $out/bin/$pname
     wrapProgram $out/bin/$pname \
-      --set PATH "${stdenv.lib.makeBinPath buildInputs}"
+      --set PATH "${lib.makeBinPath buildInputs}"
   '';
 
   meta = with lib; {

pkgs/tools/admin/tigervnc/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , xorg, xkeyboard_config, zlib
 , libjpeg_turbo, pixman, fltk
 , fontDirectories
@@ -9,7 +9,7 @@
 , makeWrapper
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   version = "1.11.0";
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
     rm -f $out/lib/xorg/protocol.txt
 
     wrapProgram $out/bin/vncserver \
-      --prefix PATH : ${stdenv.lib.makeBinPath (with xorg; [ xterm twm xsetroot xauth ]) }
+      --prefix PATH : ${lib.makeBinPath (with xorg; [ xterm twm xsetroot xauth ]) }
   '';
 
   buildInputs = with xorg; [
@@ -100,10 +100,10 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://tigervnc.org/";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     description = "Fork of tightVNC, made in cooperation with VirtualGL";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with lib.maintainers; [viric];
+    platforms = with lib.platforms; linux;
     # Prevent a store collision.
     priority = 4;
   };

pkgs/tools/admin/tightvnc/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu
+{ lib, stdenv, fetchurl, xlibsWrapper, zlib, libjpeg, imake, gccmakedep, libXmu
 , libXaw, libXpm, libXp , perl, xauth, fontDirectories, openssh }:
 
 stdenv.mkDerivation {
@@ -68,7 +68,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     homepage = "http://vnc-tight.sourceforge.net/";
     description = "Improved version of VNC";
 
@@ -80,6 +80,6 @@ stdenv.mkDerivation {
     '';
 
     maintainers = [];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/tools/archivers/afio/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub } :
+{ lib, stdenv, fetchFromGitHub } :
 
 stdenv.mkDerivation rec {
   version = "2.5.2";
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/kholtman/afio";
     description = "Fault tolerant cpio archiver targeting backups";
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
     /*
      * Licensing is complicated due to the age of the code base, but
      * generally free. See the file ``afio_license_issues_v5.txt`` for
      * a comprehensive discussion.
      */
-    license = stdenv.lib.licenses.free;
+    license = lib.licenses.free;
   };
 }

pkgs/tools/archivers/atool/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, bash}:
+{lib, stdenv, fetchurl, perl, bash}:
 
 stdenv.mkDerivation {
   name = "atool-0.39.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://www.nongnu.org/atool";
     description = "Archive command line helper";
-    platforms = stdenv.lib.platforms.unix;
-    license = stdenv.lib.licenses.gpl3;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.gpl3;
   };
 }

pkgs/tools/archivers/gnutar/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, acl }:
+{ lib, stdenv, fetchurl, autoreconfHook, acl }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   # avoid retaining reference to CF during stdenv bootstrap
-  configureFlags = stdenv.lib.optionals stdenv.isDarwin [
+  configureFlags = lib.optionals stdenv.isDarwin [
     "gt_cv_func_CFPreferencesCopyAppValue=no"
     "gt_cv_func_CFLocaleCopyCurrent=no"
     "gt_cv_func_CFLocaleCopyPreferredLanguages=no"
@@ -24,19 +24,19 @@ stdenv.mkDerivation rec {
   # gnutar tries to call into gettext between `fork` and `exec`,
   # which is not safe on darwin.
   # see http://article.gmane.org/gmane.os.macosx.fink.devel/21882
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace src/system.c --replace '_(' 'N_('
   '';
 
   outputs = [ "out" "info" ];
 
   buildInputs = [ ]
-    ++ stdenv.lib.optional stdenv.isLinux acl
-    ++ stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+    ++ lib.optional stdenv.isLinux acl
+    ++ lib.optional stdenv.isDarwin autoreconfHook;
 
   # May have some issues with root compilation because the bootstrap tool
   # cannot be used as a login shell for now.
-  FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.isSunOS) "1";
+  FORCE_UNSAFE_CONFIGURE = lib.optionalString (stdenv.hostPlatform.system == "armv7l-linux" || stdenv.isSunOS) "1";
 
   preConfigure = if stdenv.isCygwin then ''
     sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
@@ -64,10 +64,10 @@ stdenv.mkDerivation rec {
       archives).
     '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = lib.platforms.all;
 
     priority = 10;
   };

pkgs/tools/archivers/innoextract/default.nix

@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake makeWrapper ];
 
   # we need unar to for multi-archive extraction
-  postFixup = stdenv.lib.optionalString withGog ''
+  postFixup = lib.optionalString withGog ''
     wrapProgram $out/bin/innoextract \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ unar ]}
+      --prefix PATH : ${lib.makeBinPath [ unar ]}
   '';
 
   meta = with lib; {

pkgs/tools/archivers/ndstool/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake }:
 
 stdenv.mkDerivation rec {
   pname = "ndstool";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://github.com/devkitPro/ndstool";
     description = "A tool to unpack and repack nds rom";
-    maintainers = [ stdenv.lib.maintainers.marius851000 ];
-    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.marius851000 ];
+    license = lib.licenses.gpl3;
   };
 }

pkgs/tools/archivers/p7zip/default.nix

@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
     # I think this is a typo and should be CXX? Either way let's kill it
     sed -i '/XX=\/usr/d' makefile.macosx_llvm_64bits
-  '' + stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+  '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
     substituteInPlace makefile.machine \
       --replace 'CC=gcc'  'CC=${stdenv.cc.targetPrefix}gcc' \
       --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++'
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     buildFlags=all3
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     cp makefile.macosx_llvm_64bits makefile.machine
   '';
 
@@ -41,13 +41,13 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
 
   meta = {
     homepage = "https://github.com/szcnick/p7zip";
     description = "A new p7zip fork with additional codecs and improvements (forked from https://sourceforge.net/projects/p7zip/)";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.raskin ];
     # RAR code is under non-free UnRAR license, but we remove it
     license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus;
   };

pkgs/tools/archivers/pxattr/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gcc }:
+{ lib, stdenv, fetchurl, gcc }:
 
 stdenv.mkDerivation {
   name = "pxattr-2.1.0";
@@ -18,8 +18,8 @@ stdenv.mkDerivation {
   meta = {
     homepage = "https://www.lesbonscomptes.com/pxattr/index.html";
     description = "Provides a single interface to extended file attributes";
-    maintainers = [ stdenv.lib.maintainers.vrthra ];
-    license = [ stdenv.lib.licenses.mit ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ lib.maintainers.vrthra ];
+    license = [ lib.licenses.mit ];
+    platforms = lib.platforms.unix;
   };
 }

pkgs/tools/archivers/runzip/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libzip, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, libzip, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "1.4";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A tool to convert filename encoding inside a ZIP archive";
-    license = stdenv.lib.licenses.bsd2 ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.bsd2 ;
+    maintainers = [lib.maintainers.raskin];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/archivers/s-tar/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "s-tar";
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
       Note that unpacking tar archives may be a security risk because star may overwrite existing files.
     '';
     homepage = "http://cdrtools.sourceforge.net/private/star.html";
-    license = stdenv.lib.licenses.cddl;
-    maintainers = [ stdenv.lib.maintainers.wucke13 ];
+    license = lib.licenses.cddl;
+    maintainers = [ lib.maintainers.wucke13 ];
     platforms = [ "x86_64-linux" ];
   };
 }

pkgs/tools/archivers/unzip/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , bzip2
 , enableNLS ? false, libnatspec
 }:
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
       name = "CVE-2019-13232-3.patch";
       sha256 = "1jvs7dkdqs97qnsqc6hk088alhv8j4c638k65dbib9chh40jd7pf";
     })
-  ] ++ stdenv.lib.optional enableNLS
+  ] ++ lib.optional enableNLS
     (fetchurl {
       url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-arch/unzip/files/unzip-6.0-natspec.patch?revision=1.1";
       name = "unzip-6.0-natspec.patch";
@@ -49,11 +49,11 @@ stdenv.mkDerivation {
     });
 
   nativeBuildInputs = [ bzip2 ];
-  buildInputs = [ bzip2 ] ++ stdenv.lib.optional enableNLS libnatspec;
+  buildInputs = [ bzip2 ] ++ lib.optional enableNLS libnatspec;
 
   makefile = "unix/Makefile";
 
-  NIX_LDFLAGS = "-lbz2" + stdenv.lib.optionalString enableNLS " -lnatspec";
+  NIX_LDFLAGS = "-lbz2" + lib.optionalString enableNLS " -lnatspec";
 
   buildFlags = [
     "generic"
@@ -74,7 +74,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.info-zip.org";
     description = "An extraction utility for archives compressed in .zip format";
-    license = stdenv.lib.licenses.free; # http://www.info-zip.org/license.html
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.free; # http://www.info-zip.org/license.html
+    platforms = lib.platforms.all;
   };
 }

pkgs/tools/archivers/wimlib/default.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = let
-    path = stdenv.lib.makeBinPath  [ cabextract cdrkit mtools ntfs3g syslinux ];
+    path = lib.makeBinPath  [ cabextract cdrkit mtools ntfs3g syslinux ];
   in ''
     for prog in $out/bin/*; do
       wrapProgram $prog --prefix PATH : ${path}

pkgs/tools/archivers/xarchive/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk2, pkgconfig }:
+{ lib, stdenv, fetchurl, gtk2, pkgconfig }:
 
 stdenv.mkDerivation rec {
   version = "0.2.8-6";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A GTK front-end for command line archiving tools";
-    maintainers = [ stdenv.lib.maintainers.domenkozar ];
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ lib.maintainers.domenkozar ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.all;
   };
 }

pkgs/tools/archivers/xarchiver/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, makeWrapper,
+{ lib, stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, makeWrapper,
   coreutils, zip, unzip, p7zip, unrar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -17,14 +17,14 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     wrapProgram $out/bin/xarchiver \
-    --prefix PATH : ${stdenv.lib.makeBinPath [ zip unzip p7zip unrar gnutar bzip2 gzip lhasa coreutils ]}
+    --prefix PATH : ${lib.makeBinPath [ zip unzip p7zip unrar gnutar bzip2 gzip lhasa coreutils ]}
   '';
 
   meta = {
     description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)";
     homepage = "https://github.com/ib/xarchiver";
-    maintainers = [ stdenv.lib.maintainers.domenkozar ];
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ lib.maintainers.domenkozar ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.all;
   };
 }

pkgs/tools/archivers/zip/default.nix

@@ -27,8 +27,8 @@ stdenv.mkDerivation {
 
   patches = if (enableNLS && !stdenv.isCygwin) then [ ./natspec-gentoo.patch.bz2 ] else [];
 
-  buildInputs = stdenv.lib.optional enableNLS libnatspec
-    ++ stdenv.lib.optional stdenv.isCygwin libiconv;
+  buildInputs = lib.optional enableNLS libnatspec
+    ++ lib.optional stdenv.isCygwin libiconv;
 
   meta = with lib; {
     description = "Compressor/archiver for creating and modifying zipfiles";

pkgs/tools/archivers/zpaq/zpaqd.nix

@@ -11,9 +11,9 @@ let
     sha256="0868lynb45lm79yvx5f10lj5h6bfv0yck8whcls2j080vmk3n7rk";
   };
 
-  compileFlags = stdenv.lib.concatStringsSep " " ([ "-O3" "-DNDEBUG" ]
-    ++ stdenv.lib.optional (stdenv.hostPlatform.isUnix) "-Dunix -pthread"
-    ++ stdenv.lib.optional (!stdenv.hostPlatform.isx86) "-DNOJIT");
+  compileFlags = lib.concatStringsSep " " ([ "-O3" "-DNDEBUG" ]
+    ++ lib.optional (stdenv.hostPlatform.isUnix) "-Dunix -pthread"
+    ++ lib.optional (!stdenv.hostPlatform.isx86) "-DNOJIT");
 in
 stdenv.mkDerivation {
   inherit (s) name version;

pkgs/tools/audio/acoustid-fingerprinter/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ qt4 taglib chromaprint ffmpeg ];
 
-  cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${stdenv.lib.getVersion taglib}" ];
+  cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${lib.getVersion taglib}" ];
 
   patches = [
     (fetchpatch {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://acoustid.org/fingerprinter";
     description = "Audio fingerprinting tool using chromaprint";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     maintainers = with maintainers; [ ehmry ];
     platforms = with platforms; linux;
   };

pkgs/tools/audio/beets/plugins/alternatives.nix

@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
   meta = {
     description = "Beets plugin to manage external files";
     homepage = "https://github.com/geigerzaehler/beets-alternatives";
-    maintainers = [ stdenv.lib.maintainers.aszlig ];
-    license = stdenv.lib.licenses.mit;
+    maintainers = [ lib.maintainers.aszlig ];
+    license = lib.licenses.mit;
   };
 }

pkgs/tools/audio/beets/plugins/copyartifacts.nix

@@ -28,6 +28,6 @@ pythonPackages.buildPythonApplication {
   meta = {
     description = "Beets plugin to move non-music files during the import process";
     homepage = "https://github.com/sbarakat/beets-copyartifacts";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
   };
 }

pkgs/tools/audio/beets/plugins/extrafiles.nix

@@ -25,6 +25,6 @@ pythonPackages.buildPythonApplication rec {
   meta = {
     homepage = "https://github.com/Holzhaus/beets-extrafiles";
     description = "A plugin for beets that copies additional files and directories during the import process";
-    license = stdenv.lib.licenses.mit;
+    license = lib.licenses.mit;
   };
 }

pkgs/tools/audio/bpm-tools/default.nix

@@ -10,7 +10,7 @@
 }:
 
 let
-  path = stdenv.lib.makeBinPath [ gnuplot sox flac id3v2 vorbis-tools ];
+  path = lib.makeBinPath [ gnuplot sox flac id3v2 vorbis-tools ];
 in
 stdenv.mkDerivation rec {
   pname = "bpm-tools";

pkgs/tools/audio/darkice/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchurl, pkgconfig
 , libjack2, alsaLib, libpulseaudio
 , faac, lame, libogg, libopus, libvorbis, libsamplerate
 }:
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://darkice.org/";
     description = "Live audio streamer";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ ikervagyok fpletz ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ ikervagyok fpletz ];
   };
 }

pkgs/tools/audio/gvolicon/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }:
+{ lib, stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }:
 
 stdenv.mkDerivation {
   name = "gvolicon-2014-04-28";
@@ -21,8 +21,8 @@ stdenv.mkDerivation {
   meta = {
     description = "A simple and lightweight volume icon that sits in your system tray";
     homepage = "https://github.com/Unia/gvolicon";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [ stdenv.lib.maintainers.bennofs ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.bennofs ];
   };
 }

pkgs/tools/audio/mididings/default.nix

@@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication {
     # so mididings knows where to look for config files
     ++ [ pyxdg ];
 
-  preBuild = with stdenv.lib.versions; ''
+  preBuild = with lib.versions; ''
     substituteInPlace setup.py \
       --replace boost_python "boost_python${major pythonPackages.python.version}${minor pythonPackages.python.version}"
   '';

pkgs/tools/audio/picotts/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt }:
 
 stdenv.mkDerivation {
   name = "picotts-unstable-2018-10-19";
@@ -15,9 +15,9 @@ stdenv.mkDerivation {
   meta = {
     description = "Text to speech voice sinthesizer from SVox";
     homepage = "https://github.com/naggety/picotts";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.canndrew ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.canndrew ];
+    platforms = lib.platforms.linux;
   };
 }
 

pkgs/tools/backup/automysqlbackup/default.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     cp automysqlbackup $out/bin/
     cp automysqlbackup.conf $out/etc/
 
-    wrapProgram $out/bin/automysqlbackup --prefix PATH : ${stdenv.lib.makeBinPath [ mysql mailutils pbzip2 pigz bzip2 gzip ]}
+    wrapProgram $out/bin/automysqlbackup --prefix PATH : ${lib.makeBinPath [ mysql mailutils pbzip2 pigz bzip2 gzip ]}
   '';
 
   meta = with lib; {

pkgs/tools/backup/bacula/default.nix

@@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]
-    ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
       CoreFoundation
       IOKit
     ]
     # acl relies on attr, which I can't get to build on darwin
-    ++ stdenv.lib.optional (!stdenv.isDarwin) acl;
+    ++ lib.optional (!stdenv.isDarwin) acl;
 
   configureFlags = [
     "--with-sqlite3=${sqlite.dev}"
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     "--with-logdir=/var/log/bacula"
     "--with-working-dir=/var/lib/bacula"
     "--mandir=\${out}/share/man"
-  ] ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "ac_cv_func_setpgrp_void=yes";
+  ] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "ac_cv_func_setpgrp_void=yes";
 
   installFlags = [
     "logdir=\${out}/logdir"

pkgs/tools/backup/bareos/default.nix

@@ -6,7 +6,7 @@
 
 assert sqlite != null || postgresql != null || libmysqlclient != null;
 
-with stdenv.lib;
+with lib;
 let
   withGlusterfs = "\${with_glusterfs_directory}";
 in

pkgs/tools/backup/borg/default.nix

@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
   ];
   buildInputs = [
     libb2 lz4 zstd openssl python3.pkgs.setuptools_scm
-  ] ++ stdenv.lib.optionals stdenv.isLinux [ acl ];
+  ] ++ lib.optionals stdenv.isLinux [ acl ];
   propagatedBuildInputs = with python3.pkgs; [
     cython llfuse
   ];

pkgs/tools/backup/btar/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, librsync }:
+{ lib, stdenv, fetchurl, librsync }:
 
 stdenv.mkDerivation rec {
   name = "btar-1.1.1";
@@ -13,9 +13,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Tar-compatible block-based archiver";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     homepage = "http://viric.name/cgi-bin/btar";
-    platforms = with stdenv.lib.platforms; all;
-    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with lib.platforms; all;
+    maintainers = with lib.maintainers; [viric];
   };
 }

pkgs/tools/backup/btrbk/default.nix

@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram $out/sbin/btrbk \
       --set PERL5LIB $PERL5LIB \
-      --prefix PATH ':' "${stdenv.lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}"
+      --prefix PATH ':' "${lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}"
   '';
 
   meta = with lib; {

pkgs/tools/backup/bup/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper
+{ lib, stdenv, fetchFromGitHub, makeWrapper
 , perl, pandoc, python3Packages, git
 , par2cmdline ? null, par2Support ? true
 }:
@@ -7,7 +7,7 @@ assert par2Support -> par2cmdline != null;
 
 let version = "0.31"; in
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation {
   pname = "bup";
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     git
     (python3Packages.python.withPackages
       (p: with p; [ setuptools tornado ]
-        ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))
+        ++ lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))
   ];
   nativeBuildInputs = [ pandoc perl makeWrapper ];
 

pkgs/tools/backup/bupstash/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
+{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
 rustPlatform.buildRustPackage rec {
   pname = "bupstash";
   version = "0.6.4";
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
     installManPage doc/man/*.[1-9]
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Easy and efficient encrypted backups";
     homepage = "https://bupstash.io";
     license = licenses.mit;

pkgs/tools/backup/burp/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ librsync ncurses openssl zlib uthash ]
-    ++ stdenv.lib.optional (!stdenv.isDarwin) acl;
+    ++ lib.optional (!stdenv.isDarwin) acl;
 
   configureFlags = [ "--localstatedir=/var" ];
 

pkgs/tools/backup/chunksync/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, perl }:
+{ lib, stdenv, fetchurl, openssl, perl }:
 
 stdenv.mkDerivation rec {
   version = "0.4";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Space-efficient incremental backups of large files or block devices";
     homepage = "http://chunksync.florz.de/";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = with stdenv.lib.platforms; linux;
+    license = lib.licenses.gpl2;
+    platforms = with lib.platforms; linux;
   };
 }

pkgs/tools/backup/dar/default.nix

@@ -1,11 +1,11 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
 , attr, e2fsprogs
 , curl, librsync, libthreadar
 , gpgme, libgcrypt, openssl
 , bzip2, lzo, xz, zlib
 }:
 
-with stdenv.lib;
+with lib;
 
 stdenv.mkDerivation rec {
   version = "2.6.13";

pkgs/tools/backup/dirvish/default.nix

@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Fast, disk based, rotating network backup system";
     homepage = "http://dirvish.org/";
-    license = stdenv.lib.licenses.osl2;
+    license = lib.licenses.osl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.winpat ];
   };

pkgs/tools/backup/duplicati/default.nix

@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
     cp -r * $out/share/${pname}-${version}
     makeWrapper "${mono}/bin/mono" $out/bin/duplicati-cli \
       --add-flags "$out/share/${pname}-${version}/Duplicati.CommandLine.exe" \
-      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
           sqlite ]}
     makeWrapper "${mono}/bin/mono" $out/bin/duplicati-server \
       --add-flags "$out/share/${pname}-${version}/Duplicati.Server.exe" \
-      --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
           sqlite ]}
   '';
 

pkgs/tools/backup/duplicity/default.nix

@@ -14,8 +14,8 @@
 , gettext
 }:
 let
-  inherit (stdenv.lib.versions) majorMinor splitVersion;
-  majorMinorPatch = v: builtins.concatStringsSep "." (stdenv.lib.take 3 (splitVersion v));
+  inherit (lib.versions) majorMinor splitVersion;
+  majorMinorPatch = v: builtins.concatStringsSep "." (lib.take 3 (splitVersion v));
 in
 pythonPackages.buildPythonApplication rec {
   pname = "duplicity";
@@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec {
     # Our Python infrastructure runs test in installCheckPhase so we need
     # to make the testing code stop assuming it is run from the source directory.
     ./use-installed-scripts-in-test.patch
-  ] ++ stdenv.lib.optionals stdenv.isLinux [
+  ] ++ lib.optionals stdenv.isLinux [
     ./linux-disable-timezone-test.patch
   ];
 
@@ -63,7 +63,7 @@ pythonPackages.buildPythonApplication rec {
     pycrypto
     pydrive
     future
-  ] ++ stdenv.lib.optionals (!isPy3k) [
+  ] ++ lib.optionals (!isPy3k) [
     enum
   ];
 
@@ -72,7 +72,7 @@ pythonPackages.buildPythonApplication rec {
     gnutar # Add 'tar' to PATH.
     librsync # Add 'rdiff' to PATH.
     par2cmdline # Add 'par2' to PATH.
-  ] ++ stdenv.lib.optionals stdenv.isLinux [
+  ] ++ lib.optionals stdenv.isLinux [
     util-linux # Add 'setsid' to PATH.
   ] ++ (with pythonPackages; [
     lockfile
@@ -84,7 +84,7 @@ pythonPackages.buildPythonApplication rec {
 
   postInstall = ''
     wrapProgram $out/bin/duplicity \
-      --prefix PATH : "${stdenv.lib.makeBinPath [ gnupg ncftp rsync ]}"
+      --prefix PATH : "${lib.makeBinPath [ gnupg ncftp rsync ]}"
   '';
 
   preCheck = ''
@@ -100,7 +100,7 @@ pythonPackages.buildPythonApplication rec {
 
     # Don't run developer-only checks (pep8, etc.).
     export RUN_CODE_TESTS=0
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  '' + lib.optionalString stdenv.isDarwin ''
     # Work around the following error when running tests:
     # > Max open files of 256 is too low, should be >= 1024.
     # > Use 'ulimit -n 1024' or higher to correct.

pkgs/tools/backup/duply/default.nix

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/share/man/man1"
     install -vD duply "$out/bin"
     wrapProgram "$out/bin/duply" --set PATH \
-        ${stdenv.lib.makeBinPath [ coreutils python2 duplicity gawk gnupg bash gnugrep txt2man which ]}
+        ${lib.makeBinPath [ coreutils python2 duplicity gawk gnupg bash gnugrep txt2man which ]}
     "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1"
   '';
 
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     homepage = "https://duply.net/";
     license = licenses.gpl2;
     maintainers = [ maintainers.bjornfor ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }

pkgs/tools/backup/httrack/default.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "09a0gm67nml86qby1k1gh7rdxamnrnzwr6l9r5iiq94favjs0xrl";
   };
 
-  buildInputs = [ zlib openssl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
+  buildInputs = [ zlib openssl ] ++ lib.optional stdenv.isDarwin libiconv;
 
   enableParallelBuilding = true;
 

pkgs/tools/backup/luckybackup/default.nix

@@ -1,9 +1,9 @@
-{ mkDerivation, stdenv, fetchurl
+{ mkDerivation, lib, stdenv, fetchurl
 , pkgconfig, libtool, qmake
 , rsync, ssh
 }:
 
-with stdenv.lib;
+with lib;
 mkDerivation rec {
   pname = "luckybackup";
   version = "0.5.0";
@@ -16,7 +16,7 @@ mkDerivation rec {
   buildInputs = [ rsync ssh ];
 
   nativeBuildInputs = [ pkgconfig libtool qmake ];
-  
+
   prePatch = ''
     for File in luckybackup.pro menu/luckybackup-pkexec \
         menu/luckybackup-su.desktop menu/luckybackup.desktop \
@@ -29,12 +29,12 @@ mkDerivation rec {
   meta = {
     description = "A powerful, fast and reliable backup & sync tool";
     longDescription = ''
-      luckyBackup is an application for data back-up and synchronization 
+      luckyBackup is an application for data back-up and synchronization
       powered by the rsync tool.
-      
+
       It is simple to use, fast (transfers over only changes made and not
       all data), safe (keeps your data safe by checking all declared directories
-      before proceeding in any data manipulation), reliable and fully 
+      before proceeding in any data manipulation), reliable and fully
       customizable.
     '';
     homepage = "http://luckybackup.sourceforge.net/";

pkgs/tools/backup/monolith/default.nix

@@ -19,9 +19,9 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "0s5mv8mymycz4ga4zh9kbrhwmhgl4j01pw1sdzxy49l9waryk9p3";
 
-  nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
-  buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ Security ];
+  nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
+  buildInputs = lib.optionals stdenv.isLinux [ openssl ]
+    ++ lib.optionals stdenv.isDarwin [ Security ];
 
   checkFlagsArray = [ "--skip=tests::cli" ];
 

pkgs/tools/backup/mt-st/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "mt-st-1.3";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
       Fork of the standard "mt" tool with additional Linux-specific IOCTLs.
     '';
     homepage = "https://github.com/iustin/mt-st";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.redvers ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.redvers ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/backup/mtx/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "mtx-1.3.12";
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
       specification.
     '';
     homepage = "https://sourceforge.net/projects/mtx/";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.redvers ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.redvers ];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/backup/mydumper/default.nix

@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, cmake, pkgconfig
 , glib, zlib, pcre, libmysqlclient, libressl }:
 
-let inherit (stdenv.lib) getDev; in
+let inherit (lib) getDev; in
 
 stdenv.mkDerivation rec {
   version = "0.9.5";

pkgs/tools/backup/partclone/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook
+{ lib, stdenv, fetchFromGitHub, autoreconfHook
 , pkgconfig, libuuid, e2fsprogs, nilfs-utils, ntfs3g
 }:
 
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [
-    e2fsprogs libuuid stdenv.cc.libc nilfs-utils ntfs3g 
-    (stdenv.lib.getOutput "static" stdenv.cc.libc)
+    e2fsprogs libuuid stdenv.cc.libc nilfs-utils ntfs3g
+    (lib.getOutput "static" stdenv.cc.libc)
   ];
 
   configureFlags = [
@@ -43,8 +43,8 @@ stdenv.mkDerivation rec {
       ext2 partition.
     '';
     homepage = "https://partclone.org";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [lib.maintainers.marcweber];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/backup/partimage/default.nix

@@ -1,4 +1,4 @@
-{stdenv
+{lib, stdenv
 , fetchurl
 , fetchpatch
 , bzip2
@@ -40,8 +40,8 @@ stdenv.mkDerivation {
   meta = {
     description = "Opensource disk backup software";
     homepage = "http://www.partimage.org";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [lib.maintainers.marcweber];
+    platforms = lib.platforms.linux;
   };
 }

pkgs/tools/backup/rdedup/default.nix

@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkgconfig llvmPackages.libclang clang ];
   buildInputs = [ openssl libsodium lzma ]
-    ++ (stdenv.lib.optional stdenv.isDarwin Security);
+    ++ (lib.optional stdenv.isDarwin Security);
 
   configurePhase = ''
     export LIBCLANG_PATH="${llvmPackages.libclang}/lib"

pkgs/tools/backup/rdiff-backup/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, python2Packages, librsync, gnused }:
+{lib, stdenv, fetchurl, python2Packages, librsync, gnused }:
 
 python2Packages.buildPythonApplication {
   name = "rdiff-backup-1.3.3";
@@ -17,7 +17,7 @@ python2Packages.buildPythonApplication {
   meta = {
     description = "Backup system trying to combine best a mirror and an incremental backup system";
     homepage = "http://rdiff-backup.nongnu.org/";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.all;
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.all;
   };
 }

pkgs/tools/backup/rdup/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, pcre }:
+{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, pcre }:
 
 stdenv.mkDerivation {
   pname = "rdup";
@@ -17,8 +17,8 @@ stdenv.mkDerivation {
   meta = {
     description = "The only backup program that doesn't make backups";
     homepage    = "https://github.com/miekg/rdup";
-    license    = stdenv.lib.licenses.gpl3;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
+    license    = lib.licenses.gpl3;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ sternenseemann ];
   };
 }