Merge pull request #1116 from sebas031811/sebas031811

feat(build): #990 move cache directory
fluidattacks · Jun 27, 2023 · 4340e83 · 4340e83
2 parents 3004ae7 + a8e78b9
commit 4340e83
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/docs/src/api/extensions/fundamentals.md b/docs/src/api/extensions/fundamentals.md
@@ -584,8 +584,8 @@ Example:
 
         [DEBUG] Version is 1.0
         [INFO] pwd is /data/github/fluidattacks/makes
-        [INFO] Running tree command on /home/user/.makes/state/example
-        /home/user/.makes/state/example
+        [INFO] Running tree command on /home/user/.cache/makes/state/example
+        /home/user/.cache/makes/state/example
         └── dir
             └── file
 

diff --git a/src/args/agnostic.nix b/src/args/agnostic.nix
@@ -2,8 +2,8 @@
 # and therefore are agnostic to the framework.
 {
   stateDirs ? {
-    global = "$HOME_IMPURE/.makes/state";
-    project = "$HOME_IMPURE/.makes/state/__default__";
+    global = "$HOME_IMPURE/.cache/makes/state";
+    project = "$HOME_IMPURE/.cache/makes/state/__default__";
   },
   system ? builtins.currentSystem,
 }: let

diff --git a/src/cli/main/cli.py b/src/cli/main/cli.py
@@ -74,9 +74,9 @@
     highlight=False,
     file=io.TextIOWrapper(sys.stderr.buffer, write_through=True),
 )
-MAKES_DIR: str = join(environ["HOME_IMPURE"], ".makes")
-makedirs(join(MAKES_DIR, "cache"), exist_ok=True)
-SOURCES_CACHE: str = join(MAKES_DIR, "cache", "sources")
+MAKES_DIR: str = join(environ["HOME_IMPURE"], ".cache/makes")
+makedirs(MAKES_DIR, exist_ok=True)
+SOURCES_CACHE: str = join(MAKES_DIR, "sources")
 ON_EXIT: List[Callable[[], None]] = []
 VERSION: str = "23.06"
 
@@ -544,7 +544,7 @@ def _help_and_exit_with_src_no_tty(src: str, attrs: List[str]) -> None:
 
 
 def _help_picking_attr(src: str, attrs: List[str]) -> List[str]:
-    cache = join(MAKES_DIR, "cache", "last.json")
+    cache = join(MAKES_DIR, "last.json")
     initial_input = "/"
     if exists(cache):
         with open(cache, encoding="utf-8") as file:

diff --git a/src/cli/test_all.py b/src/cli/test_all.py
@@ -48,7 +48,7 @@ def test_dot_hello_world() -> None:
 def test_remote_hello_world() -> None:
     cache = (
         os.environ["HOME_IMPURE"]
-        + "/.makes/cache/sources/github-fluidattacks-makes-main"
+        + "/.cache/makes/sources/github-fluidattacks-makes-main"
     )
 
     shutil.rmtree(cache, ignore_errors=True)

diff --git a/src/evaluator/modules/default.nix b/src/evaluator/modules/default.nix
@@ -59,7 +59,7 @@
   options = {
     globalStateDir = lib.mkOption {
       type = lib.types.str;
-      default = "$HOME_IMPURE/.makes/state";
+      default = "$HOME_IMPURE/.cache/makes/state";
       apply = lib.removeSuffix "/"; # canonicalize
     };
     projectStateDir = lib.mkOption {