Offline operation fixes, added integration test

Author: Thesola10

default.nix

@@ -1,5 +1,5 @@
 { lib, python3Packages, fetchPypi, nix-index, nix, hatch, amber-lang
-, ... }:
+, callPackage, ... }:
 
 let
   nixie_ver = "2026.03-a1";

flake.nix

@@ -35,6 +35,10 @@
         libfakedir = fakedir.packages.${system}.fakedir;
       } else {});
 
+      checks = {
+        rootless = pkgs.callPackage ./tests/rootless.nix { inherit (self.packages.${system}) nixie sources static-bins; };
+      };
+
       devShells = {
         default = pkgs.mkShell {
           # These dependencies aren't involved in the build process, but are

nixie/cli/commands/init.py

@@ -27,7 +27,7 @@ def _cmd(console: Console, nocommand=False, **args):
                 Path('.').rglob('*.nix').send(None)
                 outn = './nix-shell'
                 skipgen = True
-            except StopIteration:
+            except:
                 skipgen = False
                 outn = './nix'
         else:

nixie/cli/common.py

@@ -36,13 +36,13 @@ def get_appcache():
     cach.mkdir(exist_ok=True, parents=True)
     return cach
 
-def mktmp() -> str:
+def mktmp() -> Path:
     '''Create a temporary work directory and hook its deletion at exit.
     '''
     tdir = tempfile.mkdtemp(prefix='nixie-')
     cleanup = lambda: shutil.rmtree(tdir)
     atexit.register(cleanup)
-    return tdir
+    return Path(tdir)
 
 def pick(prompt: str, opts, open_ended = False, **ws):
     '''Pick from a selection of items, displaying a leading prompt.

nixie/cli/fetchers.py

@@ -39,7 +39,7 @@ def eval_latest_sources(args: dict, st = None):
         except RuntimeError as e:
             srcs_eval = _rsrc_fallback('srcs', e)
     else:
-        srcs_eval = args['sources_derivation']
+        srcs_eval = nix.hashify(args['sources_derivation'])
     if args['binaries_derivation'] is None:
         try:
             bins_eval = nix.flake_eval(nix.EXPR_NIXIE_BINARIES)
@@ -48,17 +48,20 @@ def eval_latest_sources(args: dict, st = None):
         except RuntimeError as e:
             bins_eval = _rsrc_fallback('bins', e)
     else:
-        bins_eval = args['binaries_derivation']
+        bins_eval = nix.hashify(args['binaries_derivation'])
     debug(f"Sources derivation: {srcs_eval}")
     debug(f"Binaries derivation: {bins_eval}")
     return srcs_eval, bins_eval
 
 def _tmplink(tdir: Path, drv: str):
     locdrv = list(Path('/nix/store/').glob(f'{drv}*'))
+    target = tdir.joinpath(drv)
     if len(locdrv) == 0:
         error('Derivation could not be found locally. Check your Internet connection and supplied derivation hash then try again.')
     else:
-        tdir.joinpath('{drv}').symlink_to(locdrv[0])
+        target.rmdir() # fetchCachix may have left an empty dir
+        target.symlink_to(locdrv[0])
+        debug(f"Created symlink: {drv} -> {locdrv[0]}")
 
 def prefetch_resources(tdir: Path,
                        feats: script.NixieFeatures,

nixie/output/tarball.py

@@ -91,13 +91,13 @@ def writeInto(self, dest: BytesIO, tmpdir: Path = None):
             for name, tgt in self.features.pinned_channels.items():
                 self._push_channel(m, name, tgt)
             if self.features.include_sources:
-                srcs = [ f for f in tmpdir.joinpath(nix.hashify(self.features.sources_drv)).iterdir()
+                srcs = [ f for f in tmpdir.joinpath(nix.hashify(self.features.sources_drv)).resolve().iterdir()
                             if f.name != 'filelist' ]
                 for f in srcs:
                     with tf.open(f, mode='r:*') as fm:
                         self.transplant(m, fm, 'sources')
             if self.features.include_bins:
-                bins = [ f for f in tmpdir.joinpath(nix.hashify(self.features.bins_drv)).iterdir()
+                bins = [ f for f in tmpdir.joinpath(nix.hashify(self.features.bins_drv)).resolve().iterdir()
                             if f.name != 'filelist' ]
                 for f in bins:
                     m.add(f, path.basename(f))

src/common.ab

@@ -120,8 +120,11 @@ pub fun untar(member: Text, dump: Bool = false): Text?
     }
 
     trust $rm {archive}$
-
-    return tar_out
+    if dump {
+        return tar_out
+    } else {
+        return member
+    }
 }
 
 /// Checks that a list of commands are available at runtime.

src/platform.ab

@@ -58,14 +58,19 @@ pub fun get_nix_root(): Text
 }
 
 /// Return the path to the user's cache directory on the current system.
+///
+/// Will create the directory in the rare case where it does not exist.
 pub fun get_cache_root(): Text
 {
     let userhome = trust env_var_get("HOME")
     let osname = get_osname()
+    let result = ""
     if {
-        osname == "Darwin": return "{userhome}/Library/Caches"
-        else:               return "{userhome}/.cache"
+        osname == "Darwin": result = "{userhome}/Library/Caches"
+        else:               result = "{userhome}/.cache"
     }
+    trust $mkdir -p {result}$
+    return result
 }
 
 /// Return the path to the root of the Git repository the script is located in.

tests/rootless.nix

@@ -0,0 +1,20 @@
+{ pkgs, nixie, sources, static-bins }:
+pkgs.testers.nixosTest {
+  name = "nixie-runs-rootless";
+  nodes = {
+    machine = {
+      environment.systemPackages = with pkgs; [
+        nixie
+        git
+      ];
+    };
+  };
+
+  testScript = ''
+    start_all()
+
+    machine.succeed("git init")
+    machine.succeed("nixie init --sources-derivation ${sources} --binaries-derivation ${static-bins} --with-binaries")
+    machine.succeed("./nix --nixie-ignore-system --version")
+  '';
+}