treewide: remove remaining 'with [a-zA-Z]*lib;' from pkgs

Partial #208242

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

@@ -146,28 +146,26 @@ let
 
       # The recursiveUpdate below breaks default meta.position, so manually override it.
       pos = __curPos;
-      meta =
-        with lib;
-        recursiveUpdate {
-          homepage = "https://hadoop.apache.org/";
-          description = "Framework for distributed processing of large data sets across clusters of computers";
-          license = lib.licenses.asl20;
-          sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      meta = lib.recursiveUpdate {
+        homepage = "https://hadoop.apache.org/";
+        description = "Framework for distributed processing of large data sets across clusters of computers";
+        license = lib.licenses.asl20;
+        sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
 
-          longDescription = ''
-            The Apache Hadoop software library is a framework that allows for
-            the distributed processing of large data sets across clusters of
-            computers using a simple programming model. It is designed to
-            scale up from single servers to thousands of machines, each
-            offering local computation and storage. Rather than rely on
-            hardware to deliver high-avaiability, the library itself is
-            designed to detect and handle failures at the application layer,
-            so delivering a highly-availabile service on top of a cluster of
-            computers, each of which may be prone to failures.
-          '';
-          maintainers = with lib.maintainers; [ illustris ];
-          platforms = attrNames platformAttrs;
-        } (attrByPath [ stdenv.system "meta" ] { } platformAttrs);
+        longDescription = ''
+          The Apache Hadoop software library is a framework that allows for
+          the distributed processing of large data sets across clusters of
+          computers using a simple programming model. It is designed to
+          scale up from single servers to thousands of machines, each
+          offering local computation and storage. Rather than rely on
+          hardware to deliver high-avaiability, the library itself is
+          designed to detect and handle failures at the application layer,
+          so delivering a highly-availabile service on top of a cluster of
+          computers, each of which may be prone to failures.
+        '';
+        maintainers = with lib.maintainers; [ illustris ];
+        platforms = lib.attrNames platformAttrs;
+      } (lib.attrByPath [ stdenv.system "meta" ] { } platformAttrs);
     });
 in
 {

pkgs/applications/networking/mullvad/openvpn.nix

@@ -109,7 +109,7 @@ openvpn.overrideAttrs (
     meta = oldAttrs.meta or { } // {
       description = "OpenVPN with Mullvad-specific patches applied";
       homepage = "https://github.com/mullvad/openvpn";
-      maintainers = with lib; [ maintainers.cole-h ];
+      maintainers = with lib.maintainers; [ cole-h ];
     };
   }
 )

pkgs/by-name/ca/caprine-bin/package.nix

@@ -6,12 +6,12 @@
 let
   pname = "caprine";
   version = "2.59.1";
