treewide: remove remaining meta = with .*lib; (#470830)

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/applications/misc/plover/default.nix

@@ -16,7 +16,7 @@
       version = "4.0.2";
       format = "setuptools";
 
-      meta = with lib; {
+      meta = {
         broken = stdenv.hostPlatform.isDarwin;
         description = "OpenSteno Plover stenography software";
         maintainers = with lib.maintainers; [

pkgs/applications/networking/cluster/hadoop/containerExecutor.nix

@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     mv target/usr/local/bin $out/
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://hadoop.apache.org/";
     description = "Framework for distributed processing of large data sets across clusters of computers";
     license = lib.licenses.asl20;
@@ -45,6 +45,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
     maintainers = with lib.maintainers; [ illustris ];
-    platforms = filter (strings.hasSuffix "linux") (attrNames platformAttrs);
+    platforms = lib.filter (lib.strings.hasSuffix "linux") (lib.attrNames platformAttrs);
   };
 })

pkgs/applications/networking/remote/citrix-workspace/generic.nix

@@ -312,13 +312,13 @@ stdenv.mkDerivation rec {
     $out/opt/citrix-icaclient/util/ctx_rehash
   '';
 
-  meta = with lib; {
+  meta = {
     # webkitgtk_4_0 was removed
     broken = true;
     license = lib.licenses.unfree;
     description = "Citrix Workspace";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    platforms = [ "x86_64-linux" ] ++ optional (versionOlder version "24") "i686-linux";
+    platforms = [ "x86_64-linux" ] ++ lib.optional (lib.versionOlder version "24") "i686-linux";
     maintainers = with lib.maintainers; [ flacks ];
     inherit homepage;
   };

pkgs/applications/search/recoll/default.nix

@@ -197,7 +197,7 @@ mkDerivation rec {
 
   enableParallelBuilding = false; # XXX: -j44 tried linking befoire librecoll had been created
 
-  meta = with lib; {
+  meta = {
     description = "Full-text search tool";
     longDescription = ''
       Recoll is an Xapian frontend that can search through files, archive

pkgs/applications/video/vdr/wrapper.nix

@@ -26,9 +26,12 @@ symlinkJoin {
       --prefix XINE_PLUGIN_PATH ":" ${lib.escapeShellArg (makeXinePluginPath requiredXinePlugins)}
   '';
 
-  meta = with vdr.meta; {
-    inherit license homepage;
+  meta = {
+    inherit (vdr.meta) license homepage;
     description =
-      description + " (with plugins: " + lib.concatStringsSep ", " (map (x: "" + x.name) plugins) + ")";
+      vdr.meta.description
+      + " (with plugins: "
+      + lib.concatStringsSep ", " (map (x: "" + x.name) plugins)
+      + ")";
   };
 }

pkgs/by-name/ba/babl/package.nix

@@ -58,12 +58,12 @@ stdenv.mkDerivation (finalAttrs: {
     moveToOutput "share/doc" "$devdoc"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Image pixel format conversion library";
     mainProgram = "babl";
     homepage = "https://gegl.org/babl/";
     changelog = "https://gitlab.gnome.org/GNOME/babl/-/blob/BABL_${
-      replaceStrings [ "." ] [ "_" ] finalAttrs.version
+      lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version
     }/NEWS";
     license = lib.licenses.lgpl3Plus;
     maintainers = with lib.maintainers; [ jtojnar ];

pkgs/by-name/be/bencode/package.nix

@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/lib64
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Header-only C++20 bencode serialization/deserialization library";
     homepage = "https://github.com/fbdtemme/bencode";
     changelog = "https://github.com/fbdtemme/bencode/blob/${src.rev}/CHANGELOG.md";

pkgs/by-name/bu/burpsuite/package.nix

@@ -93,7 +93,7 @@ buildFHSEnv {
 
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     inherit description;
     longDescription = ''
       Burp Suite is an integrated platform for performing security testing of web applications.
@@ -104,7 +104,7 @@ buildFHSEnv {
     homepage = "https://portswigger.net/burp/";
     changelog =
       "https://portswigger.net/burp/releases/professional-community-"
-      + replaceStrings [ "." ] [ "-" ] version;
+      + lib.replaceStrings [ "." ] [ "-" ] version;
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.unfree;
     platforms = jdk.meta.platforms;

pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix

@@ -118,7 +118,7 @@ buildPythonPackage rec {
     "tests/hazmat/backends/test_openssl_memleak.py"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Package which provides cryptographic recipes and primitives";
     longDescription = ''
       Cryptography includes both high level recipes and low level interfaces to
@@ -129,7 +129,7 @@ buildPythonPackage rec {
     '';
     homepage = "https://github.com/pyca/cryptography";
     changelog =
-      "https://cryptography.io/en/latest/changelog/#v" + replaceStrings [ "." ] [ "-" ] version;
+      "https://cryptography.io/en/latest/changelog/#v" + lib.replaceStrings [ "." ] [ "-" ] version;
     license = with lib.licenses; [
       asl20
       bsd3

pkgs/by-name/co/comixcursors/package.nix

@@ -116,10 +116,10 @@ stdenvNoCC.mkDerivation rec {
   # attributes are used to choose which variant(s) to have.
   outputsToInstall = [ ];
 
-  meta = with lib; {
+  meta = {
     description = "Comix Cursors mouse themes";
     longDescription = ''
-      There are many (${toString ((length outputs) - 1)}) variants of color,
+      There are many (${toString ((lib.length outputs) - 1)}) variants of color,
       opacity, edge thickness, and right- or left-handedness, for this cursor
       theme.  This package's derivation has an output for each of these
       variants, named following the upstream convention, and the attribute for

pkgs/by-name/dm/dmtcp/package.nix

@@ -40,7 +40,7 @@ stdenv.mkDerivation {
       --replace "os.getenv('USER')" "\"nixbld1\""
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Distributed MultiThreaded Checkpointing";
     longDescription = ''
       DMTCP (Distributed MultiThreaded Checkpointing) is a tool to
@@ -50,6 +50,6 @@ stdenv.mkDerivation {
     '';
     homepage = "http://dmtcp.sourceforge.net/";
     license = lib.licenses.lgpl3Plus; # most files seem this or LGPL-2.1+
-    platforms = intersectLists lib.platforms.linux lib.platforms.x86; # broken on ARM and Darwin
+    platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86; # broken on ARM and Darwin
   };
 }

pkgs/by-name/fa/fasmg/package.nix

@@ -85,12 +85,12 @@ stdenv.mkDerivation rec {
     nix-update fasmg --version "$version"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF";
     mainProgram = "fasmg";
     homepage = "https://flatassembler.net";
     license = lib.licenses.bsd3;
     maintainers = [ ];
-    platforms = with lib.platforms; intersectLists (linux ++ darwin) x86;
+    platforms = with lib.platforms; lib.intersectLists (linux ++ darwin) x86;
   };
 }

pkgs/by-name/gi/giac/package.nix

@@ -220,11 +220,11 @@ stdenv.mkDerivation rec {
     done;
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Free computer algebra system (CAS)";
     homepage = "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html";
     license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux ++ (optionals (!enableGUI) lib.platforms.darwin);
+    platforms = lib.platforms.linux ++ (lib.optionals (!enableGUI) lib.platforms.darwin);
     maintainers = [ lib.maintainers.symphorien ];
   };
 }

pkgs/by-name/gl/glide-media-player/package.nix

@@ -63,13 +63,13 @@ stdenv.mkDerivation rec {
     glib-networking
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Linux/macOS media player based on GStreamer and GTK";
     homepage = "https://philn.github.io/glide";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ aleksana ];
     mainProgram = "glide";
     # Required gdk4-{wayland,x11} and gstreamer-gl not available on darwin
-    platforms = subtractLists lib.platforms.darwin lib.platforms.unix;
+    platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix;
   };
 }

pkgs/by-name/gr/grass-sass/package.nix

@@ -18,11 +18,11 @@ rustPlatform.buildRustPackage rec {
   # tests require rust nightly
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Sass compiler written purely in Rust";
     homepage = "https://github.com/connorskees/grass";
     changelog = "https://github.com/connorskees/grass/blob/master/CHANGELOG.md#${
-      replaceStrings [ "." ] [ "" ] version
+      lib.replaceStrings [ "." ] [ "" ] version
     }";
     license = lib.licenses.mit;
     maintainers = [ ];

pkgs/by-name/gv/gvfs/package.nix

@@ -159,9 +159,9 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description =
-      "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)";
+      "Virtual Filesystem support library" + lib.optionalString gnomeSupport " (full GNOME support)";
     license = lib.licenses.lgpl2Plus;
     platforms = lib.platforms.unix;
     teams = [ lib.teams.gnome ];

pkgs/by-name/jo/joypixels/package.nix

@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Finest emoji you can use legally (formerly EmojiOne)";
     longDescription = ''
       Updated for 2024! JoyPixels 9.0 includes 3,820 originally crafted icon

pkgs/by-name/nr/nrf-command-line-tools/package.nix

@@ -70,11 +70,11 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Nordic Semiconductor nRF Command Line Tools";
     homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Command-Line-Tools";
     license = lib.licenses.unfree;
-    platforms = attrNames supported;
+    platforms = lib.attrNames supported;
     maintainers = with lib.maintainers; [ stargate01 ];
   };
 }

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/by-name/pg/pgbouncer/package.nix

@@ -33,12 +33,12 @@ stdenv.mkDerivation rec {
     pgbouncer = nixosTests.pgbouncer;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.pgbouncer.org/";
     mainProgram = "pgbouncer";
     description = "Lightweight connection pooler for PostgreSQL";
     changelog = "https://github.com/pgbouncer/pgbouncer/releases/tag/pgbouncer_${
-      replaceStrings [ "." ] [ "_" ] version
+      lib.replaceStrings [ "." ] [ "_" ] version
     }";
     license = lib.licenses.isc;
     maintainers = with lib.maintainers; [ _1000101 ];

pkgs/by-name/po/polkadot/package.nix

@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec {
   PROTOC = "${protobuf}/bin/protoc";
   ROCKSDB_LIB_DIR = "${rocksdb}/lib";
 
-  meta = with lib; {
+  meta = {
     description = "Implementation of a https://polkadot.network node in Rust based on the Substrate framework";
     homepage = "https://github.com/paritytech/polkadot-sdk";
     license = lib.licenses.gpl3Only;
@@ -83,7 +83,7 @@ rustPlatform.buildRustPackage rec {
       RaghavSood
     ];
     # See Iso::from_arch in src/isa/mod.rs in cranelift-codegen-meta.
-    platforms = intersectLists lib.platforms.unix (
+    platforms = lib.intersectLists lib.platforms.unix (
       lib.platforms.aarch64 ++ lib.platforms.s390x ++ lib.platforms.riscv64 ++ lib.platforms.x86
     );
   };

pkgs/by-name/ro/root/tests/test-thisroot.nix

@@ -9,9 +9,9 @@
 }:
 runCommand "test-thisroot"
   {
-    meta = with lib; {
+    meta = {
       description = "Test for root thisroot.* sourcing";
-      maintainers = unique ((with lib.maintainers; [ ShamrockLee ]) ++ root.meta.maintainers);
+      maintainers = lib.unique ((with lib.maintainers; [ ShamrockLee ]) ++ root.meta.maintainers);
     };
   }
   ''

pkgs/by-name/sa/saleae-logic/package.nix

@@ -126,12 +126,12 @@ stdenv.mkDerivation rec {
     cp Drivers/99-SaleaeLogic.rules "$out/etc/udev/rules.d/"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Software for Saleae logic analyzers";
     homepage = "https://www.saleae.com/";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
-    platforms = intersectLists lib.platforms.x86_64 lib.platforms.linux;
+    platforms = lib.intersectLists lib.platforms.x86_64 lib.platforms.linux;
     maintainers = [ lib.maintainers.bjornfor ];
   };
 }

pkgs/by-name/si/simde/package.nix

@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
     ninja
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://simd-everywhere.github.io";
     description = "Implementations of SIMD instruction sets for systems which don't natively support them";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ whiteley ];
-    platforms = flatten (
+    platforms = lib.flatten (
       with lib.platforms;
       [
         arm

pkgs/by-name/si/singular/package.nix

@@ -190,12 +190,12 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "CAS for polynomial computations";
     teams = [ lib.teams.sage ];
     # 32 bit x86 fails with some link error: `undefined reference to `__divmoddi4@GCC_7.0.0'`
     # https://www.singular.uni-kl.de:8002/trac/ticket/837
-    platforms = subtractLists lib.platforms.i686 lib.platforms.unix;
+    platforms = lib.subtractLists lib.platforms.i686 lib.platforms.unix;
     license = lib.licenses.gpl3; # Or GPLv2 at your option - but not GPLv4
     homepage = "https://www.singular.uni-kl.de";
     downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/";

pkgs/by-name/so/solana-cli/package.nix

@@ -109,17 +109,17 @@ rustPlatform.buildRustPackage rec {
   # If set, always finds OpenSSL in the system, even if the vendored feature is enabled.
   OPENSSL_NO_VENDOR = 1;
 
-  meta = with lib; {
+  meta = {
     description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces";
     homepage = "https://solana.com";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       netfox
       happysalada
       aikooo7
       JacoMalan1
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 
   passthru.updateScript = nix-update-script { };

pkgs/by-name/so/solo5/package.nix

@@ -89,11 +89,11 @@ stdenv.mkDerivation {
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Sandboxed execution environment";
     homepage = "https://github.com/solo5/solo5";
     license = lib.licenses.isc;
-    platforms = mapCartesianProduct ({ arch, os }: "${arch}-${os}") {
+    platforms = lib.mapCartesianProduct ({ arch, os }: "${arch}-${os}") {
       arch = [
         "aarch64"
         "x86_64"

pkgs/by-name/st/string-machine/package.nix

@@ -49,11 +49,11 @@ stdenv.mkDerivation {
     "PREFIX=$(out)"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/jpcima/string-machine";
     description = "Digital model of electronic string ensemble instrument";
     maintainers = [ lib.maintainers.magnetophon ];
-    platforms = intersectLists lib.platforms.linux lib.platforms.x86;
+    platforms = lib.intersectLists lib.platforms.linux lib.platforms.x86;
     license = lib.licenses.boost;
   };
 }

pkgs/by-name/ta/tabnine/package.nix

@@ -43,11 +43,11 @@ stdenv.mkDerivation {
     updateScript = ./update.sh;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://tabnine.com";
     description = "Smart Compose for code that uses deep learning to help you write code faster";
     license = lib.licenses.unfree;
-    platforms = attrNames sources.platforms;
+    platforms = lib.attrNames sources.platforms;
     maintainers = with lib.maintainers; [ lovesegfault ];
   };
 }

pkgs/by-name/tc/tcb/package.nix

@@ -44,7 +44,7 @@ stdenv.mkDerivation {
     makeFlagsArray+=("CC=$CC")
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Alternative password shadowing scheme";
     longDescription = ''
       The tcb package contains core components of our tcb suite implementing the alternative
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
     '';
     homepage = "https://www.openwall.com/tcb/";
     license = lib.licenses.bsd3;
-    platforms = systems.inspect.patterns.isGnu;
+    platforms = lib.systems.inspect.patterns.isGnu;
     maintainers = with lib.maintainers; [ izorkin ];
   };
 }

pkgs/by-name/te/tela-icon-theme/package.nix

@@ -49,13 +49,13 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Flat colorful Design icon theme";
     homepage = "https://github.com/vinceliuice/tela-icon-theme";
     changelog = "https://github.com/vinceliuice/Tela-icon-theme/releases/tag/${src.rev}";
     license = lib.licenses.gpl3Only;
     # darwin systems use case-insensitive filesystems that cause hash mismatches
-    platforms = subtractLists lib.platforms.darwin lib.platforms.unix;
+    platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix;
     maintainers = [ ];
   };
 }

pkgs/by-name/ut/ut1999/package.nix

@@ -197,10 +197,10 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Unreal Tournament GOTY (1999) with the OldUnreal patch";
     license = lib.licenses.unfree;
-    platforms = attrNames srcs;
+    platforms = lib.attrNames srcs;
     maintainers = with lib.maintainers; [
       eliandoran
       dwt

pkgs/by-name/vg/vgmstream/package.nix

@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Library for playback of various streamed audio formats used in video games";
     homepage = "https://vgmstream.org";
     maintainers = with lib.maintainers; [ zane ];
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
         isc # vgmstream itself
         mit # atrac9
       ]
-      ++ optional (stdenv.system == "x86_64-linux") bsd2;
+      ++ lib.optional (stdenv.system == "x86_64-linux") bsd2;
     platforms = with lib.platforms; unix;
   };
 })

pkgs/by-name/wa/wayfarer/package.nix

@@ -55,12 +55,12 @@ stdenv.mkDerivation (finalAttrs: {
     pipewire
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Screen recorder for GNOME / Wayland / pipewire";
     homepage = "https://github.com/stronnag/wayfarer";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ fgaz ];
     mainProgram = "wayfarer";
-    platforms = subtractLists lib.platforms.darwin lib.platforms.unix;
+    platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix;
   };
 })

pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix

@@ -58,13 +58,13 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing";
     description = "More Linux packaging friendly copy of the AudioProcessing module from the WebRTC project";
     license = lib.licenses.bsd3;
     # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/v0.3.1/webrtc/typedefs.h
     # + our patches
-    platforms = intersectLists lib.platforms.unix (
+    platforms = lib.intersectLists lib.platforms.unix (
       lib.platforms.arm
       ++ lib.platforms.aarch64
       ++ lib.platforms.mips

pkgs/by-name/we/webrtc-audio-processing_1/package.nix

@@ -55,12 +55,12 @@ stdenv.mkDerivation rec {
     NIX_CFLAGS_COMPILE = "-msse2";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing";
     description = "More Linux packaging friendly copy of the AudioProcessing module from the WebRTC project";
     license = lib.licenses.bsd3;
     platforms =
-      intersectLists
+      lib.intersectLists
         # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/meson.build
         (lib.platforms.darwin ++ lib.platforms.linux ++ lib.platforms.windows)
         # https://gitlab.freedesktop.org/pulseaudio/webrtc-audio-processing/-/blob/master/webrtc/rtc_base/system/arch.h

pkgs/by-name/wi/wireguard-vanity-keygen/package.nix

@@ -23,10 +23,10 @@ buildGoModule rec {
     "-X main.appVersion=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     changelog =
       let
-        versionWithoutDots = concatStrings (splitString "." version);
+        versionWithoutDots = lib.concatStrings (lib.splitString "." version);
       in
       "https://github.com/axllent/wireguard-vanity-keygen/blob/develop/CHANGELOG.md#${versionWithoutDots}";
     description = "WireGuard vanity key generator";

pkgs/by-name/wl/wlr-layout-ui/package.nix

@@ -30,12 +30,12 @@ python3.pkgs.buildPythonApplication rec {
     install -Dm644 files/wlr-layout-ui.desktop $out/share/applications/wlr-layout-ui.desktop
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple GUI to setup the screens layout on wlroots based systems";
     homepage = "https://github.com/fdev31/wlr-layout-ui/";
     maintainers = with lib.maintainers; [ bnlrnz ];
     license = lib.licenses.mit;
     mainProgram = "wlrlui";
-    platforms = subtractLists lib.platforms.darwin lib.platforms.unix;
+    platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix;
   };
 }

pkgs/by-name/xd/xdgmenumaker/package.nix

@@ -55,13 +55,13 @@ python3Packages.buildPythonApplication rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "Command line tool that generates XDG menus for several window managers";
     mainProgram = "xdgmenumaker";
     homepage = "https://github.com/gapan/xdgmenumaker";
     license = lib.licenses.gpl3Plus;
     # NOTE: exclude darwin from platforms because Travis reports hash mismatch
-    platforms = with lib.platforms; filter (x: !(elem x darwin)) unix;
+    platforms = with lib.platforms; lib.filter (x: !(lib.elem x darwin)) unix;
     maintainers = [ lib.maintainers.romildo ];
   };
 }

pkgs/by-name/yo/yourkit-java/package.nix

@@ -91,13 +91,13 @@ stdenvNoCC.mkDerivation {
 
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Award winning, fully featured low overhead profiler for Java EE and Java SE platforms";
     homepage = "https://www.yourkit.com";
     changelog = "https://www.yourkit.com/changes/";
     license = lib.licenses.unfree;
     mainProgram = "yourkit-java-profiler";
-    platforms = attrNames arches;
+    platforms = lib.attrNames arches;
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     maintainers = with lib.maintainers; [ herberteuler ];
   };

pkgs/by-name/ze/zeroad-unwrapped/package.nix

@@ -162,7 +162,7 @@ stdenv.mkDerivation rec {
     install -D build/resources/0ad.desktop $out/share/applications/0ad.desktop
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Free, open-source game of ancient warfare";
     homepage = "https://play0ad.com/";
     license = with lib.licenses; [
@@ -173,7 +173,7 @@ stdenv.mkDerivation rec {
       lib.licenses.zlib # otherwise masked by pkgs.zlib
     ];
     maintainers = with lib.maintainers; [ chvp ];
-    platforms = subtractLists lib.platforms.i686 lib.platforms.linux;
+    platforms = lib.subtractLists lib.platforms.i686 lib.platforms.linux;
     mainProgram = "0ad";
   };
 }

pkgs/desktops/gnome/extensions/clock-override/default.nix

@@ -40,11 +40,11 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Customize the date and time format displayed in clock in the top bar in GNOME Shell";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ rhoriguchi ];
     homepage = "https://github.com/stuartlangridge/gnome-shell-clock-override";
-    broken = versionOlder gnome-shell.version "3.18";
+    broken = lib.versionOlder gnome-shell.version "3.18";
   };
 }

pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix

@@ -34,12 +34,12 @@ stdenv.mkDerivation rec {
     extensionPortalSlug = "pidgin-im-integration";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/muffinmad/pidgin-im-gnome-shell-extension";
     description = "Make Pidgin IM conversations appear in the Gnome Shell message tray";
     license = lib.licenses.gpl2;
     platforms = lib.platforms.linux;
     maintainers = [ ];
-    broken = versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34
+    broken = lib.versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34
   };
 }

pkgs/desktops/gnome/extensions/unite/default.nix

@@ -40,11 +40,11 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Unite is a GNOME Shell extension which makes a few layout tweaks to the top panel and removes window decorations to make it look like Ubuntu Unity Shell";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ rhoriguchi ];
     homepage = "https://github.com/hardpixel/unite-shell";
-    broken = versionOlder gnome-shell.version "3.32";
+    broken = lib.versionOlder gnome-shell.version "3.32";
   };
 }

pkgs/desktops/xfce/core/thunar/wrapper.nix

@@ -45,7 +45,7 @@ else
       done
     '';
 
-    meta = with lib; {
+    meta = {
       inherit (thunar.meta)
         homepage
         license
@@ -56,7 +56,7 @@ else
       description =
         thunar.meta.description
         +
-          optionalString (0 != length thunarPlugins)
-            " (with plugins: ${concatStringsSep ", " (map (x: x.name) thunarPlugins)})";
+          lib.optionalString (0 != lib.length thunarPlugins)
+            " (with plugins: ${lib.concatStringsSep ", " (map (x: x.name) thunarPlugins)})";
     };
   }

pkgs/development/compilers/ccl/default.nix

@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = with lib; {
+  meta = {
     # assembler failures during build, x86_64-darwin broken since 2020-10-14
     broken = (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64);
     description = "Clozure Common Lisp";
@@ -116,6 +116,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.asl20;
     mainProgram = "ccl";
     teams = [ lib.teams.lisp ];
-    platforms = attrNames options;
+    platforms = lib.attrNames options;
   };
 }

pkgs/development/compilers/mozart/binary.nix

@@ -71,7 +71,7 @@ stdenv.mkDerivation {
     patchShebangs $out
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.mozart-oz.org/";
     description = "Multiplatform implementation of the Oz programming language";
     longDescription = ''
@@ -83,7 +83,7 @@ stdenv.mkDerivation {
     '';
     sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
     license = lib.licenses.mit;
-    platforms = attrNames binaries;
+    platforms = lib.attrNames binaries;
     hydraPlatforms = [ ];
   };
 }

pkgs/development/compilers/sbcl/default.nix

@@ -315,13 +315,13 @@ stdenv.mkDerivation (self: {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "Common Lisp compiler";
     homepage = "https://sbcl.org";
     license = lib.licenses.publicDomain; # and FreeBSD
     mainProgram = "sbcl";
     teams = [ lib.teams.lisp ];
-    platforms = attrNames bootstrapBinaries ++ [
+    platforms = lib.attrNames bootstrapBinaries ++ [
       # These aren’t bootstrapped using the binary distribution but compiled
       # using a separate (lisp) host
       "x86_64-darwin"

pkgs/development/compilers/scala/2.x.nix

@@ -98,7 +98,7 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "General purpose programming language";
     longDescription = ''
       Scala is a general purpose programming language designed to express
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.scala-lang.org/";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.all;
-    branch = versions.majorMinor version;
+    branch = lib.versions.majorMinor version;
     maintainers = with lib.maintainers; [
       kashw2
     ];

pkgs/development/interpreters/acl2/default.nix

@@ -146,7 +146,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/share/${pname}/books
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Interpreter and prover for a Lisp dialect";
     mainProgram = "acl2";
     longDescription = ''
@@ -182,7 +182,7 @@ stdenv.mkDerivation rec {
         # ACL2 itself is bsd3
         bsd3
       ]
-      ++ optionals certifyBooks [
+      ++ lib.optionals certifyBooks [
         # The community books are mostly bsd3 or mit but with a few
         # other things thrown in.
         mit

pkgs/development/interpreters/python/cpython/default.nix

@@ -824,12 +824,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.python.org";
     changelog =
       let
-        majorMinor = versions.majorMinor version;
-        dashedVersion = replaceStrings [ "." "a" "b" ] [ "-" "-alpha-" "-beta-" ] version;
+        majorMinor = lib.versions.majorMinor version;
+        dashedVersion = lib.replaceStrings [ "." "a" "b" ] [ "-" "-alpha-" "-beta-" ] version;
       in
       if sourceVersion.suffix == "" then
         "https://docs.python.org/release/${version}/whatsnew/changelog.html"

pkgs/development/libraries/glew/default.nix

@@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
 
-  meta = with lib; {
+  meta = {
     description = "OpenGL extension loading library for C/C++";
     homepage = "https://glew.sourceforge.net/";
     license = with lib.licenses; [
@@ -94,7 +94,9 @@ stdenv.mkDerivation (finalAttrs: {
     ]; # For full details, see https://github.com/nigels-com/glew#copyright-and-licensing
     pkgConfigModules = [ "glew" ];
     platforms =
-      with lib.platforms;
-      if enableEGL then subtractLists darwin mesa.meta.platforms else mesa.meta.platforms;
+      if enableEGL then
+        lib.subtractLists lib.platforms.darwin mesa.meta.platforms
+      else
+        mesa.meta.platforms;
   };
 })

pkgs/development/libraries/qt-5/modules/qtwebengine.nix

@@ -438,7 +438,7 @@ qtModule (
 
     requiredSystemFeatures = [ "big-parallel" ];
 
-    meta = with lib; {
+    meta = {
       description = "Web engine based on the Chromium web browser";
       mainProgram = "qwebengine_convert_dict";
       maintainers = [ ];
@@ -450,7 +450,7 @@ qtModule (
         let
           inherit (lib.systems.inspect) patternLogicalAnd;
         in
-        concatMap (patternLogicalAnd isUnix) (
+        lib.concatMap (patternLogicalAnd isUnix) (
           lib.concatMap lib.toList [
             isx86_32
             isx86_64

pkgs/development/libraries/science/math/openblas/default.nix

@@ -342,11 +342,11 @@ stdenv.mkDerivation rec {
       ;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Basic Linear Algebra Subprograms";
     license = lib.licenses.bsd3;
     homepage = "https://github.com/OpenMathLib/OpenBLAS";
-    platforms = attrNames configs;
+    platforms = lib.attrNames configs;
     maintainers = with lib.maintainers; [ ttuegel ];
   };
 }

pkgs/development/ocaml-modules/ocaml-freestanding/default.nix

@@ -64,14 +64,14 @@ else
       runHook postInstall
     '';
 
-    meta = with lib; {
+    meta = {
       broken = true; # Not compatible with solo5 ≥ 0.7
       description = "Freestanding OCaml runtime";
       license = lib.licenses.mit;
       maintainers = [ lib.maintainers.sternenseemann ];
       homepage = "https://github.com/mirage/ocaml-freestanding";
       platforms = map ({ arch, os }: "${arch}-${os}") (
-        cartesianProduct {
+        lib.cartesianProduct {
           arch = [
             "aarch64"
             "x86_64"

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

@@ -32,13 +32,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "atenpdu" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python interface to control ATEN PE PDUs";
     homepage = "https://github.com/mtdcr/pductl";
     changelog = "https://github.com/mtdcr/pductl/releases/tag/${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "pductl";
-    broken = versionAtLeast pysnmp.version "7";
+    broken = lib.versionAtLeast pysnmp.version "7";
   };
 }

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/breezy/default.nix

@@ -114,10 +114,10 @@ buildPythonPackage rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Friendly distributed version control system";
     homepage = "https://www.breezy-vcs.org/";
-    changelog = "https://github.com/breezy-team/breezy/blob/${src.rev}/doc/en/release-notes/brz-${versions.majorMinor version}.txt";
+    changelog = "https://github.com/breezy-team/breezy/blob/${src.rev}/doc/en/release-notes/brz-${lib.versions.majorMinor version}.txt";
     license = lib.licenses.gpl2Only;
     maintainers = [ ];
     mainProgram = "brz";

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

@@ -63,7 +63,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "clifford" ];
 
-  meta = with lib; {
+  meta = {
     description = "Numerical Geometric Algebra Module";
     homepage = "https://clifford.readthedocs.io";
     changelog = "https://github.com/pygae/clifford/releases/tag/v${version}";
@@ -71,6 +71,6 @@ buildPythonPackage rec {
     maintainers = [ ];
     # Broken with numba >= 0.54
     # see https://github.com/pygae/clifford/issues/430
-    broken = versionAtLeast numba.version "0.58";
+    broken = lib.versionAtLeast numba.version "0.58";
   };
 }

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

@@ -63,11 +63,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "deepwave" ];
 
-  meta = with lib; {
+  meta = {
     description = "Wave propagation modules for PyTorch";
     homepage = "https://github.com/ar4/deepwave";
     license = lib.licenses.mit;
-    platforms = intersectLists lib.platforms.x86_64 lib.platforms.linux;
+    platforms = lib.intersectLists lib.platforms.x86_64 lib.platforms.linux;
     maintainers = with lib.maintainers; [ atila ];
   };
 }

pkgs/development/python-modules/dependency-injector/default.nix

@@ -61,13 +61,13 @@ buildPythonPackage rec {
     "tests/unit/providers/configuration/test_pydantic_settings_in_init_py36.py"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Dependency injection microframework for Python";
     homepage = "https://github.com/ets-labs/python-dependency-injector";
     changelog = "https://github.com/ets-labs/python-dependency-injector/blob/${src.tag}/docs/main/changelog.rst";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ gerschtli ];
     # https://github.com/ets-labs/python-dependency-injector/issues/726
-    broken = versionAtLeast pydantic.version "2";
+    broken = lib.versionAtLeast pydantic.version "2";
   };
 }

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

@@ -36,13 +36,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "dirigera" ];
 
-  meta = with lib; {
+  meta = {
     description = "Module for controlling the IKEA Dirigera Smart Home Hub";
     homepage = "https://github.com/Leggin/dirigera";
     changelog = "https://github.com/Leggin/dirigera/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "generate-token";
-    broken = versionOlder pydantic.version "2";
+    broken = lib.versionOlder pydantic.version "2";
   };
 }

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/dtschema/default.nix

@@ -39,7 +39,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "dtschema" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tooling for devicetree validation using YAML and jsonschema";
     homepage = "https://github.com/devicetree-org/dt-schema/";
     changelog = "https://github.com/devicetree-org/dt-schema/releases/tag/v${version}";
@@ -55,7 +55,7 @@ buildPythonPackage rec {
       ||
 
         # see https://github.com/devicetree-org/dt-schema/issues/108
-        versionAtLeast jsonschema.version "4.18"
+        lib.versionAtLeast jsonschema.version "4.18"
     );
   };
 }

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/haystack-ai/default.nix

@@ -257,7 +257,7 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "haystack" ];
 
-  meta = with lib; {
+  meta = {
     description = "LLM orchestration framework to build customizable, production-ready LLM applications";
     longDescription = ''
       LLM orchestration framework to build customizable, production-ready LLM applications. Connect components (models, vector DBs, file converters) to pipelines or agents that can interact with your data. With advanced retrieval methods, it's best suited for building RAG, question answering, semantic search or conversational agent chatbots
@@ -267,6 +267,6 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ happysalada ];
     # https://github.com/deepset-ai/haystack/issues/5304
-    broken = versionAtLeast pydantic.version "2";
+    broken = lib.versionAtLeast pydantic.version "2";
   };
 }

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

@@ -54,12 +54,12 @@ buildPythonPackage rec {
     "tests/SMB_RPC/"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Network protocols Constructors and Dissectors";
     homepage = "https://github.com/SecureAuthCorp/impacket";
     changelog =
       "https://github.com/fortra/impacket/releases/tag/impacket_"
-      + replaceStrings [ "." ] [ "_" ] version;
+      + lib.replaceStrings [ "." ] [ "_" ] version;
     # Modified Apache Software License, Version 1.1
     license = lib.licenses.free;
     maintainers = with lib.maintainers; [ fab ];

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

@@ -39,12 +39,12 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pygments ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/miyakogi/m2r";
     description = "Markdown to reStructuredText converter";
     license = lib.licenses.mit;
     maintainers = [ ];
     # https://github.com/miyakogi/m2r/issues/66
-    broken = versionAtLeast mistune.version "2";
+    broken = lib.versionAtLeast mistune.version "2";
   };
 }

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

@@ -46,9 +46,9 @@ buildPythonPackage rec {
       ;
   };
 
-  meta = with lib; {
+  meta = {
     changelog = "https://markupsafe.palletsprojects.com/page/changes/#version-${
-      replaceStrings [ "." ] [ "-" ] version
+      lib.replaceStrings [ "." ] [ "-" ] version
     }";
     description = "Implements a XML/HTML/XHTML Markup safe string";
     homepage = "https://palletsprojects.com/p/markupsafe/";

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

@@ -26,11 +26,11 @@ buildPythonPackage rec {
     hash = "sha256-XreDqqzH3UQ+RIBOrvHpaBb7PXcPPptjQx5cjpI+VzQ=";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Markdown to Gemini text format conversion library";
     homepage = "https://github.com/makeworld-the-better-one/md2gemini";
     license = lib.licenses.lgpl3Plus;
     maintainers = [ lib.maintainers.kaction ];
-    broken = versionAtLeast mistune.version "3";
+    broken = lib.versionAtLeast mistune.version "3";
   };
 }

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 = [ ];
   };
 }

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

@@ -52,7 +52,7 @@ buildPythonPackage {
 
   pythonImportsCheck = [ "prometrix" ];
 
-  meta = with lib; {
+  meta = {
     description = "Unified Prometheus client";
     longDescription = ''
       This Python package provides a unified Prometheus client that can be used
@@ -63,6 +63,6 @@ buildPythonPackage {
     maintainers = [ ];
     # prometheus-api-client 0.5.5 is not working
     # https://github.com/robusta-dev/prometrix/issues/14
-    broken = versionAtLeast prometheus-api-client.version "0.5.3";
+    broken = lib.versionAtLeast prometheus-api-client.version "0.5.3";
   };
 }

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

@@ -108,12 +108,12 @@ buildPythonPackage rec {
     "tests/multi_test.py"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Python Interface To The cURL library";
     homepage = "http://pycurl.io/";
     changelog =
       "https://github.com/pycurl/pycurl/blob/REL_"
-      + replaceStrings [ "." ] [ "_" ] version
+      + lib.replaceStrings [ "." ] [ "_" ] version
       + "/ChangeLog";
     license = with lib.licenses; [
       lgpl2Only

pkgs/development/python-modules/repoze-sphinx-autointerface/default.nix

@@ -42,13 +42,13 @@ buildPythonPackage rec {
     "repoze.sphinx"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/repoze/repoze.sphinx.autointerface";
     description = "Auto-generate Sphinx API docs from Zope interfaces";
     changelog = "https://github.com/repoze/repoze.sphinx.autointerface/blob/${version}/CHANGES.rst";
     license = lib.licenses.bsd0;
     maintainers = [ ];
     # https://github.com/repoze/repoze.sphinx.autointerface/issues/21
-    broken = versionAtLeast sphinx.version "7.2";
+    broken = lib.versionAtLeast sphinx.version "7.2";
   };
 }

pkgs/development/python-modules/selenium-wire/default.nix

@@ -67,12 +67,12 @@ buildPythonPackage rec {
     "tests/end2end/test_end2end.py"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Extends Selenium's Python bindings to give you the ability to inspect requests made by the browser";
     homepage = "https://github.com/wkeeling/selenium-wire";
     changelog = "https://github.com/wkeeling/selenium-wire/blob/${version}/HISTORY.rst";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
-    broken = versionAtLeast blinker.version "1.8";
+    broken = lib.versionAtLeast blinker.version "1.8";
   };
 }

pkgs/development/python-modules/setuptools-scm-git-archive/default.nix

@@ -29,12 +29,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "setuptools_scm_git_archive" ];
 
-  meta = with lib; {
+  meta = {
     description = "setuptools_scm plugin for git archives";
     homepage = "https://github.com/Changaco/setuptools_scm_git_archive";
     license = lib.licenses.mit;
     maintainers = [ ];
     # https://github.com/Changaco/setuptools_scm_git_archive/pull/22
-    broken = versionAtLeast setuptools-scm.version "8";
+    broken = lib.versionAtLeast setuptools-scm.version "8";
   };
 }

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

@@ -39,11 +39,11 @@ buildPythonPackage rec {
     inherit distutils;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Utilities to facilitate the installation of Python packages";
     homepage = "https://github.com/pypa/setuptools";
     changelog = "https://setuptools.pypa.io/en/stable/history.html#v${
-      replaceStrings [ "." ] [ "-" ] version
+      lib.replaceStrings [ "." ] [ "-" ] version
     }";
     license = with lib.licenses; [ mit ];
     platforms = python.meta.platforms;

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

@@ -67,13 +67,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "shazamio" ];
 
-  meta = with lib; {
+  meta = {
     description = "Free asynchronous library from reverse engineered Shazam API";
     homepage = "https://github.com/dotX12/ShazamIO";
     changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = [ ];
     # https://github.com/shazamio/ShazamIO/issues/80
-    broken = versionAtLeast pydantic.version "2";
+    broken = lib.versionAtLeast pydantic.version "2";
   };
 }

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

@@ -53,7 +53,7 @@ buildPythonPackage rec {
     "solo.operations"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Python tool and library for SoloKeys Solo 1";
     homepage = "https://github.com/solokeys/solo1-cli";
     maintainers = with lib.maintainers; [ wucke13 ];
@@ -63,6 +63,6 @@ buildPythonPackage rec {
     ];
     # not compatible with fido2 >= 1.0.0
     # https://github.com/solokeys/solo1-cli/issues/157
-    broken = versionAtLeast fido2.version "1.0.0";
+    broken = lib.versionAtLeast fido2.version "1.0.0";
   };
 }

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

@@ -47,13 +47,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "steamship" ];
 
-  meta = with lib; {
+  meta = {
     description = "Fastest way to add language AI to your product";
     homepage = "https://www.steamship.com/";
     changelog = "https://github.com/steamship-core/python-client/releases/tag/${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ natsukium ];
     # https://github.com/steamship-core/python-client/issues/503
-    broken = versionAtLeast pydantic.version "2";
+    broken = lib.versionAtLeast pydantic.version "2";
   };
 }