From cad8bbe58905a14651a469be78f89cad55ee7c15 Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Tue, 12 Apr 2022 18:55:41 +0100
Subject: [PATCH] lib: init flakes.nix

This commit creates flakes.nix, which is a library containing functions
which relate to interacting with flakes. It also moves related functions
from trivial.nix into it.
---
 lib/default.nix |  6 +++++-
 lib/flakes.nix  | 22 ++++++++++++++++++++++
 lib/trivial.nix | 16 ----------------
 3 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 lib/flakes.nix

diff --git a/lib/default.nix b/lib/default.nix
index 7d20acc67948..8d7cc20ae482 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -11,6 +11,9 @@ let
     callLibs = file: import file { lib = self; };
   in {
 
+    # interacting with flakes
+    flakes = callLibs ./flakes.nix;
+
     # often used, or depending on very little
     trivial = callLibs ./trivial.nix;
     fixedPoints = callLibs ./fixed-points.nix;
@@ -59,12 +62,13 @@ let
     # linux kernel configuration
     kernel = callLibs ./kernel.nix;
 
+    inherit (self.flakes) callLocklessFlake;
     inherit (builtins) add addErrorContext attrNames concatLists
       deepSeq elem elemAt filter genericClosure genList getAttr
       hasAttr head isAttrs isBool isInt isList isString length
       lessThan listToAttrs pathExists readFile replaceStrings seq
       stringLength sub substring tail trace;
-    inherit (self.trivial) id callLocklessFlake const pipe concat or and bitAnd bitOr bitXor
+    inherit (self.trivial) id const pipe concat or and bitAnd bitOr bitXor
       bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max
       importJSON importTOML warn warnIf warnIfNot throwIf throwIfNot checkListOfEnum
       info showWarnings nixpkgsVersion version isInOldestRelease
diff --git a/lib/flakes.nix b/lib/flakes.nix
new file mode 100644
index 000000000000..4dc027b6c9b3
--- /dev/null
+++ b/lib/flakes.nix
@@ -0,0 +1,22 @@
+{ lib }:
+
+rec {
+
+  /* imports a flake.nix without acknowledging its lock file, useful for
+    referencing subflakes from a parent flake. The second argument allows
+    specifying the inputs of this flake.
+
+    Example:
+      callLocklessFlake {
+        path = ./directoryContainingFlake;
+        inputs = { inherit nixpkgs; };
+      }
+  */
+  callLocklessFlake = { path, inputs ? { } }:
+    let
+      self = { outPath = path; } //
+        ((import (path + "/flake.nix")).outputs (inputs // { self = self; }));
+    in
+    self;
+
+}
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 0b9b6bd910f0..18616a189c26 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -13,22 +13,6 @@ rec {
     # The value to return
     x: x;
 
-  /* imports a flake.nix without acknowledging its lock file, useful for
-     referencing subflakes from a parent flake. The second argument allows
-     specifying the inputs of this flake.
-
-     Example:
-       callLocklessFlake {
-         path = ./directoryContainingFlake;
-         inputs = { inherit nixpkgs; };
-       }
-  */
-  callLocklessFlake = { path, inputs ? {} }: let
-    self = {outPath = path;} //
-    ((import (path + "/flake.nix")).outputs (inputs // {self = self;}));
-  in
-    self;
-
   /* The constant function
 
      Ignores the second argument. If called with only one argument,