-  metaCommon = with lib; {
+  metaCommon = {
     description = "Elegant Facebook Messenger desktop app";
     homepage = "https://sindresorhus.com/caprine";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ShamrockLee ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ShamrockLee ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
   x86_64-appimage = callPackage ./build-from-appimage.nix {
     inherit pname version metaCommon;

pkgs/by-name/de/deskflow/package.nix

@@ -120,10 +120,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Share one mouse and keyboard between multiple computers on Windows, macOS and Linux";
     mainProgram = "deskflow";
     maintainers = with lib.maintainers; [ flacks ];
-    license = with lib; [
-      licenses.gpl2Plus
-      licenses.openssl
-      licenses.mit # share/applications/org.deskflow.deskflow.desktop
+    license = with lib.licenses; [
+      gpl2Plus
+      openssl
+      mit # share/applications/org.deskflow.deskflow.desktop
     ];
     platforms = lib.platforms.linux;
   };

pkgs/by-name/ev/evcc/package.nix

@@ -28,9 +28,9 @@ let
 
   vendorHash = "sha256-VG1/6KadRC4jLBIOL39M6l8ZED1KLb+wKGHNQowAV1g=";
 
-  commonMeta = with lib; {
-    license = licenses.mit;
-    maintainers = with maintainers; [ hexa ];
+  commonMeta = {
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hexa ];
   };
 
   decorate = buildGo125Module {

pkgs/by-name/fl/flow-control/build.zig.zon.nix

@@ -10,9 +10,6 @@
   name ? "zig-packages",
 }:
 
-with builtins;
-with lib;
-
 let
   unpackZigArtifact =
     { name, artifact }:
@@ -41,9 +38,9 @@ let
       rev ? throw "rev is required, remove and regenerate the zon2json-lock file",
     }:
     let
-      parts = splitString "#" url;
-      url_base = elemAt parts 0;
-      url_without_query = elemAt (splitString "?" url_base) 0;
+      parts = lib.splitString "#" url;
+      url_base = lib.elemAt parts 0;
+      url_without_query = lib.elemAt (lib.splitString "?" url_base) 0;
     in
     fetchgit {
       inherit name rev hash;
@@ -59,9 +56,9 @@ let
       ...
     }@args:
     let
-      parts = splitString "://" url;
-      proto = elemAt parts 0;
-      path = elemAt parts 1;
+      parts = lib.splitString "://" url;
+      proto = lib.elemAt parts 0;
+      path = lib.elemAt parts 1;
       fetcher = {
         "git+http" = fetchGitZig (
           args

pkgs/by-name/li/libserialport/package.nix

@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Cross-platform shared library for serial port access";
     homepage = "https://sigrok.org/";
     license = lib.licenses.gpl3Plus;
-    platforms = with lib; platforms.linux ++ platforms.darwin ++ platforms.windows;
+    platforms = with lib.platforms; linux ++ darwin ++ windows;
     maintainers = [ lib.maintainers.bjornfor ];
   };
 })

pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix

@@ -34,10 +34,8 @@ stdenvNoCC.mkDerivation {
     runHook postInstall
   '';
 
-  meta =
-    metaCommon
-    // (with lib; {
-      platforms = if isAarch64 then [ "aarch64-darwin" ] else platforms.darwin;
-      mainProgram = "losslesscut";
-    });
+  meta = metaCommon // {
+    platforms = if isAarch64 then [ "aarch64-darwin" ] else lib.platforms.darwin;
+    mainProgram = "losslesscut";
+  };
 }

pkgs/by-name/lo/losslesscut-bin/build-from-windows.nix

@@ -36,10 +36,8 @@ stdenvNoCC.mkDerivation {
     runHook postInstall
   '';
 
-  meta =
-    metaCommon
-    // (with lib; {
-      platforms = platforms.windows;
-      mainProgram = "LosslessCut.exe";
-    });
+  meta = metaCommon // {
+    platforms = lib.platforms.windows;
+    mainProgram = "LosslessCut.exe";
+  };
 }

pkgs/by-name/lo/losslesscut-bin/package.nix

@@ -8,13 +8,13 @@
 let
   pname = "losslesscut";
   version = "3.64.0";
-  metaCommon = with lib; {
+  metaCommon = {
     description = "Swiss army knife of lossless video/audio editing";
     homepage = "https://mifi.no/losslesscut/";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ ShamrockLee ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ ShamrockLee ];
     mainProgram = "losslesscut";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };
   x86_64-appimage = callPackage ./build-from-appimage.nix {
     inherit pname version metaCommon;

pkgs/by-name/ly/ly/deps.nix

@@ -10,9 +10,6 @@
   name ? "zig-packages",
 }:
 
-with builtins;
-with lib;
-
 let
   unpackZigArtifact =
     { name, artifact }:
@@ -41,9 +38,9 @@ let
       rev ? throw "rev is required, remove and regenerate the zon2json-lock file",
     }:
     let
-      parts = splitString "#" url;
-      url_base = elemAt parts 0;
-      url_without_query = elemAt (splitString "?" url_base) 0;
+      parts = lib.splitString "#" url;
+      url_base = lib.elemAt parts 0;
+      url_without_query = lib.elemAt (lib.splitString "?" url_base) 0;
     in
     fetchgit {
       inherit name rev hash;
@@ -59,9 +56,9 @@ let
       ...
     }@args:
     let
-      parts = splitString "://" url;
-      proto = elemAt parts 0;
-      path = elemAt parts 1;
+      parts = lib.splitString "://" url;
+      proto = lib.elemAt parts 0;
+      path = lib.elemAt parts 1;
       fetcher = {
         "git+http" = fetchGitZig (
           args

pkgs/by-name/ma/manticoresearch/columnar.nix

@@ -164,9 +164,9 @@ stdenv.mkDerivation (finalAttrs: {
     sed -i '/set (ADD_AVX_BUILDS 1)/d' CMakeLists.txt
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Manticore Columnar Library - columnar storage and secondary indexes library for Manticore Search";
     homepage = "https://github.com/manticoresoftware/columnar";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
   };
 })

pkgs/by-name/mo/modrinth-app-unwrapped/package.nix

@@ -162,7 +162,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ];
     maintainers = with lib.maintainers; [ getchoo ];
     mainProgram = "ModrinthApp";
