From d31a1ba6e2cec86c4546c3b019dcbb8cd5ff6d4f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 21 Sep 2017 13:19:29 +0200
Subject: [PATCH] lib: make dag.nix take `lib` as argument

(cherry picked from commit 742d1889c52583968f062ac3ba2b82b63e166662)
---
 modules/home-environment.nix        | 2 +-
 modules/lib/dag.nix                 | 6 +++---
 modules/programs/gnome-terminal.nix | 2 +-
 modules/programs/home-manager.nix   | 2 +-
 modules/programs/info.nix           | 2 +-
 modules/systemd.nix                 | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/home-environment.nix b/modules/home-environment.nix
index 2567b0703..5756ac233 100644
--- a/modules/home-environment.nix
+++ b/modules/home-environment.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-with import ./lib/dag.nix;
+with import ./lib/dag.nix { inherit lib; };
 
 let
 
diff --git a/modules/lib/dag.nix b/modules/lib/dag.nix
index cb7e6f898..535dec35a 100644
--- a/modules/lib/dag.nix
+++ b/modules/lib/dag.nix
@@ -7,9 +7,9 @@
 #  - the addition of the function `dagEntryBefore` indicating a
 #    "wanted by" relationship.
 
-with import <nixpkgs/lib/strings.nix>;
-with import <nixpkgs/lib/attrsets.nix>;
-with import <nixpkgs/lib/lists.nix>;
+{ lib }:
+
+with lib;
 
 rec {
 
diff --git a/modules/programs/gnome-terminal.nix b/modules/programs/gnome-terminal.nix
index dc8990a96..ee9db93b1 100644
--- a/modules/programs/gnome-terminal.nix
+++ b/modules/programs/gnome-terminal.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-with import ../lib/dag.nix;
+with import ../lib/dag.nix { inherit lib; };
 
 let
 
diff --git a/modules/programs/home-manager.nix b/modules/programs/home-manager.nix
index 413f56687..a8950a74d 100644
--- a/modules/programs/home-manager.nix
+++ b/modules/programs/home-manager.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-with import ../lib/dag.nix;
+with import ../lib/dag.nix { inherit lib; };
 
 let
 
diff --git a/modules/programs/info.nix b/modules/programs/info.nix
index 3042331c9..3671c5c42 100644
--- a/modules/programs/info.nix
+++ b/modules/programs/info.nix
@@ -21,7 +21,7 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-with import ../lib/dag.nix;
+with import ../lib/dag.nix { inherit lib; };
 
 let
   cfg = config.programs.info;
diff --git a/modules/systemd.nix b/modules/systemd.nix
index dd4e594c3..8f1cd5dee 100644
--- a/modules/systemd.nix
+++ b/modules/systemd.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 with lib;
-with import ./lib/dag.nix;
+with import ./lib/dag.nix { inherit lib; };
 
 let