treewide: partially remove with lib from meta

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

maintainers/scripts/nixpkgs-lint.nix

@@ -28,10 +28,10 @@ stdenv.mkDerivation {
     wrapProgram $out/bin/nixpkgs-lint --set PERL5LIB $PERL5LIB
   '';
 
-  meta = with lib; {
-    maintainers = [ maintainers.eelco ];
+  meta = {
+    maintainers = [ lib.maintainers.eelco ];
     description = "A utility for Nixpkgs contributors to check Nixpkgs for common errors";
     mainProgram = "nixpkgs-lint";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }

nixos/modules/hardware/cpu/x86-msr.nix

@@ -107,7 +107,7 @@ in
     '';
   };
 
-  meta = with lib; {
-    maintainers = with maintainers; [ lorenzleutgeb ];
+  meta = {
+    maintainers = [ lib.maintainers.lorenzleutgeb ];
   };
 }

nixos/modules/hardware/raid/hpsa.nix

@@ -37,10 +37,10 @@ let
 
     dontStrip = true;
 
-    meta = with lib; {
+    meta = {
       description = "HP Smart Array CLI";
       homepage = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/";
-      license = licenses.unfreeRedistributable;
+      license = lib.licenses.unfreeRedistributable;
       platforms = [ "x86_64-linux" ];
       maintainers = [ ];
     };

nixos/modules/services/desktops/bamf.nix

@@ -1,8 +1,8 @@
 # Bamf
 { config, lib, pkgs, ... }:
 {
-  meta = with lib; {
-    maintainers = with lib.maintainers; [ ] ++ lib.teams.pantheon.members;
+  meta = {
+    maintainers = [ ] ++ lib.teams.pantheon.members;
   };
 
   ###### interface

nixos/modules/services/desktops/geoclue2.nix

@@ -296,7 +296,7 @@ in
     );
   };
 
-  meta = with lib; {
-    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
+  meta = {
+    maintainers = with lib.maintainers; [ ] ++ teams.pantheon.members;
   };
 }

nixos/modules/services/desktops/tumbler.nix

@@ -17,8 +17,8 @@ in
     (lib.mkRemovedOptionModule [ "services" "tumbler" "package" ] "")
   ];
 
-  meta = with lib; {
-    maintainers = with lib.maintainers; [ ] ++ lib.teams.pantheon.members;
+  meta = {
+    maintainers = [ ] ++ lib.teams.pantheon.members;
   };
 
   ###### interface

nixos/modules/services/desktops/zeitgeist.nix

@@ -7,8 +7,8 @@
 }:
 {
 
-  meta = with lib; {
-    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
+  meta = {
+    maintainers = with lib.maintainers; [ ] ++ teams.pantheon.members;
   };
 
   ###### interface

nixos/modules/services/hardware/sane_extra_backends/brscan4_etc_files.nix

@@ -65,11 +65,11 @@ stdenv.mkDerivation {
   dontStrip = true;
   dontPatchELF = true;
 
-  meta = with lib; {
+  meta = {
     description = "Brother brscan4 sane backend driver etc files";
     homepage = "http://www.brother.com";
-    platforms = platforms.linux;
-    license = licenses.unfree;
-    maintainers = with maintainers; [ jraygauthier ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.unfree;
+    maintainers = [ lib.maintainers.jraygauthier ];
   };
 }

nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix

@@ -73,11 +73,11 @@ stdenv.mkDerivation {
 
   dontInstall = true;
 
-  meta = with lib; {
+  meta = {
     description = "Brother brscan5 sane backend driver etc files";
     homepage = "https://www.brother.com";
-    platforms = platforms.linux;
-    license = licenses.unfree;
-    maintainers = with maintainers; [ mattchrist ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.unfree;
+    maintainers = [ lib.maintainers.mattchrist ];
   };
 }

nixos/modules/services/x11/display-managers/account-service-util.nix

@@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication {
     chmod +x $out/bin/set-session
   '';
 
-  meta = with lib; {
-    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
+  meta = {
+    maintainers = with lib.maintainers; [ ] ++ teams.pantheon.members;
   };
 }

pkgs/applications/editors/vim/plugins/nvim-treesitter/update-shell.nix

@@ -2,8 +2,6 @@
   pkgs ? import ../../../../../.. { },
 }:
 
-with pkgs;
-
 let
   inherit (vimPlugins) nvim-treesitter;
 

pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix

@@ -18,10 +18,10 @@ stdenv.mkDerivation {
   ];
   buildInputs = [ glib ];
 
-  meta = with lib; {
+  meta = {
     description = "Setup mount/user namespace for FHS emulation";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }

pkgs/build-support/docker/nix-prefetch-docker.nix

@@ -16,10 +16,10 @@ stdenv.mkDerivation {
 
   preferLocalBuild = true;
 
-  meta = with lib; {
+  meta = {
     description = "Script used to obtain source hashes for dockerTools.pullImage";
     mainProgram = "nix-prefetch-docker";
-    maintainers = with maintainers; [ offline ];
-    platforms = platforms.unix;
+    maintainers = [ lib.maintainers.offline ];
+    platforms = lib.platforms.unix;
   };
 }

pkgs/build-support/mitm-cache/default.nix

@@ -35,11 +35,11 @@ rustPlatform.buildRustPackage rec {
 
   passthru.fetch = callPackage ./fetch.nix { };
 
-  meta = with lib; {
+  meta = {
     description = "A MITM caching proxy for use in nixpkgs";
     homepage = "https://github.com/chayleaf/mitm-cache#readme";
-    license = licenses.mit;
-    maintainers = with maintainers; [ chayleaf ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.chayleaf ];
     mainProgram = "mitm-cache";
   };
 }

pkgs/build-support/node/fetch-npm-deps/default.nix

@@ -139,11 +139,11 @@
         };
       };
 
-    meta = with lib; {
+    meta = {
       description = "Prefetch dependencies from npm (for use with `fetchNpmDeps`)";
       mainProgram = "prefetch-npm-deps";
-      maintainers = with maintainers; [ winter ];
-      license = licenses.mit;
+      maintainers = [ lib.maintainers.winter ];
+      license = lib.licenses.mit;
     };
   };
 

pkgs/build-support/replace-secret/replace-secret.nix

@@ -25,10 +25,10 @@ stdenv.mkDerivation {
     $out/bin/replace-secret "and this" <(echo "b") short_test
     diff ${./test/expected_short_output} short_test
   '';
-  meta = with lib; {
-    platforms = platforms.all;
-    maintainers = with maintainers; [ talyz ];
-    license = licenses.mit;
+  meta = {
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.talyz ];
+    license = lib.licenses.mit;
     description = "Replace a string in one file with a secret from a second file";
     longDescription = ''
       Replace a string in one file with a secret from a second file.

pkgs/build-support/setup-hooks/patch-rc-path-hooks/default.nix

@@ -10,9 +10,9 @@ in
 {
   patchRcPathBash = makeSetupHook {
     name = "patch-rc-path-bash";
-    meta = with lib; {
+    meta = {
       description = "Setup-hook to inject source-time PATH prefix to a Bash/Ksh/Zsh script";
-      maintainers = with maintainers; [ ShamrockLee ];
+      maintainers = [ lib.maintainers.ShamrockLee ];
     };
     passthru.tests = {
       inherit (tests) test-bash;
@@ -23,19 +23,19 @@ in
     substitutions = {
       sed = "${gnused}/bin/sed";
     };
-    meta = with lib; {
+    meta = {
       description = "Setup-hook to inject source-time PATH prefix to a Csh script";
-      maintainers = with maintainers; [ ShamrockLee ];
+      maintainers = [ lib.maintainers.ShamrockLee ];
     };
     passthru.tests = {
       inherit (tests) test-csh;
     };
   } ./patch-rc-path-csh.sh;
   patchRcPathFish = makeSetupHook {
     name = "patch-rc-path-fish";
-    meta = with lib; {
+    meta = {
       description = "Setup-hook to inject source-time PATH prefix to a Fish script";
-      maintainers = with maintainers; [ ShamrockLee ];
+      maintainers = [ lib.maintainers.ShamrockLee ];
     };
     passthru.tests = {
       inherit (tests) test-fish;
@@ -46,9 +46,9 @@ in
     substitutions = {
       sed = "${gnused}/bin/sed";
     };
-    meta = with lib; {
+    meta = {
       description = "Setup-hook to inject source-time PATH prefix to a POSIX shell script";
-      maintainers = with maintainers; [ ShamrockLee ];
+      maintainers = [ lib.maintainers.ShamrockLee ];
     };
     passthru.tests = {
       inherit (tests) test-posix;

pkgs/build-support/trivial-builders/test/references/default.nix

@@ -3,7 +3,6 @@
   stdenvNoCC,
   testers,
   callPackage,
-  writeText,
   # nativeBuildInputs
   shellcheck-minimal,
   # Samples
@@ -92,7 +91,7 @@ let
         ;
     };
 
-    meta = with lib; {
+    meta = {
       mainProgram = "references-test";
     };
   });

pkgs/data/fonts/emojione/default.nix

@@ -57,10 +57,10 @@ stdenv.mkDerivation rec {
     install -Dm755 build/EmojiOneColor-SVGinOT.ttf $out/share/fonts/truetype/EmojiOneColor-SVGinOT.ttf
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Open source emoji set";
     homepage = "http://emojione.com/";
-    license = licenses.cc-by-40;
-    maintainers = with maintainers; [ abbradar ];
+    license = lib.licenses.cc-by-40;
+    maintainers = [ lib.maintainers.abbradar ];
   };
 }

pkgs/data/fonts/font-awesome/default.nix

@@ -28,16 +28,16 @@ let
         runHook postInstall
       '';
 
-      meta = with lib; {
+      meta = {
         description = "Font Awesome - OTF font";
         longDescription = ''
           Font Awesome gives you scalable vector icons that can instantly be customized.
           This package includes only the OTF font. For full CSS etc. see the project website.
         '';
         homepage = "https://fontawesome.com/";
-        license = licenses.ofl;
-        platforms = platforms.all;
-        maintainers = with maintainers; [
+        license = lib.licenses.ofl;
+        platforms = lib.platforms.all;
+        maintainers = with lib.maintainers; [
           abaldeau
           johnazoidberg
         ];

pkgs/data/fonts/iosevka/comfy.nix

@@ -57,16 +57,16 @@ let
 
             npmDepsHash = "sha256-xwGR21+CpZRFdZYz8SQrSf1tkp3fjGudoMmP5TGgEe8=";
 
-            meta = with lib; {
+            meta = {
               inherit (src.meta) homepage;
               description = ''
                 Customised build of the Iosevka typeface, with a consistent
                 rounded style and overrides for almost all individual glyphs
                 in both roman (upright) and italic (slanted) variants.
               '';
-              license = licenses.ofl;
+              license = lib.licenses.ofl;
               platforms = iosevka.meta.platforms;
-              maintainers = [ maintainers.DamienCassou ];
+              maintainers = [ lib.maintainers.DamienCassou ];
             };
           }
         );

pkgs/data/fonts/liberation-fonts/default.nix

@@ -42,7 +42,7 @@ let
         done
       '';
 
-      meta = with lib; {
+      meta = {
         description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New";
         longDescription = ''
           The Liberation Fonts are intended to be replacements for the three most
@@ -56,9 +56,9 @@ let
           Bitstream Vera Sans Mono).
         '';
 
-        license = licenses.ofl;
+        license = lib.licenses.ofl;
         homepage = "https://github.com/liberationfonts";
-        maintainers = with maintainers; [ raskin ];
+        maintainers = [ lib.maintainers.raskin ];
       };
     };
 in

pkgs/data/fonts/maple-font/default.nix

@@ -30,14 +30,14 @@ let
         find . -name '*.woff2'  -exec install -Dt $out/share/fonts/woff2 {} \;
       '';
 
-      meta = with lib; {
+      meta = {
         homepage = "https://github.com/subframe7536/Maple-font";
         description = ''
           Open source ${desc} font with round corner and ligatures for IDE and command line
         '';
-        license = licenses.ofl;
-        platforms = platforms.all;
-        maintainers = with maintainers; [ oluceps ];
+        license = lib.licenses.ofl;
+        platforms = lib.platforms.all;
+        maintainers = [ lib.maintainers.oluceps ];
       };
     };
 

pkgs/data/fonts/mplus-outline-fonts/default.nix

@@ -26,12 +26,12 @@ in
       runHook postInstall
     '';
 
-    meta = with lib; {
+    meta = {
       description = "M+ Outline Fonts (legacy OSDN release)";
       homepage = "https://mplus-fonts.osdn.jp";
-      maintainers = with maintainers; [ uakci ];
-      platforms = platforms.all;
-      license = licenses.mplus;
+      maintainers = [ lib.maintainers.uakci ];
+      platforms = lib.platforms.all;
+      license = lib.licenses.mplus;
     };
   };
 
@@ -56,12 +56,12 @@ in
       runHook postInstall
     '';
 
-    meta = with lib; {
+    meta = {
       description = "M+ Outline Fonts (GitHub release)";
       homepage = "https://mplusfonts.github.io";
-      maintainers = with maintainers; [ uakci ];
-      platforms = platforms.all;
-      license = licenses.ofl;
+      maintainers = [ lib.maintainers.uakci ];
+      platforms = lib.platforms.all;
+      license = lib.licenses.ofl;
     };
   };
 }