-    platforms = with lib; platforms.linux ++ platforms.darwin;
+    platforms = with lib.platforms; linux ++ darwin;
     # This builds on architectures like aarch64, but the launcher itself does not support them yet.
     # Darwin is the only exception
     # See https://github.com/modrinth/code/issues/776#issuecomment-1742495678

pkgs/by-name/mp/mpv/scripts.nix

@@ -82,16 +82,15 @@ let
 
   scope =
     self:
-    with lib;
-    pipe
+    lib.pipe
       {
         inherit (self) callPackage;
         directory = ./scripts;
       }
       [
-        packagesFromDirectoryRecursive
-        recurseIntoAttrs
-        (mapAttrsRecursiveCond (x: x.recurseForDerivations or false) addTests)
+        lib.packagesFromDirectoryRecursive
+        lib.recurseIntoAttrs
+        (lib.mapAttrsRecursiveCond (x: x.recurseForDerivations or false) addTests)
       ];
 
   mkAliases = self: {

pkgs/by-name/ni/nimlangserver/package.nix

@@ -21,14 +21,12 @@ buildNimPackage (
 
     doCheck = false;
 
-    meta =
-      final.src.meta
-      // (with lib; {
-        description = "Nim language server implementation (based on nimsuggest)";
-        homepage = "https://github.com/nim-lang/langserver";
-        license = licenses.mit;
-        mainProgram = "nimlangserver";
-        maintainers = with maintainers; [ daylinmorgan ];
-      });
+    meta = final.src.meta // {
+      description = "Nim language server implementation (based on nimsuggest)";
+      homepage = "https://github.com/nim-lang/langserver";
+      license = lib.licenses.mit;
+      mainProgram = "nimlangserver";
+      maintainers = with lib.maintainers; [ daylinmorgan ];
+    };
   }
 )

pkgs/by-name/nr/nrfutil/package.nix

@@ -24,14 +24,14 @@ let
   platformSources =
     sources.${stdenvNoCC.system} or (throw "unsupported platform ${stdenvNoCC.system}");
 
-  sharedMeta = with lib; {
+  sharedMeta = {
     description = "CLI tool for managing Nordic Semiconductor devices";
     homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Util";
     changelog = "https://docs.nordicsemi.com/bundle/nrfutil/page/guides/revision_history.html";
-    license = licenses.unfree;
+    license = lib.licenses.unfree;
     platforms = lib.attrNames sources;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       h7x4
       ezrizhu
     ];

pkgs/by-name/od/odiff/build.zig.zon.nix

@@ -10,9 +10,6 @@
   name ? "zig-packages",
 }:
 
-with builtins;
-with lib;
-
 let
   unpackZigArtifact =
     { name, artifact }:
@@ -41,9 +38,9 @@ let
       rev ? throw "rev is required, remove and regenerate the zon2json-lock file",
     }:
     let
-      parts = splitString "#" url;
-      url_base = elemAt parts 0;
-      url_without_query = elemAt (splitString "?" url_base) 0;
+      parts = lib.splitString "#" url;
+      url_base = lib.elemAt parts 0;
+      url_without_query = lib.elemAt (lib.splitString "?" url_base) 0;
     in
     fetchgit {
       inherit name rev hash;
@@ -59,9 +56,9 @@ let
       ...
     }@args:
     let
-      parts = splitString "://" url;
-      proto = elemAt parts 0;
-      path = elemAt parts 1;
+      parts = lib.splitString "://" url;
+      proto = lib.elemAt parts 0;
+      path = lib.elemAt parts 1;
       fetcher = {
         "git+http" = fetchGitZig (
           args

pkgs/by-name/pa/pam_rundir/package.nix

@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
     description = "Provide user runtime directory on Linux systems";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
-    maintainers = with lib; [ maintainers.aanderse ];
+    maintainers = with lib.maintainers; [ aanderse ];
   };
 }

pkgs/by-name/pr/prisma-engines_7/package.nix

@@ -49,13 +49,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   setupHook = ./setup-hook.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Collection of engines that power the core stack for Prisma";
     homepage = "https://www.prisma.io/";
