Merge pull request #146 from emacs-twist/registries

Rename the argument inventories to registries
emacs-twist · Dec 2, 2023 · 09742dc · 09742dc
2 parents 4f17e8b + 8596451
commit 09742dc
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/pkgs/emacs/default.nix b/pkgs/emacs/default.nix
@@ -5,7 +5,11 @@
 }: {
   emacsPackage ? pkgs.emacs,
   lockDir,
-  inventories,
+  inventories ? null,
+  registries ?
+    if inventories == null
+    then builtins.abort "emacsTwist: registries is a required argument"
+    else lib.warn "emacsTwist: inventories is deprecated. Use registries instead." inventories,
   initFiles,
   initParser ? lib.parseUsePackages {},
   initReader ? file: initParser (builtins.readFile file),
@@ -95,9 +99,10 @@ in
         flakeLockFile
         archiveLockFile
         builtinLibraries
-        inventories
         inputOverrides
         ;
+      # Just remap the name
+      inventories = registries;
       elispPackagePins = userConfig.elispPackagePins or {};
     };
 

diff --git a/template/flake.nix b/template/flake.nix
@@ -58,7 +58,8 @@
           emacsPackage = pkgsForEmacs.emacsUnstable.overrideAttrs (_: {
             version = "28.0.91";
           });
-          inventories = import ./inventories.nix inputs;
+
+          registries = import ./registries.nix inputs;
           lockDir = ./lock;
           initFiles = [
             ./init.el

diff --git a/template/inventories.nix → template/registries.nix b/template/inventories.nix → template/registries.nix
diff --git a/test/twist-minimal.nix b/test/twist-minimal.nix
@@ -6,5 +6,5 @@ emacsTwist {
   inherit emacsPackage;
   initFiles = [];
   lockDir = ./lock;
-  inventories = [];
+  registries = [];
 }
diff --git a/test/twist.nix b/test/twist.nix
@@ -14,7 +14,7 @@ emacsTwist {
   ];
   lockDir = ./lock;
   inherit initialLibraries;
-  inventories = [
+  registries = [
     {
       type = "elpa";
       path = inputs.gnu-elpa.outPath + "/elpa-packages";