Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'

4 files changed, 12 insertions, 12 deletions

diff --git a/nixpkgs/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/nixpkgs/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
index 85749af0a561..7dc75f604265 100644
--- a/nixpkgs/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
+++ b/nixpkgs/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, fetchzip, mono }:
+{ lib, stdenv, buildEnv, fetchzip, mono }:
 
 let
   version = "0.12.0";
@@ -15,8 +15,8 @@ let
     meta = {
       description = "KeePass plugin to allow other programs to access SSH keys stored in a KeePass database for authentication";
       homepage    = "http://lechnology.com/software/keeagent";
-      platforms   = with stdenv.lib.platforms; linux;
-      license     = stdenv.lib.licenses.gpl2;
+      platforms   = with lib.platforms; linux;
+      license     = lib.licenses.gpl2;
       maintainers = [ ];
     };
 
diff --git a/nixpkgs/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/nixpkgs/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
index 10e6996873a0..be58f0e34cb3 100644
--- a/nixpkgs/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
+++ b/nixpkgs/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, fetchFromGitHub, mono }:
+{ lib, stdenv, buildEnv, fetchFromGitHub, mono }:
 
 let
   version = "1.8.4.2";
@@ -18,8 +18,8 @@ let
     meta = {
       description = "KeePass plugin to expose password entries securely (256bit AES/CBC) over HTTP";
       homepage    = "https://github.com/pfn/keepasshttp";
-      platforms   = with stdenv.lib.platforms; linux;
-      license     = stdenv.lib.licenses.gpl3;
+      platforms   = with lib.platforms; linux;
+      license     = lib.licenses.gpl3;
     };
 
     pluginFilename = "KeePassHttp.plgx";
diff --git a/nixpkgs/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/nixpkgs/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
index b28914a44a81..cbcb88b9d1a8 100644
--- a/nixpkgs/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
+++ b/nixpkgs/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, fetchurl, mono }:
+{ lib, stdenv, buildEnv, fetchurl, mono }:
 
 let
   version = "1.14.0";
@@ -10,7 +10,7 @@ let
       sha256 = "1c410cc93c0252e7cfdb02507b8172c13e18d12c97f08630b721d897dc9b8b24";
     };
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "The KeePassRPC plugin that needs to be installed inside KeePass in order for Kee to be able to connect your browser to your passwords";
       homepage    = "https://github.com/kee-org/keepassrpc";
       platforms   = [ "x86_64-linux" ];
diff --git a/nixpkgs/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix b/nixpkgs/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix
index e2b26eaee901..780de142c5fd 100644
--- a/nixpkgs/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix
+++ b/nixpkgs/pkgs/applications/misc/keepass-plugins/otpkeyprov/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, fetchzip, mono }:
+{ lib, stdenv, buildEnv, fetchzip, mono }:
 
 let
   version = "2.6";
@@ -15,9 +15,9 @@ let
     meta = {
       description = "OtpKeyProv is a key provider based on one-time passwords";
       homepage    = "https://keepass.info/plugins.html#otpkeyprov";
-      platforms   = with stdenv.lib.platforms; linux;
-      license     = stdenv.lib.licenses.gpl2;
-      maintainers = [ stdenv.lib.maintainers.ente ];
+      platforms   = with lib.platforms; linux;
+      license     = lib.licenses.gpl2;
+      maintainers = [ lib.maintainers.ente ];
     };
 
     pluginFilename = "OtpKeyProv.plgx";