-    license = licenses.asl20;
-    platforms = platforms.unix;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
     mainProgram = "prisma";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       aqrln
     ];
   };

pkgs/by-name/pr/prisma_7/package.nix

@@ -98,12 +98,12 @@ stdenv.mkDerivation (finalAttrs: {
     cli = callPackage ./test-cli.nix { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Next-generation ORM for Node.js and TypeScript";
     homepage = "https://www.prisma.io/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ aqrln ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ aqrln ];
     mainProgram = "prisma";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 })

pkgs/by-name/ri/river-ultitile/build.zig.zon.nix

@@ -10,9 +10,6 @@
   name ? "zig-packages",
 }:
 
-with builtins;
-with lib;
-
 let
   unpackZigArtifact =
     { name, artifact }:
@@ -41,9 +38,9 @@ let
       rev ? throw "rev is required, remove and regenerate the zon2json-lock file",
     }:
     let
-      parts = splitString "#" url;
-      url_base = elemAt parts 0;
-      url_without_query = elemAt (splitString "?" url_base) 0;
+      parts = lib.splitString "#" url;
+      url_base = lib.elemAt parts 0;
+      url_without_query = lib.elemAt (lib.splitString "?" url_base) 0;
     in
     fetchgit {
       inherit name rev hash;
@@ -59,9 +56,9 @@ let
       ...
     }@args:
     let
-      parts = splitString "://" url;
-      proto = elemAt parts 0;
-      path = elemAt parts 1;
+      parts = lib.splitString "://" url;
+      proto = lib.elemAt parts 0;
+      path = lib.elemAt parts 1;
       fetcher = {
         "git+http" = fetchGitZig (
           args

pkgs/by-name/rs/rssguard/package.nix

@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
     wrapGAppsHook4
     qt6.wrapQtAppsHook
   ];
-  cmakeFlags = with lib; [
-    (cmakeFeature "CMAKE_BUILD_TYPE" "\"Release\"")
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_BUILD_TYPE" "\"Release\"")
   ];
 
   dontWrapGApps = true;

pkgs/by-name/so/sonic-pi/update.sh

@@ -14,7 +14,7 @@ nixeval() {
 }
 
 vendorhash() {
-    (nix --extra-experimental-features nix-command build --impure --argstr nixpkgs "$nixpkgs" --argstr attr "$1" --expr '{ nixpkgs, attr }: let pkgs = import nixpkgs {}; in with pkgs.lib; (getAttrFromPath (splitString "." attr) pkgs).overrideAttrs (attrs: { outputHash = fakeHash; })' --no-link 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true
+    (nix --extra-experimental-features nix-command build --impure --argstr nixpkgs "$nixpkgs" --argstr attr "$1" --expr '{ nixpkgs, attr }: let pkgs = import nixpkgs {}; in (pkgs.lib.getAttrFromPath (pkgs.lib.splitString "." attr) pkgs).overrideAttrs (attrs: { outputHash = pkgs.lib.fakeHash; })' --no-link 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true
 }
 
 findpath() {

pkgs/by-name/st/stable-diffusion-cpp/package.nix

@@ -110,17 +110,17 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     (cmakeFeature "CMAKE_HIP_ARCHITECTURES" (builtins.concatStringsSep ";" rocmGpuTargets))
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Stable Diffusion inference in pure C/C++";
     homepage = "https://github.com/leejet/stable-diffusion.cpp";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "sd";
     maintainers = with lib.maintainers; [
       dit7ya
       adriangl
     ];
-    platforms = platforms.unix;
-    badPlatforms = optionals (cudaSupport || openclSupport) platforms.darwin;
+    platforms = lib.platforms.unix;
+    badPlatforms = lib.optionals (cudaSupport || openclSupport) lib.platforms.darwin;
     broken = metalSupport && !stdenv.hostPlatform.isDarwin;
   };
 })

pkgs/by-name/ug/ugrep/package.nix

