refactor: Prepare for adding an alternative lock API

emacs-twist · Nov 25, 2023 · c95335c · c95335c
1 parent 9c3c6ba
commit c95335c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/pkgs/emacs/default.nix b/pkgs/emacs/default.nix
@@ -206,13 +206,14 @@ in
       # have to run `nix flake lock`` in the target directory to update
       # flake.lock.
       lock =
-        generateLockFiles
-        {
-          packageInputs = enumerateConcretePackageSet "lock" explicitPackages;
-          flakeNix = true;
-          archiveLock = true;
-          postCommand = "nix flake lock";
-        }
+        (generateLockFiles
+          {
+            packageInputs = enumerateConcretePackageSet "lock" explicitPackages;
+            flakeNix = true;
+            archiveLock = true;
+            postCommand = "nix flake lock";
+          })
+        .asAppWritingToRelativeDir
         lockDirName;
 
       # Generate flake.lock with the current revisions
@@ -223,12 +224,12 @@ in
       # };
 
       # Generate archive.lock with latest packages from ELPA package archives
-      update =
-        generateLockFiles
+      update = (generateLockFiles
         {
           packageInputs = enumerateConcretePackageSet "update" explicitPackages;
           archiveLock = true;
-        }
-        lockDirName;
+        })
+      .asAppWritingToRelativeDir
+      lockDirName;
     };
   })
diff --git a/pkgs/emacs/lock/default.nix b/pkgs/emacs/lock/default.nix
@@ -14,7 +14,7 @@
   flakeLock ? false,
   archiveLock ? false,
   postCommand ? null,
-}: outDir:
+}:
 assert (flakeNix || flakeLock || archiveLock); let
   inherit (builtins) toJSON attrNames mapAttrs;
 
@@ -108,10 +108,11 @@ assert (flakeNix || flakeLock || archiveLock); let
       ${postCommand}
     ''}
   '';
-in
-  # This is an app, and not a derivation. See
-  # https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-run.html#apps
-  {
+in {
+  asAppWritingToRelativeDir = outDir: {
+    # This is an app, and not a derivation. See
+    # https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-run.html#apps
     type = "app";
-    program = writeToDir.outPath;
-  }
+    program = (writeToDir outDir).outPath;
+  };
+}