Fix Linux nix daemon startup

Signed-off-by: Nick Sweeting <git@sweeting.me>

Author: pirate

.github/workflows/tests.yml

@@ -198,6 +198,14 @@ jobs:
         cache: false
 
     - name: Install Nix
+      if: runner.os == 'Linux'
+      uses: DeterminateSystems/nix-installer-action@v22
+      with:
+        planner: linux-multi
+        start-daemon: true
+
+    - name: Install Nix
+      if: runner.os != 'Linux'
       uses: DeterminateSystems/nix-installer-action@v22
 
     - name: Sanitize PATH after Nix install
@@ -425,6 +433,14 @@ jobs:
         cache: false
 
     - name: Install Nix
+      if: runner.os == 'Linux'
+      uses: DeterminateSystems/nix-installer-action@v22
+      with:
+        planner: linux-multi
+        start-daemon: true
+
+    - name: Install Nix
+      if: runner.os != 'Linux'
       uses: DeterminateSystems/nix-installer-action@v22
 
     - name: Sanitize PATH after Nix install

abxpkg/binprovider_nix.py

@@ -218,7 +218,11 @@ def default_install_handler(
             or arg.startswith(("channel:", "http://", "https://", "github:", "path:"))
             for arg in cmd_install_args
         ):
-            cmd_install_args = ["-f", "channel:nixpkgs-unstable", *cmd_install_args]
+            cmd_install_args = [
+                "-f",
+                "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz",
+                *cmd_install_args,
+            ]
         installer_bin = self.INSTALLER_BINARY(no_cache=no_cache).loaded_abspath
         assert installer_bin
         env = {
@@ -310,8 +314,27 @@ def default_install_handler(
             )
             self.exec(
                 bin_name="sudo",
-                cmd=["systemctl", "restart", "nix-daemon.socket"],
+                cmd=["systemctl", "reset-failed", "nix-daemon.socket"],
+                timeout=timeout,
+                quiet=True,
+            )
+            self.exec(
+                bin_name="sudo",
+                cmd=["systemctl", "reset-failed", "nix-daemon.service"],
                 timeout=timeout,
+                quiet=True,
+            )
+            self.exec(
+                bin_name="sudo",
+                cmd=["systemctl", "start", "nix-daemon.socket"],
+                timeout=timeout,
+                quiet=True,
+            )
+            self.exec(
+                bin_name="sudo",
+                cmd=["systemctl", "start", "nix-daemon.service"],
+                timeout=timeout,
+                quiet=True,
             )
             proc = self.exec(
                 bin_name=installer_bin,
@@ -435,8 +458,27 @@ def default_update_handler(
             )
             self.exec(
                 bin_name="sudo",
-                cmd=["systemctl", "restart", "nix-daemon.socket"],
+                cmd=["systemctl", "reset-failed", "nix-daemon.socket"],
                 timeout=timeout,
+                quiet=True,
+            )
+            self.exec(
+                bin_name="sudo",
+                cmd=["systemctl", "reset-failed", "nix-daemon.service"],
+                timeout=timeout,
+                quiet=True,
+            )
+            self.exec(
+                bin_name="sudo",
+                cmd=["systemctl", "start", "nix-daemon.socket"],
+                timeout=timeout,
+                quiet=True,
+            )
+            self.exec(
+                bin_name="sudo",
+                cmd=["systemctl", "start", "nix-daemon.service"],
+                timeout=timeout,
+                quiet=True,
             )
             proc = self.exec(
                 bin_name=installer_bin,
@@ -560,8 +602,27 @@ def default_uninstall_handler(
             )
             self.exec(
                 bin_name="sudo",
-                cmd=["systemctl", "restart", "nix-daemon.socket"],
+                cmd=["systemctl", "reset-failed", "nix-daemon.socket"],
+                timeout=timeout,
+                quiet=True,
+            )
+            self.exec(
+                bin_name="sudo",
+                cmd=["systemctl", "reset-failed", "nix-daemon.service"],
+                timeout=timeout,
+                quiet=True,
+            )
+            self.exec(
+                bin_name="sudo",
+                cmd=["systemctl", "start", "nix-daemon.socket"],
+                timeout=timeout,
+                quiet=True,
+            )
+            self.exec(
+                bin_name="sudo",
+                cmd=["systemctl", "start", "nix-daemon.service"],
                 timeout=timeout,
+                quiet=True,
             )
             proc = self.exec(
                 bin_name=installer_bin,