@@ -105,23 +105,21 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta =
-    with lib;
-    {
-      description = "Ultra fast grep with interactive query UI";
-      homepage = "https://github.com/Genivia/ugrep";
-      changelog = "https://github.com/Genivia/ugrep/releases/tag/v${finalAttrs.version}";
-      maintainers = with lib.maintainers; [
-        numkem
-        mikaelfangel
-      ];
-      license = lib.licenses.bsd3;
-      platforms = lib.platforms.all;
-      mainProgram = "ug";
-    }
-    # Needed to ensure that the grep replacements take precedence over
-    # `gnugrep` when installed. Lower priority values win.
-    // lib.optionalAttrs createGrepReplacementLinks {
-      priority = (gnugrep.meta.priority or meta.defaultPriority) - 1;
-    };
+  meta = {
+    description = "Ultra fast grep with interactive query UI";
+    homepage = "https://github.com/Genivia/ugrep";
+    changelog = "https://github.com/Genivia/ugrep/releases/tag/v${finalAttrs.version}";
+    maintainers = with lib.maintainers; [
+      numkem
+      mikaelfangel
+    ];
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.all;
+    mainProgram = "ug";
+  }
+  # Needed to ensure that the grep replacements take precedence over
+  # `gnugrep` when installed. Lower priority values win.
+  // lib.optionalAttrs createGrepReplacementLinks {
+    priority = (gnugrep.meta.priority or lib.meta.defaultPriority) - 1;
+  };
 })

pkgs/by-name/va/valdi/package.nix

@@ -19,11 +19,11 @@ buildNpmPackage rec {
 
   npmDepsHash = "sha256-LGgyMdhDQ4UwdtENZT/89yiQawn8SxKdth/p7evDAgk=";
 
-  meta = with lib; {
+  meta = {
     description = "Cross-platform UI framework CLI by Snapchat";
     homepage = "https://github.com/Snapchat/Valdi";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jonasfranke ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jonasfranke ];
     mainProgram = "valdi";
   };
 }

pkgs/by-name/wx/wxedid/package.nix

@@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
     patchShebangs src/rcode/rcd_autogen
   '';
 
-  meta = with lib; {
+  meta = {
     description = "wxWidgets-based EDID (Extended Display Identification Data) editor";
     homepage = "https://sourceforge.net/projects/wxedid";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     mainProgram = "wxedid";
-    maintainers = [ maintainers.meanwhile131 ];
+    maintainers = [ lib.maintainers.meanwhile131 ];
     platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/xb/xbattbar/package.nix

@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Display battery status in X11";
     homepage = "https://salsa.debian.org/debian/xbattbar";
-    license = with lib; licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ q3k ];
     mainProgram = "xbattbar";

pkgs/development/coq-modules/ElmExtraction/default.nix

@@ -7,7 +7,6 @@
   version ? null,
 }:
 
-with lib;
 mkCoqDerivation {
   pname = "ElmExtraction";
   repo = "coq-elm-extraction";
@@ -25,14 +24,13 @@ mkCoqDerivation {
         inherit out;
       };
     in
-    with versions;
-    switch
+    lib.switch
       [
         coq.coq-version
         metacoq.version
       ]
       [
-        (case (range "8.17" "9.0") (range "1.3.1" "1.3.4") "0.1.1")
+        (case (lib.versions.range "8.17" "9.0") (lib.versions.range "1.3.1" "1.3.4") "0.1.1")
       ]
       null;
 
@@ -50,7 +48,7 @@ mkCoqDerivation {
 
   meta = {
     description = "Framework for extracting Coq programs to Elm";
-    maintainers = with maintainers; [ _4ever2 ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ _4ever2 ];
+    license = lib.licenses.mit;
   };
 }

pkgs/development/coq-modules/RustExtraction/default.nix

@@ -7,7 +7,6 @@
   version ? null,
 }:
 
-with lib;
 mkCoqDerivation {
   pname = "RustExtraction";
   repo = "coq-rust-extraction";
@@ -24,9 +23,9 @@ mkCoqDerivation {
         ];
         inherit out;
       };
+      inherit (lib.versions) range;
     in
-    with versions;
-    switch
+    lib.switch
       [
         coq.coq-version
         metacoq.version
@@ -56,7 +55,7 @@ mkCoqDerivation {
 
   meta = {
     description = "Framework for extracting Coq programs to Rust";
-    maintainers = with maintainers; [ _4ever2 ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ _4ever2 ];
+    license = lib.licenses.mit;
   };
 }

pkgs/development/coq-modules/parseque/default.nix

@@ -5,7 +5,6 @@
   version ? null,
 }:
 
