pkgs.lib -> lib

nix/adhoc-cloud-vm.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   boot.loader.grub.version = 2;

nix/auto-luks.nix

@@ -1,8 +1,8 @@
 # Module to automatically create LUKS-encrypted devices.
 
-{ config, pkgs, utils, ... }:
+{ config, lib, pkgs, utils, ... }:
 
-with pkgs.lib;
+with lib;
 with utils;
 
 {

nix/auto-raid0.nix

@@ -1,9 +1,9 @@
 # Module to automatically combine devices into a RAID-0 volume
 # (actually an LVM logical volume).
 
-{ config, pkgs, utils, ... }:
+{ config, lib, pkgs, utils, ... }:
 
-with pkgs.lib;
+with lib;
 with utils;
 
 {

nix/ec2-keypair.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, uuid, name, ... }:
+{ config, lib, uuid, name, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 

nix/ec2-placement-group.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, uuid, name, ... }:
+{ config, lib, uuid, name, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 

nix/ec2-security-group.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, uuid, name, ... }:
+{ config, lib, uuid, name, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 

nix/ec2.nix

@@ -4,7 +4,7 @@
 
 with lib;
 with utils;
-with (import ./lib.nix pkgs);
+with import ./lib.nix lib;
 
 let
 

nix/elastic-ip.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, uuid, name, ... }:
+{ config, lib, uuid, name, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 

nix/gce-disk.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, uuid, name, ... }:
+{ config, pkgs, lib, uuid, name, ... }:
 
-with pkgs.lib;
+with lib;
 with (import ./lib.nix pkgs);
 {
 

nix/gce-forwarding-rule.nix

@@ -1,7 +1,8 @@
-{ config, pkgs, uuid, name, ... }:
+{ config, lib, pkgs, uuid, name, ... }:
+
+with lib;
+with import ./lib.nix lib;
 
-with pkgs.lib;
-with (import ./lib.nix pkgs);
 {
 
   options = (import ./gce-credentials.nix pkgs "forwarding rule") // {

nix/gce-http-health-check.nix

@@ -1,7 +1,7 @@
-{ config, pkgs, uuid, name, ... }:
+{ config, lib, pkgs, uuid, name, ... }:
 
-with pkgs.lib;
-with (import ./lib.nix pkgs);
+with lib;
+with import ./lib.nix lib;
 {
 
   options = (import ./gce-credentials.nix pkgs "HTTP health check") // {

nix/gce-image.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, uuid, name, ... }:
-with pkgs.lib;
-with (import ./lib.nix pkgs);
+{ config, lib, pkgs, uuid, name, ... }:
+
+with lib;
+with import ./lib.nix lib;
+
 {
 
   options = (import ./gce-credentials.nix pkgs "image") // {

nix/gce-network.nix

@@ -1,7 +1,7 @@
-{ config, pkgs, uuid, name, ... }:
+{ config, lib, pkgs, uuid, name, ... }:
 
-with pkgs.lib;
-with (import ./lib.nix pkgs);
+with lib;
+with import ./lib.nix lib;
 
 let
 

nix/gce-static-ip.nix

@@ -1,7 +1,8 @@
-{ config, pkgs, uuid, name, ... }:
+{ config, lib, pkgs, uuid, name, ... }:
+
+with lib;
+with import ./lib.nix lib;
 
-with pkgs.lib;
-with (import ./lib.nix pkgs);
 {
 
   options = (import ./gce-credentials.nix pkgs "IP address") // {

nix/gce-target-pool.nix

@@ -1,7 +1,8 @@
-{ config, pkgs, uuid, name, ... }:
+{ config, lib, pkgs, uuid, name, ... }:
+
+with lib;
+with import ./lib.nix lib;
 
-with pkgs.lib;
-with (import ./lib.nix pkgs);
 let
 
   machine = mkOptionType {

nix/gce.nix

@@ -1,9 +1,10 @@
 # Configuration specific to the Google Compute Engine backend.
 
-{ config, pkgs, name, uuid, resources, ... }:
+{ config, lib, pkgs, name, uuid, resources, ... }:
+
+with lib;
+with import ./lib.nix lib;
 
-with pkgs.lib;
-with (import ./lib.nix pkgs);
 let
 
   gce_dev_prefix = "/dev/disk/by-id/scsi-0Google_PersistentDisk_";

nix/gse-bucket.nix

@@ -1,7 +1,7 @@
-{ config, pkgs, uuid, name, ... }:
+{ config, lib, pkgs, uuid, name, ... }:
 
-with pkgs.lib;
-with (import ./lib.nix pkgs);
+with lib;
+with import ./lib.nix lib;
 
 let
 

nix/hetzner.nix

@@ -1,8 +1,8 @@
 # Configuration specific to the Hetzner backend.
 
-{ config, pkgs, ... }:
+{ config, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
   ###### interface

nix/iam-role.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, uuid, name, ... }:
+{ config, lib, uuid, name, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 

nix/keys.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   keyOptionsType = types.submodule {

nix/lib.nix

@@ -1,4 +1,8 @@
-pkgs: with pkgs.lib; {
+lib:
+
+with lib;
+
+{
 
   resource = type: mkOptionType {
     name = "resource of type ‘${type}’";

nix/libvirtd.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
   sz = toString config.deployment.libvirtd.baseImageSize;
@@ -76,7 +76,7 @@ in
     deployment.libvirtd.networks = mkOption {
       default = [ "default" ];
       type = types.listOf types.str;
-      description = "Names of libvirt networks to attach the VM to";
+      description = "Names of libvirt networks to attach the VM to.";
     };
   };
 

nix/options.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 let
 

nix/resource.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, name, ... }:
+{ config, lib, name, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 

nix/route53.nix

@@ -1,8 +1,8 @@
 # Configuration specific to the Amazon Route 53 service.
 
-{ config, pkgs, ... }:
+{ config, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 

nix/s3-bucket.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, uuid, name, ... }:
+{ config, lib, uuid, name, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 

nix/sqs-queue.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, uuid, name, ... }:
+{ config, lib, uuid, name, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 

nix/ssh-keypair.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, uuid, name, ... }:
+{ config, lib, uuid, name, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 

nix/ssh-tunnel.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 {
 

nix/virtualbox-image-nixops.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 let
 

nix/virtualbox.nix

@@ -1,6 +1,6 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
-with pkgs.lib;
+with lib;
 
 let