From bd44207786de96532e9838cabd955d630aa776f8 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 15 Sep 2016 01:21:42 +0200
Subject: [PATCH] lib/default.nix: reorder imports for clarity

Group imports according to the kind of functions they contain, in a more
descriptive manner.
---
 lib/default.nix | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index 32ac0c58af6c..56e002ddc589 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,27 +1,45 @@
-let 
+let
 
+  # trivial, often used functions
   trivial = import ./trivial.nix;
+
+  # datatypes
+  attrsets = import ./attrsets.nix;
   lists = import ./lists.nix;
   strings = import ./strings.nix;
   stringsWithDeps = import ./strings-with-deps.nix;
-  attrsets = import ./attrsets.nix;
+
+  # packaging
+  customisation = import ./customisation.nix;
+  maintainers = import ./maintainers.nix;
+  meta = import ./meta.nix;
   sources = import ./sources.nix;
+
+  # module system
   modules = import ./modules.nix;
   options = import ./options.nix;
   types = import ./types.nix;
-  meta = import ./meta.nix;
-  debug = import ./debug.nix;
-  misc = import ./deprecated.nix;
-  maintainers = import ./maintainers.nix;
+
+  # constants
+  licenses = import ./licenses.nix;
   platforms = import ./platforms.nix;
   systems = import ./systems.nix;
-  customisation = import ./customisation.nix;
-  licenses = import ./licenses.nix;
+
+  # misc
+  debug = import ./debug.nix;
+  misc = import ./deprecated.nix;
+
+  # domain-specific
   sandbox = import ./sandbox.nix;
 
 in
-  { inherit trivial lists strings stringsWithDeps attrsets sources options
-      modules types meta debug maintainers licenses platforms systems sandbox;
+  { inherit trivial
+            attrsets lists strings stringsWithDeps
+            customisation maintainers meta sources
+            modules options types
+            licenses platforms systems
+            debug misc
+            sandbox;
   }
   # !!! don't include everything at top-level; perhaps only the most
   # commonly used functions.