-with lib;
 let
   derivation = mkCoqDerivation {
     pname = "parseque";
@@ -17,9 +16,8 @@ let
       let
         case = case: out: { inherit case out; };
       in
-      with versions;
-      switch coq.coq-version [
-        (case (range "8.16" "8.20") "0.2.2")
+      lib.switch coq.coq-version [
+        (case (lib.versions.range "8.16" "8.20") "0.2.2")
       ] null;
 
     release."0.2.2".sha256 = "sha256-O50Rs7Yf1H4wgwb7ltRxW+7IF0b04zpfs+mR83rxT+E=";
@@ -28,8 +26,8 @@ let
 
     meta = {
       description = "Total parser combinators in Coq/Rocq";
-      maintainers = with maintainers; [ womeier ];
-      license = licenses.mit;
+      maintainers = with lib.maintainers; [ womeier ];
+      license = lib.licenses.mit;
     };
   };
 in

pkgs/development/coq-modules/vscoq-language-server/default.nix

@@ -77,16 +77,14 @@ ocamlPackages.buildDunePackage {
     ppx_optcomp
   ]);
 
-  meta =
-    with lib;
-    {
-      description = "Language server for the vscoq vscode/codium extension";
-      homepage = "https://github.com/coq-community/vscoq";
-      maintainers = with lib.maintainers; [ cohencyril ];
-      license = lib.licenses.mit;
-    }
-    // optionalAttrs (fetched.broken or false) {
-      coqFilter = true;
-      broken = true;
-    };
+  meta = {
+    description = "Language server for the vscoq vscode/codium extension";
+    homepage = "https://github.com/coq-community/vscoq";
+    maintainers = with lib.maintainers; [ cohencyril ];
+    license = lib.licenses.mit;
+  }
+  // lib.optionalAttrs (fetched.broken or false) {
+    coqFilter = true;
+    broken = true;
+  };
 }

pkgs/development/coq-modules/wasmcert/default.nix

@@ -11,7 +11,6 @@
   version ? null,
 }:
 
-with lib;
 mkCoqDerivation {
   pname = "wasm";
   repo = "WasmCert-Coq";
@@ -28,11 +27,10 @@ mkCoqDerivation {
         inherit out;
       };
     in
-    with lib.versions;
     lib.switch
       [ coq.coq-version mathcomp-boot.version ]
       [
-        (case (range "8.20" "9.0") (isGe "2.4") "2.2.0")
+        (case (lib.versions.range "8.20" "9.0") (lib.versions.isGe "2.4") "2.2.0")
       ]
       null;
 
@@ -62,7 +60,7 @@ mkCoqDerivation {
 
   meta = {
     description = "Wasm mechanisation in Coq/Rocq";
-    maintainers = with maintainers; [ womeier ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ womeier ];
+    license = lib.licenses.mit;
   };
 }

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

@@ -28,10 +28,10 @@ buildPythonPackage (finalAttrs: {
 
   pythonImportsCheck = [ "django_scopes" ];
 
-  meta = with lib; {
+  meta = {
     description = "Safely separate multiple tenants in a Django database";
     homepage = "https://github.com/raphaelm/django-scopes";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ ambroisie ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ambroisie ];
   };
 })

pkgs/development/python-modules/language-tags/default.nix

@@ -21,10 +21,10 @@ buildPythonPackage (finalAttrs: {
 
   pythonImportsCheck = [ "language_tags" ];
 
-  meta = with lib; {
+  meta = {
     description = "Dealing with IANA language tags in Python";
     homepage = "https://language-tags.readthedocs.io/en/latest/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ambroisie ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ambroisie ];
   };
 })

pkgs/development/python-modules/streamcontroller-streamdeck/default.nix

@@ -31,12 +31,12 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "StreamDeck" ];
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     # This is a fork of abcminiuser/python-elgato-streamdeck targeted at StreamController.
     description = "Python library to control the Elgato Stream Deck";
     homepage = "https://github.com/StreamController/streamcontroller-python-elgato-streamdeck";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       majiir
       sifmelcara
     ];

pkgs/development/rocq-modules/parseque/default.nix

@@ -6,7 +6,6 @@
   version ? null,
 }:
 
