Merge pull request #272 from stuebinm/fix-nonflake-build

fix nix-build invocation in non-flake builds

4 files changed, 42 insertions, 11 deletions

diff --git a/nix/tests/common.nix b/nix/tests/common.nix
index 37abb5d..9e5f363 100644
--- a/nix/tests/common.nix
+++ b/nix/tests/common.nix
@@ -2,11 +2,12 @@
 #
 # SPDX-License-Identifier: MPL-2.0
 
-{inputs, pkgs, ...}: {
+{inputs, pkgs, flakes, ...}: {
   nix = {
     registry.nixpkgs.flake = inputs.nixpkgs;
+    nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
     extraOptions = ''
-      experimental-features = nix-command flakes
+      experimental-features = ${if flakes then "nix-command flakes" else "nix-command"}
     '';
     settings = {
       trusted-users = [ "root" "@wheel" ];
diff --git a/nix/tests/default.nix b/nix/tests/default.nix
index 7fe8628..218bbd8 100644
--- a/nix/tests/default.nix
+++ b/nix/tests/default.nix
@@ -20,12 +20,12 @@ let
     done <$refs
   '';
 
-  mkTest = { name ? "", user ? "root", isLocal ? true, deployArgs }: let
+  mkTest = { name ? "", user ? "root", flakes ? true, isLocal ? true, deployArgs }: let
     nodes = {
       server = { nodes, ... }: {
         imports = [
          ./server.nix
-         (import ./common.nix { inherit inputs pkgs; })
+         (import ./common.nix { inherit inputs pkgs flakes; })
         ];
         virtualisation.additionalPaths = lib.optionals (!isLocal) [
           pkgs.hello
@@ -35,8 +35,10 @@ let
         ];
       };
       client = { nodes, ... }: {
-        imports = [ (import ./common.nix { inherit inputs pkgs; }) ];
+        imports = [ (import ./common.nix { inherit inputs pkgs flakes; }) ];
         environment.systemPackages = [ pkgs.deploy-rs.deploy-rs ];
+        # nix evaluation takes a lot of memory, especially in non-flake usage
+        virtualisation.memorySize = lib.mkForce 4096;
         virtualisation.additionalPaths = lib.optionals isLocal [
           pkgs.hello
           pkgs.figlet
@@ -56,11 +58,29 @@ let
       systems.url = "${inputs.utils.inputs.systems}";
       flake-compat.url = "${inputs.flake-compat}";
       flake-compat.flake = false;
+
+      enable-flakes.url = "${builtins.toFile "use-flakes" (if flakes then "true" else "false")}";
+      enable-flakes.flake = false;
     '';
 
     flake = builtins.toFile "flake.nix"
       (lib.replaceStrings [ "##inputs##" ] [ flakeInputs ] (builtins.readFile ./deploy-flake.nix));
 
+    flakeCompat = builtins.toFile "default.nix" ''
+      (import
+        (
+          let
+            lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+          in
+          fetchTarball {
+            url = "https://not-used-we-fetch-by-hash";
+            sha256 = lock.nodes.flake-compat.locked.narHash;
+          }
+        )
+        { src = ./.; }
+      ).defaultNix
+    '';
+
   in pkgs.nixosTest {
     inherit nodes name;
 
@@ -73,11 +93,11 @@ let
       # Prepare
       client.succeed("mkdir tmp && cd tmp")
       client.succeed("cp ${flake} ./flake.nix")
+      client.succeed("cp ${flakeCompat} ./default.nix")
       client.succeed("cp ${./server.nix} ./server.nix")
       client.succeed("cp ${./common.nix} ./common.nix")
       client.succeed("cp ${serverNetworkJSON} ./network.json")
-      client.succeed("nix flake lock")
-
+      client.succeed("nix --extra-experimental-features flakes flake lock")
 
       # Setup SSH key
       client.succeed("mkdir -m 700 /root/.ssh")
@@ -136,4 +156,10 @@ in {
     user = "deploy";
     deployArgs = "-s .#profile --ssh-opts '-p 22 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' -- --offline";
   };
+  # Deployment using a non-flake nix
+  non-flake-build = mkTest {
+    name = "local-build";
+    flakes = false;
+    deployArgs = "-s .#server";
+  };
 }
diff --git a/nix/tests/deploy-flake.nix b/nix/tests/deploy-flake.nix
index 3e1e426..47f0f5b 100644
--- a/nix/tests/deploy-flake.nix
+++ b/nix/tests/deploy-flake.nix
@@ -15,7 +15,7 @@
   in {
     nixosConfigurations.server = nixpkgs.lib.nixosSystem {
       inherit system pkgs;
-      specialArgs = { inherit inputs; };
+      specialArgs = { inherit inputs; flakes = import inputs.enable-flakes; };
       modules = [
         ./server.nix
         ./common.nix
diff --git a/src/push.rs b/src/push.rs
index c800a98..864c336 100644
--- a/src/push.rs
+++ b/src/push.rs
@@ -244,9 +244,13 @@ pub async fn build_profile(data: PushProfileData<'_>) -> Result<(), PushProfileE
         .next()
         .ok_or(PushProfileError::ShowDerivationEmpty)?;
 
-    // Since nix 2.15.0 'nix build <path>.drv' will build only the .drv file itself, not the
-    // derivation outputs, '^out' is used to refer to outputs explicitly
-    let new_deriver = &(deriver.to_owned().to_string() + "^out");
+    let new_deriver = &if data.supports_flakes {
+        // Since nix 2.15.0 'nix build <path>.drv' will build only the .drv file itself, not the
+        // derivation outputs, '^out' is used to refer to outputs explicitly
+        deriver.to_owned().to_string() + "^out"
+    } else {
+        deriver.to_owned()
+    };
 
     let path_info_output = Command::new("nix")
         .arg("--experimental-features").arg("nix-command")