From edaed825650eea32878441d3b8c7eb40e8877882 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Mon, 28 Sep 2020 16:17:31 -0700
Subject: Add examples

---
 examples/simple/flake.nix | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 examples/simple/flake.nix

(limited to 'examples/simple/flake.nix')

diff --git a/examples/simple/flake.nix b/examples/simple/flake.nix
new file mode 100644
index 0000000..6e516d3
--- /dev/null
+++ b/examples/simple/flake.nix
@@ -0,0 +1,23 @@
+{
+  description = "Deploy GNU hello to localhost";
+
+  outputs = { self, nixpkgs }: {
+    deploy.nodes.example = {
+      hostname = "localhost";
+      profiles.hello = {
+        user = "test_deploy";
+        path = nixpkgs.legacyPackages.x86_64-linux.hello;
+        # Just to test that it's working
+        activate = "$PROFILE/bin/hello";
+      };
+    };
+    checks = builtins.mapAttrs
+      (_: pkgs: {
+        jsonschema = pkgs.runCommandNoCC "jsonschema-deploy-simple" { }
+          "${pkgs.python3.pkgs.jsonschema}/bin/jsonschema -i ${
+          pkgs.writeText "deploy.json" (builtins.toJSON self.deploy)
+        } ${../../interface/deploy.json} && touch $out";
+      })
+      nixpkgs.legacyPackages;
+  };
+}
-- 
cgit v1.2.3


From 8d21dd335e5259dadf832a5d1a7c72b9dd1f4400 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Tue, 29 Sep 2020 15:10:06 -0700
Subject: Add license information, reformat Nix files, clean up

---
 examples/simple/flake.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'examples/simple/flake.nix')

diff --git a/examples/simple/flake.nix b/examples/simple/flake.nix
index 6e516d3..800363f 100644
--- a/examples/simple/flake.nix
+++ b/examples/simple/flake.nix
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2020 Serokell <https://serokell.io/>
+#
+# SPDX-License-Identifier: MPL-2.0
+
 {
   description = "Deploy GNU hello to localhost";
 
@@ -5,19 +9,17 @@
     deploy.nodes.example = {
       hostname = "localhost";
       profiles.hello = {
-        user = "test_deploy";
+        user = "balsoft";
         path = nixpkgs.legacyPackages.x86_64-linux.hello;
         # Just to test that it's working
         activate = "$PROFILE/bin/hello";
       };
     };
-    checks = builtins.mapAttrs
-      (_: pkgs: {
-        jsonschema = pkgs.runCommandNoCC "jsonschema-deploy-simple" { }
-          "${pkgs.python3.pkgs.jsonschema}/bin/jsonschema -i ${
+    checks = builtins.mapAttrs (_: pkgs: {
+      jsonschema = pkgs.runCommandNoCC "jsonschema-deploy-simple" { }
+        "${pkgs.python3.pkgs.jsonschema}/bin/jsonschema -i ${
           pkgs.writeText "deploy.json" (builtins.toJSON self.deploy)
         } ${../../interface/deploy.json} && touch $out";
-      })
-      nixpkgs.legacyPackages;
+    }) nixpkgs.legacyPackages;
   };
 }
-- 
cgit v1.2.3


From 5674670a59168fb05f26e5b4fb41dd2662810e94 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Fri, 2 Oct 2020 12:58:11 -0700
Subject: General improvements, deprecate `activate` profile option in favor of
 executing $PROFILE/activate (Wrap It Yourself) to ensure successful rollback
 activations

---
 examples/simple/flake.nix | 47 +++++++++++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 14 deletions(-)

(limited to 'examples/simple/flake.nix')

diff --git a/examples/simple/flake.nix b/examples/simple/flake.nix
index 800363f..f53352b 100644
--- a/examples/simple/flake.nix
+++ b/examples/simple/flake.nix
@@ -5,21 +5,40 @@
 {
   description = "Deploy GNU hello to localhost";
 
-  outputs = { self, nixpkgs }: {
-    deploy.nodes.example = {
-      hostname = "localhost";
-      profiles.hello = {
-        user = "balsoft";
-        path = nixpkgs.legacyPackages.x86_64-linux.hello;
-        # Just to test that it's working
-        activate = "$PROFILE/bin/hello";
+  outputs = { self, nixpkgs }:
+    let
+      setActivate = base: activate: nixpkgs.legacyPackages.x86_64-linux.symlinkJoin {
+        name = ("activatable-" + base.name);
+        paths = [
+          base
+          (nixpkgs.legacyPackages.x86_64-linux.writeTextFile {
+            name = base.name + "-activate-path";
+            text = ''
+              #!${nixpkgs.legacyPackages.x86_64-linux.runtimeShell}
+              ${activate}
+            '';
+            executable = true;
+            destination = "/activate";
+          })
+        ];
       };
-    };
-    checks = builtins.mapAttrs (_: pkgs: {
-      jsonschema = pkgs.runCommandNoCC "jsonschema-deploy-simple" { }
-        "${pkgs.python3.pkgs.jsonschema}/bin/jsonschema -i ${
+    in
+    {
+
+      deploy.nodes.example = {
+        hostname = "localhost";
+        profiles.hello = {
+          user = "balsoft";
+          path = setActivate nixpkgs.legacyPackages.x86_64-linux.hello "./bin/hello";
+        };
+      };
+      checks = builtins.mapAttrs
+        (_: pkgs: {
+          jsonschema = pkgs.runCommandNoCC "jsonschema-deploy-simple" { }
+            "${pkgs.python3.pkgs.jsonschema}/bin/jsonschema -i ${
           pkgs.writeText "deploy.json" (builtins.toJSON self.deploy)
         } ${../../interface/deploy.json} && touch $out";
-    }) nixpkgs.legacyPackages;
-  };
+        })
+        nixpkgs.legacyPackages;
+    };
 }
