Merge staging-next into staging

pkgs/tools/misc/byobu/default.nix

@@ -3,7 +3,6 @@
 , gettext, vim, bc, screen }:
 
 let
-  inherit (stdenv) lib;
   pythonEnv = python3.withPackages (ps: with ps; [ snack ]);
 in
 stdenv.mkDerivation rec {

pkgs/tools/misc/loadlibrary/default.nix

@@ -5,7 +5,7 @@
 
 stdenv_32bit.mkDerivation rec {
   name = "loadlibrary-${version}";
-  version = "20170525-${stdenv_32bit.lib.strings.substring 0 7 rev}";
+  version = "20170525-${lib.strings.substring 0 7 rev}";
   rev = "721b084c088d779075405b7f20c77c2578e2a961";
   src = fetchFromGitHub {
     inherit rev;

pkgs/tools/misc/staruml/default.nix

@@ -4,7 +4,6 @@
 , libXdamage, expat }:
 
 let
-  inherit (stdenv) lib;
   LD_LIBRARY_PATH = lib.makeLibraryPath
     [ glib gtk2 gdk-pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage expat ];
 in

pkgs/tools/misc/yubikey-manager-qt/default.nix

@@ -1,4 +1,5 @@
-{ stdenv
+{ lib
+, stdenv
 , fetchurl
 , wrapQtAppsHook
 , pcsclite
@@ -16,8 +17,6 @@
 , yubikey-personalization
 }:
 
-let inherit (stdenv) lib; in
-
 stdenv.mkDerivation rec {
   pname = "yubikey-manager-qt";
   version = "1.1.5";