treewide: remove remaining meta = with .*lib;

nixos/tests/bitcoind.nix

@@ -1,8 +1,8 @@
-{ pkgs, ... }:
+{ lib, ... }:
 {
   name = "bitcoind";
-  meta = with pkgs.lib; {
-    maintainers = with maintainers; [ _1000101 ];
+  meta = {
+    maintainers = with lib.maintainers; [ _1000101 ];
   };
 
   nodes.machine =

nixos/tests/blockbook-frontend.nix

@@ -1,8 +1,8 @@
 { pkgs, ... }:
 {
   name = "blockbook-frontend";
-  meta = with pkgs.lib; {
-    maintainers = with maintainers; [ _1000101 ];
+  meta = {
+    maintainers = with pkgs.lib.maintainers; [ _1000101 ];
   };
 
   nodes.machine =

nixos/tests/borgbackup.nix

@@ -42,8 +42,8 @@ let
 in
 {
   name = "borgbackup";
-  meta = with pkgs.lib; {
-    maintainers = with maintainers; [ dotlambda ];
+  meta = {
+    maintainers = with pkgs.lib.maintainers; [ dotlambda ];
   };
 
   nodes = {

nixos/tests/btrbk-doas.nix

@@ -16,8 +16,8 @@ let
 in
 {
   name = "btrbk-doas";
-  meta = with pkgs.lib; {
-    maintainers = with maintainers; [
+  meta = {
+    maintainers = with pkgs.lib.maintainers; [
       symphorien
       tu-maurice
     ];

nixos/tests/btrbk.nix

@@ -16,8 +16,8 @@ let
 in
 {
   name = "btrbk";
-  meta = with pkgs.lib; {
-    maintainers = with maintainers; [ symphorien ];
+  meta = {
+    maintainers = with pkgs.lib.maintainers; [ symphorien ];
   };
 
   nodes = {

nixos/tests/dokuwiki.nix

@@ -102,8 +102,8 @@ let
 in
 {
   name = "dokuwiki";
-  meta = with pkgs.lib; {
-    maintainers = with maintainers; [
+  meta = {
+    maintainers = with pkgs.lib.maintainers; [
       _1000101
       onny
       e1mo

nixos/tests/geth.nix

@@ -1,8 +1,8 @@
 { pkgs, ... }:
 {
   name = "geth";
-  meta = with pkgs.lib; {
-    maintainers = with maintainers; [ bachp ];
+  meta = {
+    maintainers = with pkgs.lib.maintainers; [ bachp ];
   };
 
   nodes.machine =

nixos/tests/jibri.nix

@@ -1,8 +1,8 @@
 { pkgs, ... }:
 {
   name = "jibri";
-  meta = with pkgs.lib; {
-    maintainers = teams.jitsi.members;
+  meta = {
+    maintainers = pkgs.lib.teams.jitsi.members;
   };
 
   nodes.machine =

nixos/tests/jitsi-meet.nix

@@ -1,8 +1,8 @@
 { pkgs, ... }:
 {
   name = "jitsi-meet";
-  meta = with pkgs.lib; {
-    maintainers = teams.jitsi.members;
+  meta = {
+    maintainers = pkgs.lib.teams.jitsi.members;
   };
 
   nodes = {

nixos/tests/matrix/dendrite.nix

@@ -8,8 +8,8 @@ let
 in
 {
   name = "dendrite";
-  meta = with pkgs.lib; {
-    maintainers = teams.matrix.members;
+  meta = {
+    maintainers = pkgs.lib.teams.matrix.members;
   };
 
   nodes = {

nixos/tests/matrix/pantalaimon.nix

@@ -31,8 +31,8 @@ let
 in
 {
   name = "pantalaimon";
-  meta = with pkgs.lib; {
-    maintainers = teams.matrix.members;
+  meta = {
+    maintainers = pkgs.lib.teams.matrix.members;
   };
 
   nodes.machine =

nixos/tests/mosquitto.nix

@@ -58,8 +58,8 @@ let
 in
 {
   name = "mosquitto";
-  meta = with pkgs.lib; {
-    maintainers = with maintainers; [ peterhoeg ];
+  meta = {
+    maintainers = with pkgs.lib.maintainers; [ peterhoeg ];
   };
 
   nodes =

nixos/tests/nats.nix

@@ -6,11 +6,11 @@ let
   topic = "foo.bar";
 
 in
-{ pkgs, lib, ... }:
+{ lib, ... }:
 {
   name = "nats";
-  meta = with pkgs.lib; {
-    maintainers = with maintainers; [ c0deaddict ];
+  meta = {
+    maintainers = with lib.maintainers; [ c0deaddict ];
   };
 
   nodes =

nixos/tests/retroarch.nix

@@ -2,8 +2,8 @@
 
 {
   name = "retroarch";
-  meta = with pkgs.lib; {
-    maintainers = teams.libretro.members ++ [ maintainers.j0hax ];
+  meta = {
+    maintainers = pkgs.lib.teams.libretro.members ++ [ pkgs.lib.maintainers.j0hax ];
   };
 
   nodes.machine =

nixos/tests/trezord.nix

@@ -1,8 +1,8 @@
 { pkgs, ... }:
 {
   name = "trezord";
-  meta = with pkgs.lib; {
-    maintainers = with maintainers; [
+  meta = {
+    maintainers = with pkgs.lib.maintainers; [
       mmahut
       _1000101
     ];

nixos/tests/trickster.nix

@@ -1,8 +1,8 @@
 { pkgs, ... }:
 {
   name = "trickster";
-  meta = with pkgs.lib; {
-    maintainers = with maintainers; [ _1000101 ];
+  meta = {
+    maintainers = with pkgs.lib.maintainers; [ _1000101 ];
   };
 
   nodes = {

pkgs/by-name/nv/nvpy/package.nix

@@ -1,5 +1,5 @@
 {
-  pkgs,
+  lib,
   fetchFromGitHub,
   python3Packages,
 }:
@@ -41,11 +41,11 @@ pythonPackages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "nvpy" ];
 
-  meta = with pkgs.lib; {
+  meta = {
     description = "Simplenote-syncing note-taking tool inspired by Notational Velocity";
     homepage = "https://github.com/cpbotha/nvpy";
-    platforms = platforms.linux;
-    license = licenses.bsd3;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.bsd3;
     mainProgram = "nvpy";
   };
 }

pkgs/development/python-modules/azure-mgmt-common/default.nix

@@ -1,5 +1,5 @@
 {
-  pkgs,
+  lib,
   buildPythonPackage,
   fetchPypi,
   python,
@@ -28,18 +28,18 @@ buildPythonPackage rec {
     msrestazure
   ];
 
-  postInstall = pkgs.lib.optionalString (!isPy3k) ''
+  postInstall = lib.optionalString (!isPy3k) ''
     echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/${python.sitePackages}"/azure/mgmt/__init__.py
     echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/${python.sitePackages}"/azure/__init__.py
   '';
 
   doCheck = false;
 
-  meta = with pkgs.lib; {
+  meta = {
     description = "This is the Microsoft Azure Resource Management common code";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       olcai
       maxwilson
     ];

pkgs/development/python-modules/azure-mgmt-core/default.nix

@@ -1,5 +1,5 @@
 {
-  pkgs,
+  lib,
   buildPythonPackage,
   fetchPypi,
   azure-core,
@@ -33,10 +33,10 @@ buildPythonPackage rec {
     "azure.core"
   ];
 
-  meta = with pkgs.lib; {
+  meta = {
     description = "Microsoft Azure Management Core Library for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }

pkgs/development/python-modules/azure-mgmt-nspkg/default.nix

@@ -1,5 +1,5 @@
 {
-  pkgs,
+  lib,
   buildPythonPackage,
   fetchPypi,
   azure-nspkg,
@@ -20,11 +20,11 @@ buildPythonPackage rec {
 
   doCheck = false;
 
-  meta = with pkgs.lib; {
+  meta = {
     description = "Microsoft Azure SDK for Python";
     homepage = "https://github.com/Azure/azure-sdk-for-python";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       olcai
       maxwilson
     ];

pkgs/development/python-modules/django-leaflet/default.nix

@@ -1,5 +1,5 @@
 {
-  pkgs,
+  lib,
   buildPythonPackage,
   django,
   fetchPypi,
@@ -32,11 +32,11 @@ buildPythonPackage rec {
   # This dosn't work either because of the same exception as above
   # pythonImportsCheck = [ "leaflet" ];
 
-  meta = with pkgs.lib; {
+  meta = {
     description = "Allows you to use Leaflet in your Django projects";
     homepage = "https://github.com/makinacorpus/django-leaflet";
     changelog = "https://github.com/makinacorpus/django-leaflet/blob/${version}/CHANGES";
-    license = licenses.lgpl3Only;
+    license = lib.licenses.lgpl3Only;
     maintainers = [ ];
   };
 }

pkgs/development/python-modules/dopy/default.nix

@@ -1,4 +1,5 @@
 {
+  lib,
   pkgs,
   buildPythonPackage,
   requests,
@@ -26,10 +27,10 @@ buildPythonPackage {
   doCheck = false;
   pythonImportsCheck = [ "dopy" ];
 
-  meta = with pkgs.lib; {
+  meta = {
     description = "Digital Ocean API python wrapper";
     homepage = "https://github.com/Wiredcraft/dopy";
-    license = licenses.mit;
-    maintainers = with maintainers; [ lihop ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ lihop ];
   };
 }

pkgs/development/python-modules/escapism/default.nix

@@ -1,5 +1,5 @@
 {
-  pkgs,
+  lib,
   buildPythonPackage,
   fetchPypi,
 }:
@@ -17,10 +17,10 @@ buildPythonPackage rec {
   # No tests distributed
   doCheck = false;
 
-  meta = with pkgs.lib; {
+  meta = {
     description = "Simple, generic API for escaping strings";
     homepage = "https://github.com/minrk/escapism";
-    license = licenses.mit;
-    maintainers = with maintainers; [ bzizou ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ bzizou ];
   };
 }

pkgs/development/python-modules/facebook-sdk/default.nix

@@ -1,5 +1,5 @@
 {
-  pkgs,
+  lib,
   buildPythonPackage,
   fetchPypi,
   requests,
@@ -25,10 +25,10 @@ buildPythonPackage rec {
     ${python.interpreter} test/test_facebook.py
   '';
 
-  meta = with pkgs.lib; {
+  meta = {
     description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK";
     homepage = "https://github.com/pythonforfacebook/facebook-sdk";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     maintainers = [ ];
   };
 }

pkgs/development/python-modules/opcua-widgets/default.nix

@@ -1,5 +1,5 @@
 {
-  pkgs,
+  lib,
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
@@ -31,10 +31,10 @@ buildPythonPackage rec {
   #This test is broken, when updating this package check if the test was fixed.
   doCheck = false;
 
-  meta = with pkgs.lib; {
+  meta = {
     description = "Common widgets for opcua-modeler og opcua-client-gui";
     homepage = "https://github.com/FreeOpcUa/opcua-widgets";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     maintainers = [ ];
   };
 }