-- 
cgit v1.2.3


From 7c00fd2761e6efffe763ece5d08d9a6d3fb95092 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Mon, 5 Oct 2020 19:46:28 -0700
Subject: Add interface with json schema, fix flake-less issues, put
 setActivate and jsonSchema check in flake lib

---
 examples/simple/flake.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'examples/simple/flake.nix')

diff --git a/examples/simple/flake.nix b/examples/simple/flake.nix
index f53352b..d44b888 100644
--- a/examples/simple/flake.nix
+++ b/examples/simple/flake.nix
@@ -5,7 +5,9 @@
 {
   description = "Deploy GNU hello to localhost";
 
-  outputs = { self, nixpkgs }:
+  inputs.deploy-rs.url = "github:serokell/deploy-rs";
+
+  outputs = { self, nixpkgs, deploy-rs }:
     let
       setActivate = base: activate: nixpkgs.legacyPackages.x86_64-linux.symlinkJoin {
         name = ("activatable-" + base.name);
@@ -29,16 +31,10 @@
         hostname = "localhost";
         profiles.hello = {
           user = "balsoft";
-          path = setActivate nixpkgs.legacyPackages.x86_64-linux.hello "./bin/hello";
+          path = deploy-rs.lib.x86_64-linux.setActivate nixpkgs.legacyPackages.x86_64-linux.hello "./bin/hello";
         };
       };
-      checks = builtins.mapAttrs
-        (_: pkgs: {
-          jsonschema = pkgs.runCommandNoCC "jsonschema-deploy-simple" { }
-            "${pkgs.python3.pkgs.jsonschema}/bin/jsonschema -i ${
-          pkgs.writeText "deploy.json" (builtins.toJSON self.deploy)
-        } ${../../interface/deploy.json} && touch $out";
-        })
-        nixpkgs.legacyPackages;
+
+      checks = { "x86_64-linux" = { jsonSchema = deploy-rs.lib.x86_64-linux.checkSchema self.deploy; }; };
     };
 }
-- 
cgit v1.2.3


From 58a934b997bb06f475bf707d0994f1fa37584cc1 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Mon, 5 Oct 2020 19:53:59 -0700
Subject: Clean up `simple` example

---
 examples/simple/flake.nix | 37 +++++++++----------------------------
 1 file changed, 9 insertions(+), 28 deletions(-)

(limited to 'examples/simple/flake.nix')

diff --git a/examples/simple/flake.nix b/examples/simple/flake.nix
index d44b888..a8ad0f7 100644
--- a/examples/simple/flake.nix
+++ b/examples/simple/flake.nix
@@ -7,34 +7,15 @@
 
   inputs.deploy-rs.url = "github:serokell/deploy-rs";
 
-  outputs = { self, nixpkgs, deploy-rs }:
-    let
-      setActivate = base: activate: nixpkgs.legacyPackages.x86_64-linux.symlinkJoin {
-        name = ("activatable-" + base.name);
-        paths = [
-          base
-          (nixpkgs.legacyPackages.x86_64-linux.writeTextFile {
-            name = base.name + "-activate-path";
-            text = ''
-              #!${nixpkgs.legacyPackages.x86_64-linux.runtimeShell}
-              ${activate}
-            '';
-            executable = true;
-            destination = "/activate";
-          })
-        ];
+  outputs = { self, nixpkgs, deploy-rs }: {
+    deploy.nodes.example = {
+      hostname = "localhost";
+      profiles.hello = {
+        user = "balsoft";
+        path = deploy-rs.lib.x86_64-linux.setActivate nixpkgs.legacyPackages.x86_64-linux.hello "./bin/hello";
       };
-    in
-    {
-
-      deploy.nodes.example = {
-        hostname = "localhost";
-        profiles.hello = {
-          user = "balsoft";
-          path = deploy-rs.lib.x86_64-linux.setActivate nixpkgs.legacyPackages.x86_64-linux.hello "./bin/hello";
-        };
-      };
-
-      checks = { "x86_64-linux" = { jsonSchema = deploy-rs.lib.x86_64-linux.checkSchema self.deploy; }; };
     };
+
+    checks = { "x86_64-linux" = { jsonSchema = deploy-rs.lib.x86_64-linux.checkSchema self.deploy; }; };
+  };
 }
-- 
cgit v1.2.3


From 7ec0bc21cd3678e39270d7ea59bccaefa288abfa Mon Sep 17 00:00:00 2001
From: notgne2
Date: Mon, 26 Oct 2020 12:27:20 -0700
Subject: Update example flakes

---
 examples/simple/flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples/simple/flake.nix')

diff --git a/examples/simple/flake.nix b/examples/simple/flake.nix
index a8ad0f7..e5003c7 100644
--- a/examples/simple/flake.nix
+++ b/examples/simple/flake.nix
@@ -16,6 +16,6 @@
       };
     };
 
-    checks = { "x86_64-linux" = { jsonSchema = deploy-rs.lib.x86_64-linux.checkSchema self.deploy; }; };
+    checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
   };
 }
-- 
cgit v1.2.3