treewide: remove meta = with pkgs.lib too

Signed-off-by: lucasew <[email protected]>

nixos/tests/bitcoind.nix

@@ -1,8 +1,8 @@
 import ./make-test-python.nix (
-  { pkgs, ... }:
+  { pkgs, lib, ... }:
   {
     name = "bitcoind";
-    meta = with pkgs.lib; {
+    meta = {
       maintainers = with lib.maintainers; [ _1000101 ];
     };
 

nixos/tests/blockbook-frontend.nix

@@ -1,8 +1,8 @@
 import ./make-test-python.nix (
-  { pkgs, ... }:
+  { pkgs, lib, ... }:
   {
     name = "blockbook-frontend";
-    meta = with pkgs.lib; {
+    meta = {
       maintainers = with lib.maintainers; [ _1000101 ];
     };
 

nixos/tests/borgbackup.nix

@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
 
 let
   passphrase = "supersecret";
@@ -40,7 +40,7 @@ let
 
 in {
   name = "borgbackup";
-  meta = with pkgs.lib; {
+  meta = {
     maintainers = with lib.maintainers; [ dotlambda ];
   };
 

nixos/tests/btrbk-doas.nix

@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
 
   let
     privateKey = ''
@@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
   in
   {
     name = "btrbk-doas";
-    meta = with pkgs.lib; {
+    meta = {
       maintainers = with lib.maintainers; [ symphorien tu-maurice ];
     };
 

nixos/tests/btrbk.nix

@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
 
   let
     privateKey = ''
@@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
   in
   {
     name = "btrbk";
-    meta = with pkgs.lib; {
+    meta = {
       maintainers = with lib.maintainers; [ symphorien ];
     };
 

nixos/tests/dokuwiki.nix

@@ -1,4 +1,4 @@
-import ./make-test-python.nix ({ pkgs, ... }:
+import ./make-test-python.nix ({ pkgs, lib, ... }:
 
 let
   template-bootstrap3 = pkgs.stdenv.mkDerivation rec {
@@ -90,7 +90,7 @@ let
   titleFile = pkgs.writeText "dokuwiki-title" "DokuWiki on site2";
 in {
   name = "dokuwiki";
-  meta = with pkgs.lib; {
+  meta = {
     maintainers = with lib.maintainers; [
       _1000101
       onny

nixos/tests/geth.nix

@@ -1,8 +1,8 @@
 import ./make-test-python.nix (
-  { pkgs, ... }:
+  { pkgs, lib, ... }:
   {
     name = "geth";
-    meta = with pkgs.lib; {
+    meta = {
       maintainers = with lib.maintainers; [ bachp ];
     };
 

nixos/tests/jibri.nix

@@ -1,8 +1,8 @@
 import ./make-test-python.nix (
-  { pkgs, ... }:
+  { pkgs, lib, ... }:
   {
     name = "jibri";
-    meta = with pkgs.lib; {
+    meta = {
       maintainers = lib.teams.jitsi.members;
     };
 

nixos/tests/jitsi-meet.nix

@@ -1,8 +1,8 @@
 import ./make-test-python.nix (
-  { pkgs, ... }:
+  { pkgs, lib, ... }:
   {
     name = "jitsi-meet";
-    meta = with pkgs.lib; {
+    meta = {
       maintainers = lib.teams.jitsi.members;
     };
 

nixos/tests/matrix/dendrite.nix

@@ -1,5 +1,5 @@
 import ../make-test-python.nix (
-  { pkgs, ... }:
+  { pkgs, lib, ... }:
   let
     homeserverUrl = "http://homeserver:8008";
 
@@ -9,7 +9,7 @@ import ../make-test-python.nix (
   in
   {
     name = "dendrite";
-    meta = with pkgs.lib; {
+    meta = {
       maintainers = lib.teams.matrix.members;
     };
 

nixos/tests/matrix/mjolnir.nix

@@ -1,5 +1,5 @@
 import ../make-test-python.nix (
-  { pkgs, ... }:
+  { pkgs, lib, ... }:
   let
     # Set up SSL certs for Synapse to be happy.
     runWithOpenSSL =
@@ -30,7 +30,7 @@ import ../make-test-python.nix (
   in
   {
     name = "mjolnir";
-    meta = with pkgs.lib; {
+    meta = {
       maintainers = lib.teams.matrix.members;
     };
 

nixos/tests/matrix/pantalaimon.nix

@@ -1,5 +1,5 @@
 import ../make-test-python.nix (
-  { pkgs, ... }:
+  { pkgs, lib, ... }:
   let
     pantalaimonInstanceName = "testing";
 
@@ -32,7 +32,7 @@ import ../make-test-python.nix (
   in
   {
     name = "pantalaimon";
-    meta = with pkgs.lib; {
+    meta = {
       maintainers = lib.teams.matrix.members;
     };
 

nixos/tests/matrix/synapse-workers.nix

@@ -1,8 +1,8 @@
 import ../make-test-python.nix (
-  { pkgs, ... }:
+  { pkgs, lib, ... }:
   {
     name = "matrix-synapse-workers";
-    meta = with pkgs.lib; {
+    meta = {
       maintainers = lib.teams.matrix.members;
     };
 

nixos/tests/matrix/synapse.nix

@@ -1,5 +1,5 @@
 import ../make-test-python.nix (
-  { pkgs, ... }:
+  { pkgs, lib, ... }:
   let
 
     ca_key = mailerCerts.ca.key;
@@ -54,7 +54,7 @@ import ../make-test-python.nix (
   {
 
     name = "matrix-synapse";
-    meta = with pkgs.lib; {
+    meta = {
       maintainers = lib.teams.matrix.members;
     };
 

nixos/tests/mosquitto.nix

@@ -59,7 +59,7 @@ import ./make-test-python.nix (
   in
   {
     name = "mosquitto";
-    meta = with pkgs.lib; {
+    meta = {
       maintainers = with lib.maintainers; [ peterhoeg ];
     };
 

nixos/tests/nats.nix

@@ -10,7 +10,7 @@ import ./make-test-python.nix (
   { pkgs, lib, ... }:
   {
     name = "nats";
-    meta = with pkgs.lib; {
+    meta = {
       maintainers = with lib.maintainers; [ c0deaddict ];
     };
 

nixos/tests/retroarch.nix

@@ -1,10 +1,14 @@
 import ./make-test-python.nix (
   { pkgs, ... }:
 
+  let
+    inherit (pkgs) lib;
+  in
+
   {
     name = "retroarch";
-    meta = with pkgs.lib; {
-      maintainers = lib.teams.libretro.members ++ [ maintainers.j0hax ];
+    meta = {
+      maintainers = lib.teams.libretro.members ++ [ lib.maintainers.j0hax ];
     };
 
     nodes.machine =

nixos/tests/sabnzbd.nix

@@ -1,8 +1,11 @@
 import ./make-test-python.nix (
   { pkgs, lib, ... }:
+  let
+    inherit (pkgs) lib;
+  in
   {
     name = "sabnzbd";
-    meta = with pkgs.lib; {
+    meta = {
       maintainers = with lib.maintainers; [ jojosch ];
     };
 

nixos/tests/trezord.nix

@@ -1,8 +1,8 @@
 import ./make-test-python.nix (
-  { pkgs, ... }:
+  { pkgs, lib, ... }:
   {
     name = "trezord";
-    meta = with pkgs.lib; {
+    meta = {
       maintainers = with lib.maintainers; [
         mmahut
         _1000101

nixos/tests/trickster.nix

@@ -1,8 +1,11 @@
 import ./make-test-python.nix (
   { pkgs, ... }:
+  let
+    inherit (pkgs) lib;
+  in
   {
     name = "trickster";
-    meta = with pkgs.lib; {
+    meta = {
       maintainers = with lib.maintainers; [ _1000101 ];
     };
 

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

@@ -1,5 +1,5 @@
 {
-  pkgs,
+  lib,
   fetchFromGitHub,
   python3Packages,
 }:
@@ -36,7 +36,7 @@ pythonPackages.buildPythonApplication rec {
     install -m644 README.rst "$out/share/doc/nvpy/README"
   '';
 
-  meta = with pkgs.lib; {
+  meta = {
     description = "Simplenote-syncing note-taking tool inspired by Notational Velocity";
     homepage = "https://github.com/cpbotha/nvpy";
     platforms = lib.platforms.linux;

pkgs/development/mobile/androidenv/default.nix

@@ -5,6 +5,10 @@
     config.android_sdk.accept_license or (builtins.getEnv "NIXPKGS_ACCEPT_ANDROID_SDK_LICENSE" == "1"),
 }:
 
+let
+  inherit (pkgs) lib;
+in
+
 rec {
   composeAndroidPackages = pkgs.callPackage ./compose-android-packages.nix {
     inherit licenseAccepted;
@@ -36,7 +40,7 @@ rec {
 
   test-suite = pkgs.callPackage ./test-suite.nix { };
 
-  meta = with pkgs.lib; {
+  meta = {
     description = "Android SDK & sdkmanager";
     homepage = "https://developer.android.com/tools/sdkmanager";
     maintainers = with lib.maintainers; [

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

@@ -1,5 +1,5 @@
 {
-  pkgs,
+  lib,
   buildPythonPackage,
   fetchPypi,
   astropy,
@@ -77,7 +77,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "astroquery" ];
 
-  meta = with pkgs.lib; {
+  meta = {
     description = "Functions and classes to access online data resources";
     homepage = "https://astroquery.readthedocs.io/";
     license = lib.licenses.bsd3;

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

@@ -1,5 +1,5 @@
 {
-  pkgs,
+  lib,
   buildPythonPackage,
   fetchPypi,
   python,
@@ -28,14 +28,14 @@ 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 = lib.licenses.mit;

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

@@ -1,5 +1,5 @@
 {
-  pkgs,
+  lib,
   buildPythonPackage,
   fetchPypi,
   azure-core,
@@ -32,7 +32,7 @@ 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 = lib.licenses.mit;

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

@@ -1,5 +1,5 @@
 {
-  pkgs,
+  lib,
   buildPythonPackage,
   fetchPypi,
   azure-nspkg,
@@ -20,7 +20,7 @@ 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 = lib.licenses.mit;

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

@@ -1,5 +1,5 @@
 {
-  pkgs,
+  lib,
   buildPythonPackage,
   django,
   fetchPypi,
@@ -32,7 +32,7 @@ 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";