3 files changed, 98 insertions, 0 deletions

diff --git a/flakes/mypackages/overlays/morph/default.nix b/flakes/mypackages/overlays/morph/default.nix
new file mode 100644
index 0000000..b316d70
--- /dev/null
+++ b/flakes/mypackages/overlays/morph/default.nix
@@ -0,0 +1,27 @@
+self: super: {
+  morph = super.morph.overrideAttrs(old: rec {
+    version = "1.6.0-30-g5b85237";
+    src = self.fetchFromGitHub {
+      owner = "dbcdk";
+      repo = "morph";
+      rev = "5b852370d8054a895b5ba79b5ef017c3afbb3a3c";
+      sha256 = "166dwibbpb90bdy8dvhlinh6gc509f8pq8wn345h01pilf7fc8fh";
+    };
+
+    ldflags = [
+      "-X main.version=${version}"
+    ];
+    preBuild = ''
+      ldflags+=" -X main.assetRoot=$lib"
+    '';
+    postInstall = ''
+      mkdir -p $lib
+      cp -v ./data/*.nix $lib
+    '';
+
+    outputs = [ "out" "lib" ];
+    vendorSha256 = "08zzp0h4c4i5hk4whz06a3da7qjms6lr36596vxz0d8q0n7rspr9";
+
+    patches = (old.patches or []) ++ [ ./dry-run.patch ];
+  });
+}
diff --git a/flakes/mypackages/overlays/morph/dry-run.patch b/flakes/mypackages/overlays/morph/dry-run.patch
new file mode 100644
index 0000000..2ff099e
--- /dev/null
+++ b/flakes/mypackages/overlays/morph/dry-run.patch
@@ -0,0 +1,59 @@
+diff --git a/morph.go b/morph.go
+index a88414b..e5894df 100644
+--- a/morph.go
++++ b/morph.go
+@@ -542,6 +542,7 @@ func getNixContext() *nix.NixContext {
+        return &nix.NixContext{
+                EvalMachines:    filepath.Join(assetRoot, assets.Friendly, "eval-machines.nix"),
+                ShowTrace:       showTrace,
++               DryRun:          *dryRun,
+                KeepGCRoot:      *keepGCRoot,
+                AllowBuildShell: *allowBuildShell,
+        }
+@@ -574,8 +575,10 @@ func buildHosts(hosts []nix.Host) (resultPath string, err error) {
+                return
+        }
+ 
+-       fmt.Fprintln(os.Stderr, "nix result path: ")
+-       fmt.Println(resultPath)
++       if resultPath != "" {
++               fmt.Fprintln(os.Stderr, "nix result path: ")
++               fmt.Println(resultPath)
++       }
+        return
+ }
+ 
+diff --git a/nix/nix.go b/nix/nix.go
+index 6a9cfd5..0f7884b 100644
+--- a/nix/nix.go
++++ b/nix/nix.go
+@@ -49,6 +49,7 @@ type Deployment struct {
+ type NixContext struct {
+        EvalMachines    string
+        ShowTrace       bool
++       DryRun          bool
+        KeepGCRoot      bool
+        AllowBuildShell bool
+ }
+@@ -269,6 +270,10 @@ func (ctx *NixContext) BuildMachines(deploymentPath string, hosts []Host, nixArg
+                args = append(args, "--show-trace")
+        }
+ 
++       if ctx.DryRun {
++               args = append(args, "--dry-run")
++       }
++
+        if nixBuildTargets != "" {
+                args = append(args,
+                        "--arg", "buildTargets", nixBuildTargets)
+@@ -308,6 +313,10 @@ func (ctx *NixContext) BuildMachines(deploymentPath string, hosts []Host, nixArg
+                return resultPath, errors.New(errorMessage)
+        }
+ 
++       if ctx.DryRun {
++               return "", err
++       }
++
+        resultPath, err = os.Readlink(resultLinkPath)
+        if err != nil {
+                return "", err
diff --git a/flakes/mypackages/overlays/morph/verbose_nix.patch b/flakes/mypackages/overlays/morph/verbose_nix.patch
new file mode 100644
index 0000000..389a79c
--- /dev/null
+++ b/flakes/mypackages/overlays/morph/verbose_nix.patch
@@ -0,0 +1,12 @@
+diff --git a/nix/nix.go b/nix/nix.go
+index bb63870..7fe04aa 100644
+--- a/nix/nix.go
++++ b/nix/nix.go
+@@ -347,6 +347,7 @@ func Push(ctx *ssh.SSHContext, host Host, paths ...string) (err error) {
+        options := mkOptions(host)
+        for _, path := range paths {
+                args := []string{
++                       "-v",
+                        "copy",
+                        path,
+                        "--to", "ssh://" + userArg + host.TargetHost + keyArg,