-with lib;
 mkRocqDerivation {
   pname = "parseque";
   repo = "parseque";
@@ -14,12 +13,11 @@ mkRocqDerivation {
 
   inherit version;
   defaultVersion =
-    with versions;
-    switch
+    lib.switch
       [ rocq-core.rocq-version ]
       [
         {
-          cases = [ (range "9.0" "9.1") ];
+          cases = [ (lib.versions.range "9.0" "9.1") ];
           out = "0.3.0";
         }
       ]
@@ -33,7 +31,7 @@ mkRocqDerivation {
 
   meta = {
     description = "Total parser combinators in Rocq";
-    maintainers = with maintainers; [ womeier ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ womeier ];
+    license = lib.licenses.mit;
   };
 }

pkgs/development/rocq-modules/vsrocq-language-server/default.nix

@@ -15,10 +15,9 @@ let
     let
       case = case: out: { inherit case out; };
     in
-    with lib.versions;
     lib.switch rocq-core.rocq-version [
-      (case (range "8.18" "9.1") "2.3.3")
-      (case (range "8.18" "9.1") "2.3.0")
+      (case (lib.versions.range "8.18" "9.1") "2.3.3")
+      (case (lib.versions.range "8.18" "9.1") "2.3.0")
     ] null;
   location = {
     domain = "github.com";
@@ -66,16 +65,14 @@ ocamlPackages.buildDunePackage {
     make dune-files
   '';
 
-  meta =
-    with lib;
-    {
-      description = "Language server for the vsrocq vscode/codium extension";
-      homepage = "https://github.com/rocq-prover/vsrocq";
-      maintainers = with lib.maintainers; [ cohencyril ];
-      license = lib.licenses.mit;
-    }
-    // optionalAttrs (fetched.broken or false) {
-      rocqFilter = true;
-      broken = true;
-    };
+  meta = {
+    description = "Language server for the vsrocq vscode/codium extension";
+    homepage = "https://github.com/rocq-prover/vsrocq";
+    maintainers = with lib.maintainers; [ cohencyril ];
+    license = lib.licenses.mit;
+  }
+  // lib.optionalAttrs (fetched.broken or false) {
+    rocqFilter = true;
+    broken = true;
+  };
 }

pkgs/games/openra_2019/mod-update.sh

@@ -3,9 +3,8 @@
 
 # for mod in $(nix eval --raw '(
 #   with import <nixpkgs> { };
-#   with lib;
-#   let mods = attrNames (removeAttrs openraPackages.mods [ "recurseForDerivations" ]);
-#   in concatStringsSep " " mods
+#   let mods = lib.attrNames (lib.removeAttrs openraPackages.mods [ "recurseForDerivations" ]);
+#   in lib.concatStringsSep " " mods
 # )'); do
 #   ./mod-update.sh "$mod"
 # done

pkgs/servers/home-assistant/custom-components/thewatchman/package.nix

@@ -40,10 +40,10 @@ buildHomeAssistantComponent rec {
     pytestCheckHook
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Keep track of missing entities and services in your config files";
     homepage = "https://github.com/dummylabs/thewatchman";
-    maintainers = with maintainers; [ SuperSandro2000 ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ SuperSandro2000 ];
+    license = lib.licenses.mit;
   };
 }

pkgs/servers/http/nginx/generic.nix

@@ -306,19 +306,18 @@ stdenv.mkDerivation {
     if meta != null then
       meta
     else
-      with lib;
       {
         description = "Reverse proxy and lightweight webserver";
         mainProgram = "nginx";
         homepage = "http://nginx.org";
-        license = [ licenses.bsd2 ] ++ concatMap (m: m.meta.license) modules;
+        license = [ lib.licenses.bsd2 ] ++ lib.concatMap (m: m.meta.license) modules;
         broken = lib.any (m: m.meta.broken or false) modules;
-        platforms = platforms.all;
-        maintainers = with maintainers; [
+        platforms = lib.platforms.all;
+        maintainers = with lib.maintainers; [
           fpletz
           raitobezarius
         ];
-        teams = with teams; [
+        teams = with lib.teams; [
           helsinki-systems
           stridtech
         ];

pkgs/servers/nextcloud/packages/apps/memories.nix

@@ -23,11 +23,11 @@ let
     latestVersionForNc.${ncVersion}
       or (throw "memories currently does not support nextcloud version ${ncVersion}");
 
-  commonMeta = with lib; {
+  commonMeta = {
     homepage = "https://apps.nextcloud.com/apps/memories";
     changelog = "https://github.com/pulsejet/memories/blob/v${currentVersionInfo.version}/CHANGELOG.md";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ SuperSandro2000 ];
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ SuperSandro2000 ];
   };
 
   go-vod = buildGoModule rec {