s/nixpkgs-lib/lib/

Author: astro

flake.nix

@@ -145,7 +145,7 @@
           })
         ) (import ./checks { inherit self nixpkgs system; });
       }) // {
-        lib = import ./lib { nixpkgs-lib = nixpkgs.lib; };
+        lib = import ./lib { inherit (nixpkgs) lib; };
 
         overlay = final: prev: {
           cloud-hypervisor-graphics = prev.callPackage (spectrum + "/pkgs/cloud-hypervisor") {};

lib/default.nix

@@ -1,4 +1,4 @@
-{ nixpkgs-lib }:
+{ lib }:
 rec {
   hypervisors = [
     "qemu"
@@ -25,8 +25,8 @@ rec {
       fst // {
         letter = snd;
       }
-    ) (nixpkgs-lib.zipLists volumes (
-      nixpkgs-lib.drop offset nixpkgs-lib.strings.lowerChars
+    ) (lib.zipLists volumes (
+      lib.drop offset lib.strings.lowerChars
     ));
 
   createVolumesScript = pkgs: pkgs.lib.concatMapStringsSep "\n" (
@@ -52,9 +52,9 @@ rec {
              else "";
              mkfsExtraArgsString =
               if mkfsExtraArgs != null
-              then nixpkgs-lib.escapeShellArgs mkfsExtraArgs
+              then lib.escapeShellArgs mkfsExtraArgs
               else " ";
-      in (nixpkgs-lib.optionalString autoCreate ''
+      in (lib.optionalString autoCreate ''
       PATH=$PATH:${with pkgs.buildPackages; lib.makeBinPath [ coreutils util-linux e2fsprogs xfsprogs dosfstools btrfs-progs ]}
 
       if [ ! -e '${image}' ]; then
@@ -70,7 +70,6 @@ rec {
 
   makeMacvtap = { microvmConfig, hypervisorConfig }:
     import ./macvtap.nix {
-      inherit microvmConfig hypervisorConfig;
-      lib = nixpkgs-lib;
+      inherit microvmConfig hypervisorConfig lib;
     };
 }

lib/runner.nix

@@ -6,7 +6,7 @@
 let
   inherit (pkgs) lib;
 
-  inherit (import ./. { nixpkgs-lib = lib; }) createVolumesScript makeMacvtap;
+  inherit (import ./. { inherit lib; }) createVolumesScript makeMacvtap;
   inherit (makeMacvtap {
     inherit microvmConfig hypervisorConfig;
   }) openMacvtapFds macvtapFds;

lib/runners/qemu.nix

@@ -41,7 +41,7 @@ let
   inherit (microvmConfig) hostName cpu vcpu mem balloonMem user interfaces shares socket forwardPorts devices vsock graphics storeOnDisk kernel initrdPath storeDisk;
   inherit (microvmConfig.qemu) machine extraArgs serialConsole;
 
-  inherit (import ../. { nixpkgs-lib = pkgs.lib; }) withDriveLetters;
+  inherit (import ../. { inherit (pkgs) lib; }) withDriveLetters;
 
   volumes = withDriveLetters microvmConfig;
 

lib/runners/stratovirt.nix

@@ -14,7 +14,7 @@ let
 
   tapMultiQueue = vcpu > 1;
 
-  inherit (import ../. { nixpkgs-lib = pkgs.lib; }) withDriveLetters;
+  inherit (import ../. { inherit (pkgs) lib; }) withDriveLetters;
   volumes = withDriveLetters microvmConfig;
 
   # PCI required by vfio-pci for PCI passthrough

nixos-modules/microvm/default.nix

@@ -2,7 +2,7 @@
 
 let
   microvm-lib = import ../../lib {
-    nixpkgs-lib = lib;
+    inherit lib;
   };
 
 in

nixos-modules/microvm/mounts.nix

@@ -4,7 +4,7 @@ let
   inherit (config.microvm) storeDiskType storeOnDisk writableStoreOverlay;
 
   inherit (import ../../lib {
-    nixpkgs-lib = lib;
+    inherit lib;
   }) defaultFsType withDriveLetters;
 
   hostStore = builtins.head (

nixos-modules/microvm/options.nix

@@ -1,7 +1,7 @@
 { config, options, lib, pkgs, ... }:
 let
   self-lib = import ../../lib {
-    nixpkgs-lib = lib;
+    inherit lib;
   };
 
   hostName = config.networking.hostName or "$HOSTNAME";